vcloud-core 0.2.0 → 0.3.0

data/.travis.yml

@@ -0,0 +1,9 @@
+---
+language: ruby
+rvm:
+  - 1.9.3
+branches:
+  except:
+    - master
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.3.0 (2014-05-13)
+
+Features:
+
+  - Switch from deprecated Fog get_network request to get_network_complete
+  - Breaking change to OrgVdcNetwork#vcloud_attributes due to Fog deprecation fix
+  - Updated vm/vApp logging levels to make use of quiet/normal/verbose operation
+
 ## 0.2.0 (2014-05-06)
 
 Features:

data/README.md

@@ -145,12 +145,13 @@ If you want to be sure you are pinning to 5.1, or use 5.5, you can set the API v
 
 ## Testing
 
-Default target: `bundle exec rake`
-Runs the unit tests and feature tests.
+Run the default suite of tests (e.g. lint, unit, features):
 
-* Unit tests only: `bundle exec rake spec`
-* Feature tests only: `bundle exec rake features`
-* Integration tests: `bundle exec rake integration`
+    bundle exec rake
+
+Run the integration tests (slower and requires a real environment):
+
+    bundle exec rake integration
 
 ### setting up and describing your environment for test runs
 

data/Rakefile

@@ -22,7 +22,12 @@ RSpec::Core::RakeTask.new('integration') do |t|
 end
 
 require "gem_publisher"
-task :publish_gem do |t|
+task :publish_gem do
   gem = GemPublisher.publish_if_updated("vcloud-core.gemspec", :rubygems)
   puts "Published #{gem}" if gem
 end
+
+require 'rubocop/rake_task'
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.options = ['--lint']
+end

data/lib/vcloud/core/config_validator.rb

@@ -3,11 +3,11 @@ require 'ipaddr'
 module Vcloud
   module Core
     class ConfigValidator
-  
+
       attr_reader :key, :data, :schema, :type, :errors
-  
+
       VALID_ALPHABETICAL_VALUES_FOR_IP_RANGE = %w(Any external internal)
-  
+
       def initialize(key, data, schema)
         raise "Nil schema" unless schema
         raise "Invalid schema" unless schema.key?(:type)
@@ -18,21 +18,21 @@ module Vcloud
         @key    = key
         validate
       end
-  
+
       def valid?
         @errors.empty?
       end
-  
+
       def self.validate(key, data, schema)
         new(key, data, schema)
       end
-  
+
       private
-  
+
       def validate
         self.send("validate_#{type}".to_sym)
       end
-  
+
       def validate_string
         unless @data.is_a? String
           errors << "#{key}: #{@data} is not a string"
@@ -41,14 +41,14 @@ module Vcloud
         return unless check_emptyness_ok
         return unless check_matcher_matches
       end
-  
+
       def validate_string_or_number
         unless data.is_a?(String) || data.is_a?(Numeric)
           @errors << "#{key}: #{@data} is not a string_or_number"
           return
         end
       end
-  
+
       def validate_ip_address
         unless data.is_a?(String)
           @errors << "#{key}: #{@data} is not a valid ip_address"
@@ -56,7 +56,7 @@ module Vcloud
         end
         @errors << "#{key}: #{@data} is not a valid ip_address" unless valid_ip_address?(data)
       end
-  
+
       def validate_ip_address_range
         unless data.is_a?(String)
           @errors << "#{key}: #{@data} is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'."
@@ -65,7 +65,7 @@ module Vcloud
         valid = valid_cidr_or_ip_address? || valid_alphabetical_ip_range? || valid_ip_range?
         @errors << "#{key}: #{@data} is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'." unless valid
       end
-  
+
       def valid_cidr_or_ip_address?
         begin
           ip = IPAddr.new(data)
@@ -74,11 +74,11 @@ module Vcloud
           false
         end
       end
-  
+
       def valid_alphabetical_ip_range?
         VALID_ALPHABETICAL_VALUES_FOR_IP_RANGE.include?(data)
       end
-  
+
       def valid_ip_address? ip_address
         begin
           #valid formats recognized by IPAddr are : “address”, “address/prefixlen” and “address/mask”.
@@ -90,7 +90,7 @@ module Vcloud
           false
         end
       end
-  
+
       def valid_ip_range?
         range_parts = data.split('-')
         return false if range_parts.size != 2
@@ -99,11 +99,11 @@ module Vcloud
         valid_ip_address?(start_address) &&  valid_ip_address?(end_address) &&
           valid_start_and_end_address_combination?(end_address, start_address)
       end
-  
+
       def valid_start_and_end_address_combination?(end_address, start_address)
         IPAddr.new(start_address) < IPAddr.new(end_address)
       end
-  
+
       def validate_hash
         unless data.is_a? Hash
           @errors << "#{key}: is not a hash"
