lib/rbvmomi/vim.rb in rbvmomi-1.1.5 vs lib/rbvmomi/vim.rb in rbvmomi-1.1.6

@@ -20,11 +20,11 @@
   def self.connect opts
     fail unless opts.is_a? Hash
     fail "host option required" unless opts[:host]
     opts[:user] ||= 'root'
     opts[:password] ||= ''
-    opts[:ssl] = true unless opts.member? :ssl
+    opts[:ssl] = true unless opts.member? :ssl or opts[:"no-ssl"]
     opts[:insecure] ||= false
     opts[:port] ||= (opts[:ssl] ? 443 : 80)
     opts[:path] ||= '/sdk'
     opts[:ns] ||= 'urn:vim25'
     opts[:rev] = '4.0'
@@ -65,12 +65,14 @@
   # Alias to serviceContent.searchIndex
   def searchIndex
     serviceContent.searchIndex
   end
 
-  # @private
-  def self.extension_path name
-    File.join(File.dirname(__FILE__), "vim", "#{name}.rb")
+  @extension_dirs = [File.join(File.dirname(__FILE__), "vim")]
+
+  # Directories to search for extensions
+  def self.extension_dirs
+    @extension_dirs
   end
 
   load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.cdb"))
 end