vcloud-launcher 0.0.4 → 0.0.5

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,9 @@
+## 0.0.5 (2014-05-14)
+
+Features:
+
+- Add '--quiet' and '--verbose' options. Default now only shows major operations and progress bar.
+
 ## 0.0.4 (2014-05-01)
 
   - Use pessimistic version dependency for vcloud-core

data/README.md

@@ -112,15 +112,17 @@ 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 and feature tests (pretty quick right now)
+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 ('quick' tests): `bundle exec rake integration:quick`
-* Integration tests (all tests - takes 20mins+): `bundle exec rake integration:all`
+    bundle exec rake
 
-NB. `bundle exec rake integration` is an alias for `bundle exec rake integration:all`.
+Run the integration tests (slower and requires a real environment):
+
+    bundle exec rake integration
+
+Run the integration tests minus some that are very slow:
+
+    bundle exec rake integration:quick
 
 You need access to a suitable vCloud Director organization to run the
 integration tests. It is not necessarily safe to run them against an existing

data/Rakefile

@@ -2,7 +2,7 @@ require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'gem_publisher'
 
-task :default => [:spec,:features]
+task :default => [:rubocop, :spec, :features]
 task :integration => ['integration:all']
 
 RSpec::Core::RakeTask.new(:spec) do |task|
@@ -27,7 +27,12 @@ RSpec::Core::RakeTask.new('integration:all') do |t|
   t.pattern = FileList['spec/integration/**/*_spec.rb']
 end
 
-task :publish_gem do |t|
+task :publish_gem do
   gem = GemPublisher.publish_if_updated("vcloud-launcher.gemspec", :rubygems)
   puts "Published #{gem}" if gem
 end
+
+require 'rubocop/rake_task'
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.options = ['--lint']
+end

data/bin/vcloud-launch

@@ -17,6 +17,8 @@ class App
 
   on("-x", "--dont-power-on", "Do not power on vApps (default is to power on)")
   on("-c", "--continue-on-error", "Continue on error ( default is false) ")
+  on("-q", "--quiet",   "Quiet output - only report errors")
+  on("-v", "--verbose", "Verbose output")
 
   arg :org_config_file
 

data/features/step_definitions/vcloud-launch_steps.rb

@@ -1,3 +1,3 @@
-Then(/^the banner should document that this app takes (\d+) argument$/) do |arg1|
+Then(/^the banner should document that this app takes (\d+) argument$/) do
    pending # express the regexp above with the code you wish you had
 end

data/features/vcloud-launch.feature

@@ -12,5 +12,7 @@ Feature: "vcloud-launch" works as a useful command-line tool
       |--version|
       |--dont-power-on|
       |--continue-on-error|
+      |--verbose|
+      |--quiet|
     And the banner should document that this app's arguments are:
       |org_config_file|

data/lib/vcloud/launcher.rb

@@ -10,10 +10,6 @@ require 'vcloud/launcher/version'
 module Vcloud
   module Launcher
 
-    def self.logger
-      @logger ||= Logger.new(STDOUT)
-    end
-
     def self.clone_object object
       Marshal.load(Marshal.dump(object))
     end

data/lib/vcloud/launcher/launch.rb

@@ -7,19 +7,17 @@ module Vcloud
       end
 
       def run(config_file = nil, cli_options = {})
+        set_logging_level(cli_options)
         config = @config_loader.load_config(config_file, config_schema)
         config[:vapps].each do |vapp_config|
-          Vcloud::Launcher.logger.info("\n")
-          Vcloud::Launcher.logger.info("Provisioning vApp #{vapp_config[:name]}.")
+          Vcloud::Core.logger.info("Provisioning vApp #{vapp_config[:name]}.")
           begin
             vapp = ::Vcloud::Launcher::VappOrchestrator.provision(vapp_config)
             #methadone sends option starting with 'no' as false.
             vapp.power_on unless cli_options["dont-power-on"]
-            Vcloud::Launcher.logger.info("Done! Provisioned vApp #{vapp_config[:name]} successfully.")
-            Vcloud::Launcher.logger.info("=" * 70)
+            Vcloud::Core.logger.info("Provisioned vApp #{vapp_config[:name]} successfully.")
           rescue RuntimeError => e