@@ -118,7 +118,7 @@ module Vcloud
           end
         end
       end
-  
+
       def validate_array
         unless data.is_a? Array
           @errors << "#{key} is not an array"
@@ -135,23 +135,22 @@ module Vcloud
           end
         end
       end
-  
+
       def validate_enum
-        unless (acceptable_values = schema[:acceptable_values]) && acceptable_values.is_a?(Array)
-          raise "Must set :acceptable_values for type 'enum'"
-        end
+        acceptable_values = schema[:acceptable_values]
+        raise "Must set :acceptable_values for type 'enum'" unless acceptable_values.is_a?(Array)
         unless acceptable_values.include?(data)
           acceptable_values_string = acceptable_values.collect {|v| "'#{v}'" }.join(', ')
           @errors << "#{key}: #{@data} is not a valid value. Acceptable values are #{acceptable_values_string}."
         end
       end
-  
+
       def validate_boolean
         unless [true, false].include?(data)
           @errors << "#{key}: #{data} is not a valid boolean value."
         end
       end
-  
+
       def check_emptyness_ok
         unless schema.key?(:allowed_empty) && schema[:allowed_empty]
           if data.empty?
@@ -161,9 +160,10 @@ module Vcloud
         end
         true
       end
-  
+
       def check_matcher_matches
-        return unless regex = schema[:matcher]
+        regex = schema[:matcher]
+        return unless regex
         raise "#{key}: #{regex} is not a Regexp" unless regex.is_a? Regexp
         unless data =~ regex
           @errors << "#{key}: #{data} does not match"
@@ -171,7 +171,7 @@ module Vcloud
         end
         true
       end
-  
+
       def check_hash_parameter(sub_key, sub_schema)
         if sub_schema.key?(:required) && sub_schema[:required] == false
           # short circuit out if we do not have the key, but it's not required.
@@ -190,15 +190,12 @@ module Vcloud
           @errors = errors + sub_validator.errors
         end
       end
-  
+
       def check_for_unknown_parameters
-        unless internals = schema[:internals]
-          # if there are no parameters specified, then assume all are ok.
-          return true
-        end
-        if schema[:permit_unknown_parameters]
-          return true
-        end
+        internals = schema[:internals]
+        # if there are no parameters specified, then assume all are ok.
+        return true unless internals
+        return true if schema[:permit_unknown_parameters]
         data.keys.each do |k|
           @errors << "#{key}: parameter '#{k}' is invalid" unless internals[k]
         end

data/lib/vcloud/core/edge_gateway.rb

@@ -13,10 +13,9 @@ module Vcloud
 
       def self.get_ids_by_name(name)
         q = Vcloud::Core::QueryRunner.new
-        unless res = q.run('edgeGateway', :filter => "name==#{name}")
-          raise "Error finding edgeGateway by name #{name}"
-        end
-        res.collect do |record| 
+        query_results = q.run('edgeGateway', :filter => "name==#{name}")
+        raise "Error finding edgeGateway by name #{name}" unless query_results
+        query_results.collect do |record|
           record[:href].split('/').last if record.key?(:href)
         end
       end
@@ -58,7 +57,8 @@ module Vcloud
       def interfaces
         gateway_config = vcloud_attributes[:Configuration]
         return [] unless gateway_config[:GatewayInterfaces]
-        return [] unless gateway_interfaces = gateway_config[:GatewayInterfaces][:GatewayInterface]
+        gateway_interfaces = gateway_config[:GatewayInterfaces][:GatewayInterface]
+        return [] unless gateway_interfaces
         gateway_interfaces.map do |vcloud_gateway_interface_hash|
           EdgeGatewayInterface.new(vcloud_gateway_interface_hash)
         end

data/lib/vcloud/core/edge_gateway_interface.rb

@@ -5,20 +5,16 @@ module Vcloud
       attr_accessor :name, :network_href, :network_name
 
       def initialize(gateway_interface_hash)
-        raise "Argument error: nil not allowed" if gateway_interface_hash.nil?
-        @vcloud_gateway_interface = gateway_interface_hash
-        unless @name = gateway_interface_hash[:Name]
-          raise "Argument error: must have a :Name"
-        end
-        unless network_section = gateway_interface_hash[:Network]
-          raise "Argument error: must have a :Network section"
+        if gateway_interface_hash.nil?
+          raise "EdgeGatewayInterface: gateway_interface_hash cannot be nil" 
         end
-        unless @network_href = network_section[:href]
-          raise "Argument error: must have a :Network[:href]"
-        end
-        unless @network_name = network_section[:name]
-          raise "Argument error: must have a :Network[:name]"
+        unless gateway_interface_hash[:Name] && gateway_interface_hash[:Network]
+          raise "EdgeGatewayInterface: bad input: #{gateway_interface_hash}"
         end
