fog-vsphere 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a65cbc2b8dff64e149f6e108ef19d5ddaa5011
-  data.tar.gz: a531b24b12fe6410476a4532f9c4c5584125bb12
+  metadata.gz: 7a12e272a23029a875c210283a8eb747464ab79c
+  data.tar.gz: aa09039e8d0942692daf330100baeb066e165a2a
 SHA512:
-  metadata.gz: a323cdbb8d6541a7a9597e9bf7628b71e13993a322334ed4beeec504ac68ec87a4d7342a850213c2f6b0f352fceb5343cddab989f5cb05556aba748795c0e834
-  data.tar.gz: d52f7e564b586cd2eb5727b260f5e51c2394486175d55a975a69d72fd3591acf727a85032bf92ef272d06224b1b15f8431c4e7c1bdebf5c5105b61c38d5d5a3c
+  metadata.gz: 073803f1b3a086c7f807a5fe4744c703c22609e2788b007551871214e50aeb5afe40038f9921c45a14752ccb7622929533f4eb91e5c96f8a3aa6d4b3b9c0d0db
+  data.tar.gz: dc797b1e4678a88293944451e1350466bd4a033c67230cd5980b160436dcfbdf8707966e801440bc861b9fde204a4c721f6de871863221cc7a1e472130058e77

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+#  v0.6.0 1/28/2016
+
+* Improvements to upload_iso method
+* Minor refactoring of unnecessarily complex code
+
 ## v0.5.0 1/18/2016
 
 * Fix wrong string assignment in storage pods

data/fog-vsphere.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.8'
   spec.add_development_dependency 'rubocop', '~> 0.34'
   spec.add_development_dependency 'shindo', '~> 0.3'
 end

data/lib/fog/vsphere.rb

@@ -17,27 +17,12 @@ module Fog
     service(:compute, 'Compute')
 
     # This helper was originally added as Fog.class_as_string and moved to core but only used here
-    def self.class_from_string classname, defaultpath=""
-      if classname and classname.is_a? String then
-        chain = classname.split("::")
-        klass = Kernel
-        chain.each do |klass_string|
-          klass = klass.const_get klass_string
-        end
-        if klass.is_a? Class then
-          klass
-        elsif defaultpath != nil then
-          class_from_string((defaultpath.split("::")+chain).join("::"), nil)
-        else
-          nil
-        end
-      elsif classname and classname.is_a? Class then
-        classname
-      else
-        nil
-      end
+    def self.class_from_string(name, default_path = '')
+      const = default_path.empty? ? name.to_s : "#{default_path}::#{name}"
+      klass = const.split('::').inject(Object) { |m, c| m.const_get(c) }
+      return klass unless klass == Object
     rescue NameError
-      defaultpath != nil ? class_from_string((defaultpath.split("::")+chain).join("::"), nil) : nil
+      nil
     end
   end
 end

data/lib/fog/vsphere/requests/compute/upload_iso.rb

@@ -19,14 +19,15 @@ module Fog
         def upload_iso(options = {})
           options = upload_iso_check_options(options)
           datastore = get_raw_datastore(options['datastore'], options['datacenter'])
-          datacenter = get_datacenter(options['datacenter'])
+          datacenter = get_raw_datacenter(options['datacenter'])
           filename = options['filename'] || File.basename(options['local_path'])
           unless datastore.exists? options['upload_directory']+'/'
-            @connection.serviceContent.fileManager.MakeDirectory :name => "[#{options['datastore']}] #{options['directory']}",
+            @connection.serviceContent.fileManager.MakeDirectory :name => "[#{options['datastore']}] #{options['upload_directory']}",
                                                                  :datacenter => datacenter,
                                                                  :createParentDirectories => false
           end
           datastore.upload options['upload_directory']+'/'+filename, options['local_path']
+          datastore.exists? options['upload_directory']+'/'+filename
         end
       end
     end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/tests/class_from_string_tests.rb

@@ -0,0 +1,33 @@
+require_relative './helper'
+
+class A; class B; class C; end; end; end
+
+class TestClassFromString < Minitest::Test
+  def test_empty_string
+    assert_equal(nil, Fog::Vsphere.class_from_string(''))
+  end
+
+  def test_nil
+    assert_equal(nil, Fog::Vsphere.class_from_string(nil))
+  end
+
+  def test_name_as_class
+    assert_equal(A, Fog::Vsphere.class_from_string(A))
+  end
+
+  def test_name_as_string
+    assert_equal(A, Fog::Vsphere.class_from_string('A'))
+  end
+
+  def test_unexpected_input
+    assert_equal(nil, Fog::Vsphere.class_from_string(8))
+  end
+
+  def test_nested_class_without_default_path
+    assert_equal(A::B::C, Fog::Vsphere.class_from_string(A::B::C))
+  end
+
+  def test_nested_class_with_default_path
+    assert_equal(A::B::C, Fog::Vsphere.class_from_string('C', 'A::B'))
+  end
+end

data/tests/helper.rb

@@ -5,4 +5,6 @@ rescue LoadError => e
   $stderr.puts "not recording test coverage: #{e.inspect}"
 end
 
+require 'minitest/autorun'
+
 require File.expand_path('../../lib/fog/vsphere', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,7 @@ files:
 - lib/fog/vsphere/requests/compute/vm_reconfig_memory.rb
 - lib/fog/vsphere/requests/compute/vm_take_snapshot.rb
 - lib/fog/vsphere/version.rb
+- tests/class_from_string_tests.rb
 - tests/compute_tests.rb
 - tests/helper.rb
 - tests/helpers/mock_helper.rb
@@ -286,6 +301,7 @@ signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
 test_files:
+- tests/class_from_string_tests.rb
 - tests/compute_tests.rb
 - tests/helper.rb
 - tests/helpers/mock_helper.rb