-            Vcloud::Launcher.logger.error("Failure : Could not provision vApp: #{e.message}")
-            Vcloud::Launcher.logger.info("=" * 70)
+            Vcloud::Core.logger.error("Failure: Could not provision vApp: #{e.message}")
             break unless cli_options["continue-on-error"]
           end
 
@@ -41,6 +39,17 @@ module Vcloud
         }
       }
       end
+
+      def set_logging_level(cli_options)
+        if cli_options[:verbose]
+          Vcloud::Core.logger.level = Logger::DEBUG
+        elsif cli_options[:quiet]
+          Vcloud::Core.logger.level = Logger::ERROR
+        else
+          Vcloud::Core.logger.level = Logger::INFO
+        end
+      end
+
     end
   end
 end

data/lib/vcloud/launcher/vapp_orchestrator.rb

@@ -5,16 +5,19 @@ module Vcloud
       def self.provision(vapp_config)
         name, vdc_name = vapp_config[:name], vapp_config[:vdc_name]
 
-        if vapp = Vcloud::Core::Vapp.get_by_name_and_vdc_name(name, vdc_name)
-          Vcloud::Launcher.logger.info("Found existing vApp #{name} in vDC '#{vdc_name}'. Skipping.")
-        else
-          template = Vcloud::Core::VappTemplate.get(vapp_config[:catalog], vapp_config[:catalog_item])
-          template_id = template.id
-
-          network_names = extract_vm_networks(vapp_config)
-          vapp = Vcloud::Core::Vapp.instantiate(name, network_names, template_id, vdc_name)
-          Vcloud::Launcher::VmOrchestrator.new(vapp.fog_vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
+        vapp_existing = Vcloud::Core::Vapp.get_by_name_and_vdc_name(name, vdc_name)
+        if vapp_existing
+          Vcloud::Core.logger.info("Found existing vApp #{name} in vDC '#{vdc_name}'. Skipping.")
+          return vapp_existing
         end
+
+        template = Vcloud::Core::VappTemplate.get(vapp_config[:catalog], vapp_config[:catalog_item])
+        template_id = template.id
+
+        network_names = extract_vm_networks(vapp_config)
+        vapp = Vcloud::Core::Vapp.instantiate(name, network_names, template_id, vdc_name)
+        Vcloud::Launcher::VmOrchestrator.new(vapp.fog_vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
+
         vapp
       end
 

data/lib/vcloud/launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Launcher
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/vcloud/launcher/vm_orchestrator.rb

@@ -10,9 +10,9 @@ module Vcloud
         @vm.update_name(@vm.vapp_name)
         @vm.configure_network_interfaces vm_config[:network_connections]
         @vm.update_storage_profile(vm_config[:storage_profile]) if vm_config[:storage_profile]
-        if hardware_config = vm_config[:hardware_config]
-          @vm.update_cpu_count(hardware_config[:cpu])
-          @vm.update_memory_size_in_mb(hardware_config[:memory])
+        if vm_config[:hardware_config]
+          @vm.update_cpu_count(vm_config[:hardware_config][:cpu])
+          @vm.update_memory_size_in_mb(vm_config[:hardware_config][:memory])
         end
         @vm.add_extra_disks(vm_config[:extra_disks])
         @vm.update_metadata(vm_config[:metadata])

data/spec/integration/launcher/storage_profile_integration_spec.rb

@@ -30,51 +30,51 @@ describe Vcloud::Launcher::Launch do
     end
 
     it "vdc 1 should have a storage profile without the href being specified" do
-        @vm_1[:StorageProfile][:name].should == @test_data[:storage_profile]
+      @vm_1[:StorageProfile][:name].should eq(@test_data[:storage_profile])
     end
 
     it "vdc 1's storage profile should have the expected href" do
-        @vm_1[:StorageProfile][:href].should == @test_data[:vdc_1_sp_href]
+      @vm_1[:StorageProfile][:href].should eq(@test_data[:vdc_1_sp_href])
     end
 
     it "vdc 2 should have the same named storage profile as vdc 1" do
-        @vm_2[:StorageProfile][:name].should == @test_data[:storage_profile]
+      @vm_2[:StorageProfile][:name].should eq(@test_data[:storage_profile])
     end
 
     it "the storage profile in vdc 2 should have a different href to the storage profile in vdc 1" do
-        @vm_2[:StorageProfile][:href].should == @test_data[:vdc_2_sp_href]
+      @vm_2[:StorageProfile][:href].should eq(@test_data[:vdc_2_sp_href])
     end
 
     it "when a storage profile is not specified, vm uses the default and continues" do
-        @vm_3[:StorageProfile][:name].should == @test_data[:default_storage_profile_name]
-        @vm_3[:StorageProfile][:href].should == @test_data[:default_storage_profile_href]
+      @vm_3[:StorageProfile][:name].should eq(@test_data[:default_storage_profile_name])
+      @vm_3[:StorageProfile][:href].should eq(@test_data[:default_storage_profile_href])
     end
 
-   it "when a storage profile is not specified, customize continues with other customizations" do
-        @vm_3_id = @vm_3[:href].split('/').last
-        @vm_3_metadata = Vcloud::Core::Vm.get_metadata @vm_3_id
-        @vm_3_metadata[:storage_profile_test_vm].should == true
+    it "when a storage profile is not specified, customize continues with other customizations" do
+      @vm_3_id = @vm_3[:href].split('/').last
+      @vm_3_metadata = Vcloud::Core::Vm.get_metadata @vm_3_id
+      @vm_3_metadata[:storage_profile_test_vm].should eq(true)
     end
 
     it "when a storage profile specified does not exist, vm uses the default" do
-        @vm_4[:StorageProfile][:name].should == @test_data[:default_storage_profile_name]
-        @vm_4[:StorageProfile][:href].should == @test_data[:default_storage_profile_href]
+      @vm_4[:StorageProfile][:name].should eq(@test_data[:default_storage_profile_name])
+      @vm_4[:StorageProfile][:href].should eq(@test_data[:default_storage_profile_href])
     end
 
     # This is a bug - if it has failed customization it should let the user know
     it "when storage profile specified doesn't exist, it errors and continues" do
-        @vm_4_id = @vm_4[:href].split('/').last
-        @vm_4_metadata = Vcloud::Core::Vm.get_metadata @vm_4_id
-        @vm_4_metadata[:storage_profile_test_vm].should be_nil
+      @vm_4_id = @vm_4[:href].split('/').last
+      @vm_4_metadata = Vcloud::Core::Vm.get_metadata @vm_4_id
+      @vm_4_metadata[:storage_profile_test_vm].should be_nil
     end
 
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @config_yaml
-        @fog_interface.delete_vapp(@vapp_id_1).should == true
-        @fog_interface.delete_vapp(@vapp_id_2).should == true
-        @fog_interface.delete_vapp(@vapp_id_3).should == true
-        @fog_interface.delete_vapp(@vapp_id_4).should == true
+        @fog_interface.delete_vapp(@vapp_id_1).should eq(true)
+        @fog_interface.delete_vapp(@vapp_id_2).should eq(true)
+        @fog_interface.delete_vapp(@vapp_id_3).should eq(true)
+        @fog_interface.delete_vapp(@vapp_id_4).should eq(true)
       end
     end
 

data/spec/integration/launcher/vcloud_launcher_spec.rb

@@ -18,14 +18,14 @@ describe Vcloud::Launcher::Launch do
       provisioned_vapp = @fog_interface.get_vapp @provisioned_vapp_id
 
       provisioned_vapp.should_not be_nil
-      provisioned_vapp[:name].should == test_data_1[:vapp_name]
-      provisioned_vapp[:Children][:Vm].count.should == 1
+      provisioned_vapp[:name].should eq(test_data_1[:vapp_name])
+      provisioned_vapp[:Children][:Vm].count.should eq(1)
     end
 
     after(:each) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @minimum_data_yaml
-        @fog_interface.delete_vapp(@provisioned_vapp_id).should == true
+        @fog_interface.delete_vapp(@provisioned_vapp_id).should eq(true)
       end
     end
   end
@@ -49,8 +49,8 @@ describe Vcloud::Launcher::Launch do
 
     context 'provision vapp' do
       it 'should create a vapp' do
-        @vapp[:name].should == @test_data[:vapp_name]
-        @vapp[:'ovf:NetworkSection'][:'ovf:Network'].count.should == 2
+        @vapp[:name].should eq(@test_data[:vapp_name])
+        @vapp[:'ovf:NetworkSection'][:'ovf:Network'].count.should eq(2)
         vapp_networks = @vapp[:'ovf:NetworkSection'][:'ovf:Network'].collect { |connection| connection[:ovf_name] }
         vapp_networks.should =~ [@test_data[:network1], @test_data[:network2]]
       end
@@ -63,23 +63,23 @@ describe Vcloud::Launcher::Launch do
 
     context "customize vm" do
       it "change cpu for given vm" do
-        extract_memory(@vm).should == '8192'
-        extract_cpu(@vm).should == '4'
+        extract_memory(@vm).should eq('8192')
+        extract_cpu(@vm).should eq('4')
       end
 
       it "should have added the right number of metadata values" do
-        @vm_metadata.count.should == 6
+        @vm_metadata.count.should eq(6)
       end
 
       it "the metadata should be equivalent to our input" do
-        @vm_metadata[:is_true].should == true
-        @vm_metadata[:is_integer].should == -999
-        @vm_metadata[:is_string].should == 'Hello World'
+        @vm_metadata[:is_true].should eq(true)
+        @vm_metadata[:is_integer].should eq(-999)
+        @vm_metadata[:is_string].should eq('Hello World')
       end
 
       it "should attach extra hard disks to vm" do
         disks = extract_disks(@vm)
-        disks.count.should == 3
+        disks.count.should eq(3)
         [{:name => 'Hard disk 2', :size => '1024'}, {:name => 'Hard disk 3', :size => '2048'}].each do |new_disk|
           disks.should include(new_disk)
         end
@@ -88,30 +88,30 @@ describe Vcloud::Launcher::Launch do
       it "should configure the vm network interface" do
         vm_network_connection = @vm[:NetworkConnectionSection][:NetworkConnection]
         vm_network_connection.should_not be_nil
-        vm_network_connection.count.should == 2
+        vm_network_connection.count.should eq(2)
 
 
         primary_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network1] }