+        @vcloud_gateway_interface = gateway_interface_hash
+        @name = gateway_interface_hash[:Name]
+        @network_href = gateway_interface_hash[:Network][:href]
+        @network_name = gateway_interface_hash[:Network][:name]
       end
 
       def network_id

data/lib/vcloud/core/org_vdc_network.rb

@@ -12,13 +12,15 @@ module Vcloud
       end
 
       def self.provision(config)
-        raise "Must specify a name" unless name = config[:name]
-        raise "Must specify a vdc_name" unless vdc_name = config[:vdc_name]
-
+        raise "Must specify a name" unless config[:name]
+        raise "Must specify a vdc_name" unless config[:vdc_name]
         unless config[:fence_mode] == 'isolated' || config[:fence_mode] == 'natRouted'
           raise "fence_mode #{config[:fence_mode]} not supported. Must be 'isolated' or 'natRouted'"
         end
 
+        name = config[:name]
+        vdc_name = config[:vdc_name]
+
         config[:is_shared] = false unless config[:is_shared]
 
         if config[:fence_mode] == 'natRouted'
@@ -44,7 +46,7 @@ module Vcloud
       end
 
       def vcloud_attributes
-        Vcloud::Fog::ServiceInterface.new.get_network(id)
+        Vcloud::Fog::ServiceInterface.new.get_network_complete(id)
       end
 
       def name
@@ -59,8 +61,6 @@ module Vcloud
         Vcloud::Fog::ServiceInterface.new.delete_network(id)
       end
 
-      private
-
       def self.construct_network_options(config)
         opts = {}
         opts[:Description] = config[:description] if config.key?(:description)

data/lib/vcloud/core/vapp.rb

@@ -14,14 +14,13 @@ module Vcloud
 
       def self.get_by_name(name)
         q = Vcloud::Core::QueryRunner.new
-        unless res = q.run('vApp', :filter => "name==#{name}")
-          raise "Error finding vApp by name #{name}"
-        end
-        case res.size
+        query_results = q.run('vApp', :filter => "name==#{name}")
+        raise "Error finding vApp by name #{name}" unless query_results
+        case query_results.size
         when 0
           raise "vApp #{name} not found"
         when 1
-          return self.new(res.first[:href].split('/').last)
+          return self.new(query_results.first[:href].split('/').last)
         else
           raise "found multiple vApp entities with name #{name}!"
         end
@@ -33,6 +32,7 @@ module Vcloud
 
       module STATUS
         RUNNING = 4
+        POWERED_OFF = 8
       end
 
       def name

data/lib/vcloud/core/vapp_template.rb

@@ -26,9 +26,8 @@ module Vcloud
       def self.get_ids_by_name_and_catalog name, catalog_name
         raise "provide Catalog and vAppTemplate name" unless name && catalog_name
         q = Vcloud::Core::QueryRunner.new
-        unless query_results = q.run('vAppTemplate', :filter => "name==#{name};catalogName==#{catalog_name}")
-          raise "Error retreiving #{q.type} query '#{q.filter}'"
-        end
+        query_results = q.run('vAppTemplate', :filter => "name==#{name};catalogName==#{catalog_name}")
+        raise "Error retreiving #{q.type} query '#{q.filter}'" unless query_results
         query_results.collect do |record|
           record[:href].split('/').last if record.key?(:href)
         end

data/lib/vcloud/core/vdc.rb

@@ -13,11 +13,10 @@ module Vcloud
 
       def self.get_by_name(name)
         q = Vcloud::Core::QueryRunner.new
-        unless res = q.run('orgVdc', :filter => "name==#{name}")
-          raise "Error finding vDC by name #{name}"
-        end
-        raise "vDc #{name} not found" unless res.size == 1
-        return self.new(res.first[:href].split('/').last)
+        query_results = q.run('orgVdc', :filter => "name==#{name}")
+        raise "Error finding vDC by name #{name}" unless query_results
+        raise "vDc #{name} not found" unless query_results.size == 1
+        return self.new(query_results.first[:href].split('/').last)
       end
 
       def vcloud_attributes

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/vcloud/core/vm.rb

@@ -73,7 +73,7 @@ module Vcloud
         vm = Vcloud::Fog::ModelInterface.new.get_vm_by_href(href)
         if extra_disks
           extra_disks.each do |extra_disk|
-            Vcloud::Core.logger.info("adding a disk of size #{extra_disk[:size]}MB into VM #{id}")
+            Vcloud::Core.logger.debug("adding a disk of size #{extra_disk[:size]}MB into VM #{id}")
             vm.disks.create(extra_disk[:size])
           end
         end
@@ -113,7 +113,6 @@ module Vcloud
       end
 
       def generate_preamble(script_path, script_post_processor, vars)
-        vapp_name = @vapp.name
         script = ERB.new(File.read(File.expand_path(script_path)), nil, '>-').result(binding)
         if script_post_processor
           script = Open3.capture2(File.expand_path(script_post_processor),

data/lib/vcloud/fog/service_interface.rb

@@ -8,7 +8,7 @@ module Vcloud
       def_delegators :@fog, :get_vapp, :organizations, :org_name, :delete_vapp, :vcloud_token, :end_point,
                      :get_execute_query, :get_vapp_metadata, :power_off_vapp, :shutdown_vapp, :session,
                      :post_instantiate_vapp_template, :put_memory, :put_cpu, :power_on_vapp, :put_vapp_metadata_value,
-                     :put_vm, :get_edge_gateway, :get_network, :delete_network, :post_create_org_vdc_network,
+                     :put_vm, :get_edge_gateway, :get_network_complete, :delete_network, :post_create_org_vdc_network,
                      :post_configure_edge_gateway_services
 
       #########################
@@ -40,14 +40,14 @@ module Vcloud
         end
 
         def post_instantiate_vapp_template(vdc, template, name, params)
-          Vcloud::Core.logger.info("instantiating #{name} vapp in #{vdc[:name]}")
+          Vcloud::Core.logger.debug("instantiating #{name} vapp in #{vdc[:name]}")
           vapp = @vcloud.post_instantiate_vapp_template(extract_id(vdc), template, name, params).body
           @vcloud.process_task(vapp[:Tasks][:Task])
           @vcloud.get_vapp(extract_id(vapp)).body
         end
 
         def put_memory(vm_id, memory)
-          Vcloud::Core.logger.info("putting #{memory}MB memory into VM #{vm_id}")
+          Vcloud::Core.logger.debug("putting #{memory}MB memory into VM #{vm_id}")
           task = @vcloud.put_memory(vm_id, memory).body
           @vcloud.process_task(task)
         end
@@ -62,13 +62,13 @@ module Vcloud
         end
 
         def put_cpu(vm_id, cpu)
-          Vcloud::Core.logger.info("putting #{cpu} CPU(s) into VM #{vm_id}")
+          Vcloud::Core.logger.debug("putting #{cpu} CPU(s) into VM #{vm_id}")
           task = @vcloud.put_cpu(vm_id, cpu).body
           @vcloud.process_task(task)
         end
 
         def put_vm(id, name, options={})
-          Vcloud::Core.logger.info("updating name : #{name}, :options => #{options} in vm : #{id}")
+          Vcloud::Core.logger.debug("updating name : #{name}, :options => #{options} in vm : #{id}")
           task = @vcloud.put_vm(id, name, options).body
           @vcloud.process_task(task)
         end
@@ -108,8 +108,8 @@ module Vcloud
           @vcloud.process_task(task)
         end
 
-        def get_network(id)
-          @vcloud.get_network(id).body
+        def get_network_complete(id)
+          @vcloud.get_network_complete(id).body
         end
 
         def delete_network(id)
@@ -118,10 +118,10 @@ module Vcloud
         end
 
         def post_create_org_vdc_network(vdc_id, name, options)
-          Vcloud::Core.logger.info("creating #{options[:fence_mode]} OrgVdcNetwork #{name} in vDC #{vdc_id}")
+          Vcloud::Core.logger.debug("creating #{options[:fence_mode]} OrgVdcNetwork #{name} in vDC #{vdc_id}")
           attrs = @vcloud.post_create_org_vdc_network(vdc_id, name, options).body
           @vcloud.process_task(attrs[:Tasks][:Task])
-          get_network(extract_id(attrs))
+          get_network_complete(extract_id(attrs))
         end
 
         def post_configure_edge_gateway_services(edgegw_id, config)
@@ -129,7 +129,7 @@ module Vcloud
           begin
             task = @vcloud.post_configure_edge_gateway_services(edgegw_id, config).body
             @vcloud.process_task(task)
-          rescue Exception => ex
+          rescue => ex
             Vcloud::Core.logger.error("Could not update EdgeGateway #{edgegw_id} : #{ex}")
             raise
           end
@@ -141,7 +141,7 @@ module Vcloud
         end
 
         def power_on_vapp(vapp_id)
-          Vcloud::Core.logger.info("Powering on vApp #{vapp_id}")
+          Vcloud::Core.logger.debug("Powering on vApp #{vapp_id}")
           task = @vcloud.post_power_on_vapp(vapp_id).body
           @vcloud.process_task(task)
         end
@@ -156,7 +156,7 @@ module Vcloud
         end
 
         def put_vapp_metadata_value(id, k, v)
-          Vcloud::Core.logger.info("putting metadata pair '#{k}'=>'#{v}' to #{id}")
+          Vcloud::Core.logger.debug("putting metadata pair '#{k}'=>'#{v}' to #{id}")
           # need to convert key to_s since Fog 0.17 borks on symbol key
           task = @vcloud.put_vapp_metadata_item_metadata(id, k.to_s, v).body
           @vcloud.process_task(task)
@@ -203,11 +203,11 @@ module Vcloud
 
       def put_network_connection_system_section_vapp(vm_id, section)
         begin
-          Vcloud::Core.logger.info("adding NIC into VM #{vm_id}")
+          Vcloud::Core.logger.debug("adding NIC into VM #{vm_id}")
           @fog.put_network_connection_system_section_vapp(vm_id, section)
-        rescue
-          Vcloud::Core.logger.info("failed to put_network_connection_system_section_vapp for vm : #{vm_id} ")
-          Vcloud::Core.logger.info("requested network section : #{section.inspect}")
+        rescue => ex
+          Vcloud::Core.logger.error("failed to put_network_connection_system_section_vapp for vm #{vm_id}: #{ex}")
+          Vcloud::Core.logger.debug("requested network section : #{section.inspect}")
           raise
         end
       end
@@ -222,16 +222,17 @@ module Vcloud
 
       def put_guest_customization_section(vm_id, vm_name, script)
         begin
-          Vcloud::Core.logger.info("configuring guest customization section for vm : #{vm_id}")
+          Vcloud::Core.logger.debug("configuring guest customization section for vm : #{vm_id}")
           customization_req = {
             :Enabled             => true,
             :CustomizationScript => script,
             :ComputerName        => vm_name
           }
           @fog.put_guest_customization_section_vapp(vm_id, customization_req)
-        rescue
-          Vcloud::Core.logger.info("=== interpolated preamble:")
-          Vcloud::Core.logger.info(script)
+        rescue => ex
+          Vcloud::Core.logger.error("Failed to update guest customization section: #{ex}")
+          Vcloud::Core.logger.debug("=== interpolated preamble:")
+          Vcloud::Core.logger.debug(script)
           raise
         end
       end

data/spec/support/stub_fog_interface.rb

@@ -8,7 +8,7 @@ class StubFogInterface
 
   def vdc_object_by_name(vdc_name)
     vdc = OpenStruct.new
-    vdc.name = 'test-vdc-1'
+    vdc.name = vdc_name
     vdc
   end
 
@@ -16,7 +16,7 @@ class StubFogInterface
     { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
   end
 
-  def find_networks(network_names, vdc_name)
+  def find_networks(_network_names, _vdc_name)
     [{
       :name => 'org-vdc-1-net-1',
       :href => '/org-vdc-1-net-1-id',
@@ -24,7 +24,10 @@ class StubFogInterface
   end
 
   def get_vapp(id)
-    { :name => 'test-vapp-1' }
+    {
+      :name => 'test-vapp-1',
+      :href => "/#{id}",
+    }
   end
 
   def get_edge_gateway(id)
@@ -34,11 +37,11 @@ class StubFogInterface
     }
   end
 
-  def vdc(name)
+  def vdc(_name)
     { }
   end
 
-  def post_instantiate_vapp_template(vdc, template, name, params)
+  def post_instantiate_vapp_template(_vdc, _template, _name, _params)
     {
       :href => '/test-vapp-1-id',
       :Children => {
@@ -51,7 +54,7 @@ class StubFogInterface
     { }
   end
 
-  def template(catalog_name, name)
+  def template(_catalog_name, _name)
     { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
   end
 

data/spec/vcloud/core/data/basic_preamble_test.erb

@@ -4,5 +4,6 @@
 
 (
 echo "in $*"
+echo "vapp_name: <%= vapp_name -%>"
 echo "message: <%= vars[:message] -%>"
 ) >> /PREAMBLE_OUTPUT

data/spec/vcloud/core/data/basic_preamble_test.erb.OUT

@@ -4,5 +4,6 @@
 
 (
 echo "in $*"
+echo "vapp_name: test-vapp-1"
 echo "message: hello world"
 ) >> /PREAMBLE_OUTPUT

data/spec/vcloud/core/edge_gateway_interface_spec.rb

@@ -40,31 +40,18 @@ module Vcloud
         end
 
         it "should raise an error if passed a nil value" do
-          expect { EdgeGatewayInterface.new(nil) }.to raise_error("Argument error: nil not allowed")
+          expect { EdgeGatewayInterface.new(nil) }.
+            to raise_error(StandardError, /^EdgeGatewayInterface:/)
         end
 
         it "should raise an error if a :Name is not passed" do
-          expect { EdgeGatewayInterface.new({}) }.to raise_error("Argument error: must have a :Name")
+          expect { EdgeGatewayInterface.new({}) }.
+            to raise_error(StandardError, /^EdgeGatewayInterface:/)
         end
 
         it "should raise an error if a :Network is not passed" do
-          expect { EdgeGatewayInterface.new({Name: 'test-interface'}) }.to raise_error("Argument error: must have a :Network section")
-        end
-
-        it "should raise an error if a :Network :href is not passed" do
-          bad_input = {
-            Name: 'test-interface',
-            Network: { name: "test-network" }
-          }
-          expect { EdgeGatewayInterface.new(bad_input) }.to raise_error("Argument error: must have a :Network[:href]")
-        end
-
-        it "should raise an error if a :Network :name is not passed" do
-          bad_input = {
-            Name: 'test-interface',
-            Network: { href: "http://example.com/1234" }
-          }
-          expect { EdgeGatewayInterface.new(bad_input) }.to raise_error("Argument error: must have a :Network[:name]")
+          expect { EdgeGatewayInterface.new({Name: 'test-interface'}) }.
+            to raise_error(StandardError, /^EdgeGatewayInterface:/)
         end
 
       end

data/spec/vcloud/core/edge_gateway_spec.rb

@@ -32,7 +32,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = EdgeGateway.new(@edgegw_id)
-          expect(obj.id) == @edgegw_id
+          expect(obj.id).to eq(@edgegw_id)
         end
 
         it "should raise error if id is not in correct format" do
@@ -63,7 +63,7 @@ module Vcloud
           Vcloud::Core::QueryRunner.should_receive(:new).and_return(mock_query)
           mock_query.should_receive(:run).with('edgeGateway', :filter => "name==edgegw-test-1").and_return(q_results)
           @obj = EdgeGateway.get_by_name('edgegw-test-1')
-          expect(@obj.id) == @edgegw_id
+          expect(@obj.id).to eq(@edgegw_id)
         end
 
         it "should raise an error if no edgegw with that name exists" do

data/spec/vcloud/core/metadata_helper_spec.rb

@@ -31,11 +31,11 @@ module Vcloud
               }
           ]
           metadata = MetadataHelper.extract_metadata(metadata_entries)
-          metadata.count.should == 4
-          metadata[:role_name].should == 'james-bond'
-          metadata[:server_number].should == -10
-          metadata[:created_at].should == DateTime.parse("2013-12-16T14:30:05.000Z")
-          metadata[:daily_shutdown].should == false
+          expect(metadata.count).to eq(4)
+          expect(metadata[:role_name]).to eq('james-bond')
+          expect(metadata[:server_number]).to eq(-10)
+          expect(metadata[:created_at]).to eq(DateTime.parse("2013-12-16T14:30:05.000Z"))
+          expect(metadata[:daily_shutdown]).to be_false
         end
 
         it "should skip metadata entry if entry type is not application/vnd.vmware.vcloud.metadata.value+xml" do
@@ -54,7 +54,7 @@ module Vcloud
 
           ]
           metadata = MetadataHelper.extract_metadata(metadata_entries)
-          metadata.count.should == 1
+          expect(metadata.count).to eq(1)
           metadata.keys.should_not include :untyped_key
         end
 
@@ -75,7 +75,7 @@ module Vcloud
 
           ]
           metadata = MetadataHelper.extract_metadata(metadata_entries)
-          metadata.count.should == 2
+          expect(metadata.count).to eq(2)
           metadata.keys.should include :unrecognized_type_key
         end
 

data/spec/vcloud/core/org_vdc_network_spec.rb

@@ -4,7 +4,7 @@ module Vcloud
   module Core
     describe OrgVdcNetwork do
 
-      before (:each) do
+      before(:each) do
         @vdc_id    = '12345678-1234-1234-1234-000000111111'
         @edgegw_id = '12345678-1234-1234-1234-000000222222'
         @net_id    = '12345678-1234-1234-1234-000000333333'
@@ -38,7 +38,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = OrgVdcNetwork.new(@net_id)
-          expect(obj.id) == @net_id
+          expect(obj.id).to eq(@net_id)
         end
 
         it "should raise error if id is not in correct format" do
@@ -136,7 +136,7 @@ module Vcloud
                 with(@vdc_id, @config[:name], expected_vcloud_attrs).
                 and_return({ :href => "/#{@net_id}" })
             obj = Vcloud::Core::OrgVdcNetwork.provision(@config)
-            expect(obj.id) == @net_id
+            expect(obj.id).to eq(@net_id)
           end
 
           it "should handle specification of one ip_ranges" do
@@ -165,7 +165,7 @@ module Vcloud
             @mock_fog_interface.should_receive(:post_create_org_vdc_network).
                 with(@vdc_id, @config[:name], expected_vcloud_attrs).
                 and_return({ :href => "/#{@net_id}" })
-            obj = Vcloud::Core::OrgVdcNetwork.provision(@config)
+            Vcloud::Core::OrgVdcNetwork.provision(@config)
           end
 
           it "should handle specification of two ip_ranges" do
@@ -203,7 +203,7 @@ module Vcloud
             @mock_fog_interface.should_receive(:post_create_org_vdc_network).
                 with(@vdc_id, @config[:name], expected_vcloud_attrs).
                 and_return({ :href => "/#{@net_id}" })
-            obj = Vcloud::Core::OrgVdcNetwork.provision(@config)
+            Vcloud::Core::OrgVdcNetwork.provision(@config)
           end
 
         end
@@ -245,7 +245,7 @@ module Vcloud
             @mock_fog_interface.should_receive(:post_create_org_vdc_network).
                 with(@vdc_id, @config[:name], expected_vcloud_attrs).
                 and_return({ :href => "/#{@net_id}" })
-            obj = Vcloud::Core::OrgVdcNetwork.provision(@config)
+            Vcloud::Core::OrgVdcNetwork.provision(@config)
           end
 
         end

data/spec/vcloud/core/query_runner_spec.rb

@@ -12,7 +12,7 @@ describe Vcloud::Core::QueryRunner do
     it 'should return empty array if no query type links are returned from API' do
       @mock_fog_interface.stub(:get_execute_query).and_return({:Link => {}})
       result = @query_runner.available_query_types
-      result.size.should == 0
+      expect(result.size).to eq(0)
     end
 
     it 'returns queriable entity types provided by the API via :href link elements' do
@@ -52,10 +52,7 @@ describe Vcloud::Core::QueryRunner do
 
     it 'should return no results when fog returns no results' do
       @mock_fog_interface.stub(:get_execute_query).and_return({})
-
-      result = @query_runner.run()
-
-      result.should == []
+      expect(@query_runner.run()).to eq([])
     end
 
     it 'return no results when fog results do not include a "Record" or a "Reference"' do
@@ -64,10 +61,7 @@ describe Vcloud::Core::QueryRunner do
           :WibbleBlob => {:field1 => 'Stuff 1'}
         }
       )