-        primary_nic[:network].should == @test_data[:network1]
-        primary_nic[:NetworkConnectionIndex].should == @vm[:NetworkConnectionSection][:PrimaryNetworkConnectionIndex]
-        primary_nic[:IpAddress].should == @test_data[:network1_ip]
-        primary_nic[:IpAddressAllocationMode].should == 'MANUAL'
+        primary_nic[:network].should eq(@test_data[:network1])
+        primary_nic[:NetworkConnectionIndex].should eq(@vm[:NetworkConnectionSection][:PrimaryNetworkConnectionIndex])
+        primary_nic[:IpAddress].should eq(@test_data[:network1_ip])
+        primary_nic[:IpAddressAllocationMode].should eq('MANUAL')
 
         second_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network2] }
-        second_nic[:network].should == @test_data[:network2]
-        second_nic[:NetworkConnectionIndex].should == '1'
-        second_nic[:IpAddress].should == @test_data[:network2_ip]
-        second_nic[:IpAddressAllocationMode].should == 'MANUAL'
+        second_nic[:network].should eq(@test_data[:network2])
+        second_nic[:NetworkConnectionIndex].should eq('1')
+        second_nic[:IpAddress].should eq(@test_data[:network2_ip])
+        second_nic[:IpAddressAllocationMode].should eq('MANUAL')
 
       end
 
       it 'should assign guest customization script to the VM' do
         @vm[:GuestCustomizationSection][:CustomizationScript].should =~ /message: hello world/