-
-      result = @query_runner.run()
-
-      result.size.should == 0
+      expect(@query_runner.run().size).to eq(0)
     end
 
     it 'should return a single result when fog returns a single record' do
@@ -77,11 +71,9 @@ describe Vcloud::Core::QueryRunner do
           :WibbleRecord => [fields]
         }
       )
-
       result = @query_runner.run()
-
-      result.size.should == 1
-      result[0].should == fields
+      expect(result.size).to eq(1)
+      expect(result.first).to eq(fields)
     end
 
     it 'should return a single result when fog returns a single reference' do
@@ -91,11 +83,9 @@ describe Vcloud::Core::QueryRunner do
           :WibbleReference => [fields]
         }
       )
-
       result = @query_runner.run()
-
-      result.size.should == 1
-      result[0].should == fields
+      expect(result.size).to eq(1)
+      expect(result.first).to eq(fields)
     end
 
     it 'should wrap single result from fog in list' do
@@ -105,11 +95,9 @@ describe Vcloud::Core::QueryRunner do
           :WibbleRecord => fields
         }
       )
-
       result = @query_runner.run()
-
-      result.size.should == 1
-      result[0].should == fields
+      expect(result.size).to eq(1)
+      expect(result.first).to eq(fields)
     end
 
     it 'should return all results in a record returned by fog' do
@@ -120,12 +108,10 @@ describe Vcloud::Core::QueryRunner do
           :WibbleRecord => [fields, more_fields]
         }
       )
-
       result = @query_runner.run()
-
-      result.size.should == 2
-      result[0].should == fields
-      result[1].should == more_fields
+      expect(result.size).to eq(2)
+      expect(result[0]).to eq(fields)
+      expect(result[1]).to eq(more_fields)
     end
 
     it 'should return the first item if more than one records provided' do
@@ -137,11 +123,9 @@ describe Vcloud::Core::QueryRunner do
           :WobbleRecord => [fields2]
         }
       )
-
       result = @query_runner.run()
-
-      result.size.should == 1
-      result[0].should == fields1
+      expect(result.size).to eq(1)
+      expect(result.first).to eq(fields1)
     end
 
     it 'should raise error if lastPage is not an integer' do
@@ -162,13 +146,12 @@ describe Vcloud::Core::QueryRunner do
           :lastPage     => 2,
           :WibbleRecord => [fields]
         }
-
       )
       result = @query_runner.run()
-
-      result.size.should == 2
-      result[0].should == fields
-      result[1].should == fields
+      expect(result.size).to eq(2)
+      expect(result[0]).to eq(fields)
+      expect(result[1]).to eq(fields)
     end