-        @vm[:GuestCustomizationSection][:ComputerName].should == @test_data[:vapp_name]
+        @vm[:GuestCustomizationSection][:ComputerName].should eq(@test_data[:vapp_name])
       end
 
       it "should assign storage profile to the VM" do
-        @vm[:StorageProfile][:name].should == @test_data[:storage_profile]
+        @vm[:StorageProfile][:name].should eq(@test_data[:storage_profile])
       end
 
     end
@@ -119,7 +119,7 @@ describe Vcloud::Launcher::Launch do
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @config_yaml
-        @fog_interface.delete_vapp(@vapp_id).should == true
+        @fog_interface.delete_vapp(@vapp_id).should eq(true)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
 require 'erb_helper'
 require 'vcloud/launcher'
-require 'support/stub_fog_interface.rb'

data/spec/vcloud/launcher/launch_spec.rb

@@ -2,47 +2,75 @@ require 'spec_helper'
 
 module Vcloud
   describe Launcher::Launch do
-    before(:each) do
-      config_loader = double(:config_loader)
-      expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
-      @successful_app_1 = {
-          :name => "successful app 1",
-          :vdc_name => "Test Vdc",
-          :catalog => "default",
-          :catalog_item => "ubuntu-precise"
-      }
-      @fake_failing_app = {
-          :name => "fake failing app",
-          :vdc_name => "wrong vdc",
-          :catalog => "default",
-          :catalog_item => "ubuntu-precise"
-      }
-      @successful_app_2 = {
-          :name => "successful app 2",
-          :vdc_name => "Test Vdc",
-          :catalog => "default",
-          :catalog_item => "ubuntu-precise"
-      }
-      expect(config_loader).to receive(:load_config).
-        and_return({:vapps => [@successful_app_1, @fake_failing_app, @successful_app_2]})
-    end
+    context "#run" do
+      before(:each) do
+        config_loader = double(:config_loader)
+        expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
+        @successful_app_1 = {
+            :name => "successful app 1",
+            :vdc_name => "Test Vdc",
+            :catalog => "default",
+            :catalog_item => "ubuntu-precise"
+        }
+        @fake_failing_app = {
+            :name => "fake failing app",
+            :vdc_name => "wrong vdc",
+            :catalog => "default",
+            :catalog_item => "ubuntu-precise"
+        }
+        @successful_app_2 = {
+            :name => "successful app 2",
+            :vdc_name => "Test Vdc",
+            :catalog => "default",
+            :catalog_item => "ubuntu-precise"
+        }
+        expect(config_loader).to receive(:load_config).
+          and_return({:vapps => [@successful_app_1, @fake_failing_app, @successful_app_2]})
+      end
+
+      it "should stop on failure by default" do
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
+        expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(@successful_app_2)
+
+        cli_options = {}
+        Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
+      end
 