+
   end
 end

data/spec/vcloud/core/vapp_spec.rb

@@ -36,7 +36,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = Vapp.new(@vapp_id)
-          expect(obj.id) == @vapp_id
+          expect(obj.id).to eq(@vapp_id)
         end
 
         it "should raise error if id is not in correct format" do
@@ -99,13 +99,13 @@ module Vcloud
 
         context "id" do
           it "should extract id correctly" do
-            @vapp.id.should == @vapp_id
+            expect(@vapp.id).to eq(@vapp_id)
           end
         end
 
         context "vapp should have parent vdc" do
           it "should load parent vdc id from fog attributes" do
-            @vapp.vdc_id.should == '074aea1e-a5e9-4dd1-a028-40db8c98d237'
+            expect(@vapp.vdc_id).to eq('074aea1e-a5e9-4dd1-a028-40db8c98d237')
           end
 
           it "should raise error if vapp without parent vdc found" do
@@ -115,8 +115,8 @@ module Vcloud
         end
 
         it "should return vms" do
-          @vapp.fog_vms.count.should == 1
-          @vapp.fog_vms.first[:href].should == '/vm-123aea1e-a5e9-4dd1-a028-40db8c98d237'
+          expect(@vapp.fog_vms.count).to eq(1)
+          expect(@vapp.fog_vms.first[:href]).to eq('/vm-123aea1e-a5e9-4dd1-a028-40db8c98d237')
         end
       end
 
@@ -136,18 +136,23 @@ module Vcloud
 
           it "should power on a vapp that is not powered on" do
             vapp = Vapp.new(@vapp_id)
-            @mock_fog_interface.should_receive(:get_vapp).twice().and_return({:status => 8})
+            @mock_fog_interface.should_receive(:get_vapp).twice().and_return(
+              {:status => Vcloud::Core::Vapp::STATUS::POWERED_OFF},
+              {:status => Vcloud::Core::Vapp::STATUS::RUNNING}
+            )
             @mock_fog_interface.should_receive(:power_on_vapp).with(vapp.id)
             state = vapp.power_on
-            expect(state) == true
+            expect(state).to be_true
           end
 
           it "should not power on a vapp that is already powered on, but should return true" do
             vapp = Vapp.new(@vapp_id)
-            @mock_fog_interface.should_receive(:get_vapp).and_return({:status => 4})
+            @mock_fog_interface.should_receive(:get_vapp).and_return(
+              {:status => Vcloud::Core::Vapp::STATUS::RUNNING}
+            )
             @mock_fog_interface.should_not_receive(:power_on_vapp)
             state = vapp.power_on
-            expect(state) == true
+            expect(state).to be_true
           end
         end
 
@@ -158,14 +163,14 @@ module Vcloud
         it "should return nil if fog returns nil" do
           StubFogInterface.any_instance.stub(:get_vapp_by_name_and_vdc_name)
             .with('vapp_name', 'vdc_name').and_return(nil)
-          Vapp.get_by_name_and_vdc_name('vapp_name', 'vdc_name').should == nil
+          expect(Vapp.get_by_name_and_vdc_name('vapp_name', 'vdc_name')).to be_nil
         end
 
         it "should return vapp instance if found" do
           vcloud_attr_vapp = { :href => "/#{@vapp_id}" }
           StubFogInterface.any_instance.stub(:get_vapp_by_name_and_vdc_name)
             .with('vapp_name', 'vdc_name').and_return(vcloud_attr_vapp)
-          Vapp.get_by_name_and_vdc_name('vapp_name', 'vdc_name').class.should == Core::Vapp
+          expect(Vapp.get_by_name_and_vdc_name('vapp_name', 'vdc_name').class).to eq(Core::Vapp)
         end
 
       end

data/spec/vcloud/core/vapp_template_spec.rb

@@ -35,7 +35,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = VappTemplate.new(@id)
-          expect(obj.id) == @id
+          expect(obj.id).to eq(@id)
         end
 
         it "should raise error if id is not in correct format" do

data/spec/vcloud/core/vdc_spec.rb

@@ -30,7 +30,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = Vdc.new(@vdc_id)
-          expect(obj.id) == @vdc_id
+          expect(obj.id).to eq(@vdc_id)
         end
 
         it "should raise error if id is not in correct format" do

data/spec/vcloud/core/vm_spec.rb

@@ -70,7 +70,7 @@ module Vcloud
 
         it "should store the id specified" do
           obj = Vm.new(@vm_id, @mock_vapp)
-          expect(obj.id) == @vm_id
+          expect(obj.id).to eq(@vm_id)
         end
 
         it "should raise error if id is not in correct format" do
@@ -181,7 +181,7 @@ module Vcloud
       end
 
       context '#generate_preamble' do
-        it "should interpolate vars hash into template" do
+        it "should interpolate vars hash and vapp_name into template" do
           vars = {:message => 'hello world'}
           erbfile = "#{@data_dir}/basic_preamble_test.erb"
           expected_output = File.read("#{erbfile}.OUT")

data/vcloud-core.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'cucumber', '~> 1.3.10'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov', '~> 0.8.2'
   s.add_development_dependency 'gem_publisher', '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +181,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -245,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1619325784245789607
+      hash: 2968796492213479520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23