-    it "should stop on failure by default" do
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-      expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(@successful_app_2)
+      it "should continue on error if cli option continue-on-error is set" do
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_2).and_return(double(:vapp, :power_on => true))
+
+        cli_options = {"continue-on-error" => true}
+        Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
+      end
 
-      cli_options = {}
-      Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
     end
 
-    it "should continue on error if cli option continue-on-error is set" do
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_2).and_return(double(:vapp, :power_on => true))
+    context "#set_logging_level" do
+
+      it "sets the logging level to DEBUG when :verbose is specified" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+        Vcloud::Launcher::Launch.new.set_logging_level(:verbose => true)
+      end
+
+      it "sets the logging level to ERROR when :quiet is specified" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::ERROR)
+        Vcloud::Launcher::Launch.new.set_logging_level(:quiet => true)
+      end
+
+      it "sets the logging level to DEBUG when :quiet and :verbose are specified" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+        Vcloud::Launcher::Launch.new.set_logging_level(:quiet => true, :verbose => true)
+      end
+
+      it "sets the logging level to INFO by default" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::INFO)
+        Vcloud::Launcher::Launch.new.set_logging_level({})
+      end
 
-      cli_options = {"continue-on-error" => true}
-      Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
     end
+
   end
 end

data/spec/vcloud/launcher/vapp_orchestrator_spec.rb

@@ -4,11 +4,6 @@ module Vcloud
   module Launcher
     describe VappOrchestrator do
 
-      before(:each) do
-        @mock_fog_interface = StubFogInterface.new
-        Vcloud::Fog::ServiceInterface.stub(:new).and_return(@mock_fog_interface)
-      end
-
       context "provision a vapp" do
 
         before(:each) do
@@ -27,7 +22,7 @@ module Vcloud
           existing_vapp = double(:vapp, :name => 'existing-vapp-1')
 
           Core::Vapp.should_receive(:get_by_name_and_vdc_name).with('test-vapp-1', 'test-vdc-1').and_return(existing_vapp)
-          Vcloud::Launcher.logger.should_receive(:info).with('Found existing vApp test-vapp-1 in vDC \'test-vdc-1\'. Skipping.')
+          Vcloud::Core.logger.should_receive(:info).with('Found existing vApp test-vapp-1 in vDC \'test-vdc-1\'. Skipping.')
           actual_vapp = VappOrchestrator.provision @config
           actual_vapp.should_not be_nil
           actual_vapp.should == existing_vapp

data/vcloud-launcher.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_runtime_dependency 'methadone'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.0.12'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.3.0'
   s.add_development_dependency 'aruba', '~> 0.5.3'
   s.add_development_dependency 'cucumber', '~> 1.3.10'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rubocop'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-launcher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -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'
 description: 
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -132,13 +148,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/vcloud-launch
-- examples/.fog-example.fog
 - examples/vcloud-launch/basic_preamble.erb
 - examples/vcloud-launch/complete_vapp_config.yaml
 - examples/vcloud-launch/minimal_vapp_config.yaml
@@ -163,7 +179,6 @@ files:
 - spec/integration/launcher/storage_profile_integration_spec.rb
 - spec/integration/launcher/vcloud_launcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/stub_fog_interface.rb
 - spec/vcloud/launcher/launch_spec.rb
 - spec/vcloud/launcher/vapp_orchestrator_spec.rb
 - spec/vcloud/launcher/vm_orchestrator_spec.rb
@@ -190,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3318848198983750692
+      hash: -774261046686009457
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -209,7 +224,6 @@ test_files:
 - spec/integration/launcher/storage_profile_integration_spec.rb
 - spec/integration/launcher/vcloud_launcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/stub_fog_interface.rb
 - spec/vcloud/launcher/launch_spec.rb
 - spec/vcloud/launcher/vapp_orchestrator_spec.rb
 - spec/vcloud/launcher/vm_orchestrator_spec.rb

data/examples/.fog-example.fog

@@ -1,15 +0,0 @@
-p1-production:
-  vcloud_director_username: '<username_from_top_right_of_skyscape_flash_ui>@<org_id_from_url_in_skyscape_flash_ui>'
-  vcloud_director_password: '<your_skyscape_password>'
-  vcloud_director_host: 'vcd.portal.skyscapecloud.com'
-
-# You can extract this information by logging into skyscape portal
-performance-platform-production:
-  vcloud_director_username: '<xxx.x.xxxxxx>@<x-x-xx-xxxxxx>'
-  vcloud_director_password: '<your_skyscape_password>'
-  vcloud_director_host: 'vcd.portal.skyscapecloud.com'
-
-carrenza-preview:
-  vcloud_director_username: '<email>@<org_id>'
-  vcloud_director_password: ''
-  vcloud_director_host: 'myvdc.carrenza.net'

data/spec/support/stub_fog_interface.rb

@@ -1,59 +0,0 @@
-require 'ostruct'
-
-class StubFogInterface
-
-  def name
-    'Test vDC 1'
-  end
-
-  def vdc_object_by_name(vdc_name)
-    vdc = OpenStruct.new
-    vdc.name = 'test-vdc-1'
-    vdc
-  end
-
-  def template
-    { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
-  end
-
-  def find_networks(network_names, vdc_name)
-    [{
-      :name => 'org-vdc-1-net-1',
-      :href => '/org-vdc-1-net-1-id',
-    }]
-  end
-
-  def get_vapp(id)
-    { :name => 'test-vapp-1' }
-  end
-
-  def get_edge_gateway(id)
-    { 
-      :name => 'test-edgegw-1',
-      :href => "/#{id}",
-    }
-  end
-
-  def vdc(name)
-    { }
-  end
-
-  def post_instantiate_vapp_template(vdc, template, name, params)
-    {
-      :href => '/test-vapp-1-id',
-      :Children => {
-        :Vm => ['bogus vm data']
-      }
-    }
-  end
-
-  def get_vapp_by_vdc_and_name
-    { }
-  end
-
-  def template(catalog_name, name)
-    { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
-  end
-
-
-end