vcloud-launcher 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd33021e4789fe353a36dd716c660f8bfa7eddd8
-  data.tar.gz: ee334e1e7ab891401bf610b31cf7ef7bb7f6922f
+  metadata.gz: c09c7b8b2624797fc9c86bf9eac065d11f9d610b
+  data.tar.gz: 152700b82e48f83f4ff78127ac03ddb67b0384e3
 SHA512:
-  metadata.gz: d47d2e4213fc5030a02e26c00de8e50a63bb2dc7f6fb35014c6381f2e9442dd6b20f128fd7d3772c2856c83c10c1fda8813bf67ac7d5fbc21c03d10871906bc0
-  data.tar.gz: 50cc8a9431b5d838f7c10752431f89331a4b9abbfbf36df4e269cb18db145e16df56941c434f3b260fc38d262076be1aa7f3149bfb8e26def7371627b89d117a
+  metadata.gz: dfb066f8681479d249cf759dc316aaecfe78025fce15057e5ecdebf77e2d9d051aa92a6dfb5b3331a4b97e06aa1a08f1aad36a7ab4ac5d9cae41ce212042dde3
+  data.tar.gz: 4dffd95c00df8f0ea6c72201dd2f29ab2ec65f681c650d5e5f5ede49bf164c54cebc94d4509aa0760f13544056397bd666817e54b26a4f720db0f14a7e89f01e

data/.travis.yml

@@ -1,7 +1,9 @@
 ---
 language: ruby
+sudo: false
 rvm:
-  - 2.0.0
-  - 2.1.2
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.1.0 (2017-06-22)
+
+  - Remove support for older versions of Ruby than 2.2.2
+  - Add support for Ruby 2.3.0 and 2.4.0
+  - Update dependency for vCloud Core and vCloud Tools Tester
+  - Various bug fixes
+
+## 2.0.1 (2016-03-24)
+
+  - Add dry-run option.
+  - Update dependencies for vCloud Core and vCloud Tools Tester
+
 ## 2.0.0 (2015-10-20)
 
   - Remove support for Ruby 1.9.3, which is now end-of-life.

data/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to vCloud Launcher
 
-We really welcome contributions.
+We now consider vCloud Tools feature complete for our purposes. We'd be happy to consider pull requests for new features but please discuss them with us in the issues first so we can let you know if it's something we'd be likely to merge. We will continue to make maintenance and bug fixes.
 
 ## A quick guide on how to contribute
 
@@ -36,11 +36,7 @@ We really welcome contributions.
 
 ## How soon will we respond?
 
-We will comment on your pull request within two working days. However, we might not be able to review it immediately.
-
-We may come back to you with comments and suggestions, and if we would like you to make changes, we will close the pull request as well as adding details of the changes we'd like you to make.
-
-If you feel your pull request has been outstanding too long, please feel free to bump it by making a comment on it.
+We will comment on your issue as soon as we can. If you feel your issue is important, please feel free to bump it by making a comment on it or raise your issue on the [mailing list](https://groups.google.com/a/digital.cabinet-office.gov.uk/forum/#!forum/vcloud-tools).
 
 ## Guidelines for making a pull request
 

data/Jenkinsfile

@@ -0,0 +1,40 @@
+#!/usr/bin/env groovy
+
+repoName = JOB_NAME.split('/')[0]
+
+node {
+  def govuk = load '/var/lib/jenkins/groovy_scripts/govuk_jenkinslib.groovy'
+
+  try {
+    stage("Checkout") {
+      govuk.checkoutFromGitHubWithSSH(repoName)
+    }
+
+    stage("Clean up workspace") {
+      govuk.cleanupGit()
+    }
+
+    stage("bundle install") {
+      govuk.setEnvar("RBENV_VERSION", "2.2.2")
+      govuk.bundleGem()
+    }
+
+    stage("Run tests") {
+      govuk.runTests()
+    }
+
+    if (env.BRANCH_NAME == "master") {
+      stage("Publish gem") {
+        govuk.publishGem(repoName, env.BRANCH_NAME)
+      }
+    }
+  } catch (e) {
+    currentBuild.result = "FAILED"
+    step([$class: 'Mailer',
+          notifyEveryUnstableBuild: true,
+          recipients: 'govuk-ci-notifications@digital.cabinet-office.gov.uk',
+          sendToIndividuals: true])
+    throw e
+  }
+}
+

data/README.md

@@ -53,11 +53,7 @@ Please see the [vcloud-tools usage documentation](http://gds-operations.github.i
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Please see [CONTRIBUTING.md](/CONTRIBUTING.md).
 
 ## Other settings
 

data/examples/vcloud-launch/complete_vapp_config.yaml

@@ -9,7 +9,7 @@
 #  * its memory reconfigured to 4096MB
 #  * its cpu count reconfigured to be 2.
 #  * The Primary NIC will be moved to FrontendNetwork, and given a manual ip
-#    of 192.0.2.10
+#    of 192.168.2.10
 #  * A Secondary NIC will be created on BackendNetwork and given an IP address
 #    via DHCP (the result of not supplying an ip_address parameter)
 #  * a bootstrap 'guest customization script' is provided, which will be
@@ -37,7 +37,7 @@ vapps:
         cpu: 2
       network_connections:
       - name: 'FrontendNetwork'
-        ip_address: '192.0.2.10'
+        ip_address: '192.168.2.10'
       - name: 'BackendNetwork'
         allocation_mode: 'pool'
       extra_disks:

data/examples/vcloud-launch/multiple_vapps_simple.yaml

@@ -18,7 +18,7 @@ vapps:
       cpu: '2'
     network_connections:
     - name: Default
-      ip_address: 192.0.2.11
+      ip_address: 192.168.2.11
 
 - name: vapp-example-2
   vdc_name: "Our VDC1"
@@ -30,7 +30,7 @@ vapps:
       cpu: '2'
     network_connections:
     - name: Default
-      ip_address: 192.0.2.12
+      ip_address: 192.168.2.12
 
 - name: vapp-example-3
   vdc_name: "Our VDC1"
@@ -42,4 +42,4 @@ vapps:
       cpu: '2'
     network_connections:
     - name: Default
-      ip_address: 192.0.2.13
+      ip_address: 192.168.2.13

data/examples/vcloud-launch/yaml_anchors_example.yaml

@@ -55,15 +55,15 @@ vapps:
         <<: *BASE_VM_VARS
         role: frontend
     network_connections:
-    - { name: *APP_NETWORK,  ip_address: 192.0.2.11 }
-    - { name: *MGMT_NETWORK, ip_address: 198.51.100.11 }
+    - { name: *APP_NETWORK,  ip_address: 192.168.2.11 }
+    - { name: *MGMT_NETWORK, ip_address: 192.168.100.11 }
 - <<: *frontend_vapp
   name: frontend-example-2
   vm:
     <<: *frontend_vm
     network_connections:
-    - { name: *APP_NETWORK,  ip_address: 192.0.2.12 }
-    - { name: *MGMT_NETWORK, ip_address: 198.51.100.12 }
+    - { name: *APP_NETWORK,  ip_address: 192.168.2.12 }
+    - { name: *MGMT_NETWORK, ip_address: 192.168.100.12 }
 
 - &backend_vapp
   <<: *BASE_VAPP
@@ -76,12 +76,12 @@ vapps:
         <<: *BASE_VM_VARS
         role: backend
     network_connections:
-    - { name: *APP_NETWORK,  ip_address: 192.0.2.51 }
-    - { name: *MGMT_NETWORK, ip_address: 198.51.100.51 }
+    - { name: *APP_NETWORK,  ip_address: 192.168.2.51 }
+    - { name: *MGMT_NETWORK, ip_address: 192.168.100.51 }
 - <<: *backend_vapp
   name: backend-example-2
   vm:
     <<: *backend_vm
     network_connections:
-    - { name: *APP_NETWORK,  ip_address: 192.0.2.52 }
-    - { name: *MGMT_NETWORK, ip_address: 198.51.100.52 }
+    - { name: *APP_NETWORK,  ip_address: 192.168.2.52 }
+    - { name: *MGMT_NETWORK, ip_address: 192.168.100.52 }

data/lib/vcloud/launcher/cli.rb

@@ -14,6 +14,7 @@ module Vcloud
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => false,
+          "dry-run"           => false,
         }
 
         parse(argv_array)
@@ -95,6 +96,10 @@ Example configuration files can be found in:
             puts Vcloud::Launcher::VERSION
             exit
           end
+
+          opts.on("--dry-run", "Don't apply configuration changes") do
+            @options["dry-run"] = true
+          end
         end
 
         @usage_text = opt_parser.to_s

data/lib/vcloud/launcher/launch.rb

@@ -23,17 +23,22 @@ module Vcloud
         @config[:vapps].each do |vapp_config|
           Vcloud::Core.logger.info("Provisioning vApp #{vapp_config[:name]}.")
           begin
-            vapp = ::Vcloud::Launcher::VappOrchestrator.provision(vapp_config)
-            vapp.power_on unless cli_options["dont-power-on"]
-            if cli_options["post-launch-cmd"]
-              run_command(vapp_config, cli_options["post-launch-cmd"])
+            if cli_options["dry-run"]
+              # rubocop:disable Style/UselessAssignment
+              vapp = ::Vcloud::Launcher::VappOrchestrator.provision(vapp_config, true)
+              # rubocop:enable Style/UselessAssignment
+            else
+              vapp = ::Vcloud::Launcher::VappOrchestrator.provision(vapp_config)
+              vapp.power_on unless cli_options["dont-power-on"]
+              if cli_options["post-launch-cmd"]
+                run_command(vapp_config, cli_options["post-launch-cmd"])
+              end
             end
-            Vcloud::Core.logger.info("Provisioned vApp #{vapp_config[:name]} successfully.")
+          Vcloud::Core.logger.info("Provisioned vApp #{vapp_config[:name]} successfully.")
           rescue RuntimeError => e
             Vcloud::Core.logger.error("Failure: Could not provision vApp: #{e.message}")
             break unless cli_options["continue-on-error"]
           end
-
         end
       end
 

data/lib/vcloud/launcher/vapp_orchestrator.rb

@@ -2,7 +2,7 @@ module Vcloud
   module Launcher
     class VappOrchestrator
 
-      def self.provision(vapp_config)
+      def self.provision(vapp_config, dry_run = false)
         name, vdc_name = vapp_config[:name], vapp_config[:vdc_name]
 
         vapp_existing = Vcloud::Core::Vapp.get_by_name_and_vdc_name(name, vdc_name)
@@ -15,12 +15,15 @@ module Vcloud
         catalog_name = vapp_config[:catalog_name] || vapp_config[:catalog]
         template = Vcloud::Core::VappTemplate.get(template_name, catalog_name)
         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.vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
+        if dry_run
+          Vcloud::Core.logger.info("Instantiating new vApp #{name} in vDC '#{vdc_name}'")
+        else
+          vapp = Vcloud::Core::Vapp.instantiate(name, network_names, template_id, vdc_name)
+          Vcloud::Launcher::VmOrchestrator.new(vapp.vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
 
-        vapp
+          vapp
+        end
       end
 
       def self.extract_vm_networks(config)

data/lib/vcloud/launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Launcher
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

data/rbenv_version.sh

@@ -1 +1 @@
-export RBENV_VERSION="2.0.0"
+export RBENV_VERSION="2.2.2"

data/spec/vcloud/launcher/cli_spec.rb

@@ -54,6 +54,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
 
@@ -70,6 +71,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
 
@@ -86,6 +88,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
 
@@ -102,6 +105,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => true,
           "post-launch-cmd"   => false,
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
 
@@ -118,6 +122,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => true,
+          "dry-run"           => false,
         }
       }
 
@@ -134,6 +139,24 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => false,
           "verbose"           => true,
+          "dry-run"           => false,
+        }
+      }
+
+      it_behaves_like "a good CLI command"
+    end
+
+    context "when asked to do a dry-run" do
+      let(:args) { [ config_file, "--dry-run" ] }
+      let(:cli_options) {
+        {
+          "vapp-name"      => false,
+          "dont-power-on"     => false,
+          "continue-on-error" => false,
+          "quiet"             => false,
+          "post-launch-cmd"   => false,
+          "verbose"           => false,
+          "dry-run"           => true,
         }
       }
 
@@ -150,6 +173,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => 'GIRAFFE',
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
 
@@ -166,6 +190,7 @@ describe Vcloud::Launcher::Cli do
           "quiet"             => false,
           "post-launch-cmd"   => 'GIRAFFE LION',
           "verbose"           => false,
+          "dry-run"           => false,
         }
       }
       it "exits with a error code, because this is not supported" do

data/spec/vcloud/launcher/independent_disk_orchestrator_spec.rb

@@ -88,7 +88,7 @@ describe Vcloud::Launcher::IndependentDiskOrchestrator do
       expect(mock_vm).to receive(:attach_independent_disks).
         with([mock_disk_1, mock_disk_2]).
         and_return(true)
-      expect(subject.attach(independent_disk_config)).to be_true
+      expect(subject.attach(independent_disk_config)).to be true
     end
   end
 

data/spec/vcloud/launcher/schema/launcher_vapps_spec.rb

@@ -23,7 +23,7 @@ describe Vcloud::Launcher::Schema::LAUNCHER_VAPPS do
 
     it "validates successfully" do
       validation = Vcloud::Core::ConfigValidator.new(:base, config, schema)
-      expect(validation.valid?).to be_true
+      expect(validation.valid?).to be true
     end
 
   end
@@ -47,7 +47,7 @@ describe Vcloud::Launcher::Schema::LAUNCHER_VAPPS do
 
     it "does not validate successfully" do
       validation = Vcloud::Core::ConfigValidator.new(:base, config, schema)
-      expect(validation.valid?).to be_false
+      expect(validation.valid?).to be false
       expect(validation.errors).to eq(['independent_disks is not an array'])
     end
 
@@ -72,7 +72,7 @@ describe Vcloud::Launcher::Schema::LAUNCHER_VAPPS do
 
     it "does not validate successfully" do
       validation = Vcloud::Core::ConfigValidator.new(:base, config, schema)
-      expect(validation.valid?).to be_false
+      expect(validation.valid?).to be false
       expect(validation.errors).to eq(
         ['independent_disks: is not a hash', 'independent_disks: is not a hash']
       )
@@ -99,7 +99,7 @@ describe Vcloud::Launcher::Schema::LAUNCHER_VAPPS do
 
     it "does not validate successfully" do
       validation = Vcloud::Core::ConfigValidator.new(:base, config, schema)
-      expect(validation.valid?).to be_false
+      expect(validation.valid?).to be false
       expect(validation.errors).to eq([
         "independent_disks: parameter 'nametypo' is invalid",
         "independent_disks: missing 'name' parameter"

data/vcloud-launcher.gemspec

@@ -18,16 +18,15 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 1.1'
+  s.add_runtime_dependency 'vcloud-core', '~> 2.1.0'
+  s.add_runtime_dependency 'nokogiri', '~> 1.6.8.1'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'rubocop', '~> 0.23.0'
-  # Pin SimpleCov to < 0.8.x until this issue is resolved:
-  # https://github.com/colszowka/simplecov/issues/281
-  s.add_development_dependency 'simplecov', '~> 0.7.1'
-  s.add_development_dependency 'vcloud-tools-tester', '~> 1.0.0'
+  s.add_development_dependency 'rake', '>= 12'
+  s.add_development_dependency 'rspec', '>= 3.6'
+  s.add_development_dependency 'rubocop', '~> 0.49.1'
+  s.add_development_dependency 'simplecov', '~> 0.14.1'
+  s.add_development_dependency 'vcloud-tools-tester', '~> 2.1.0'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-launcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Anna Shipman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -42,86 +56,86 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
 description: 
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -130,11 +144,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -189,17 +204,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tool to launch and configure vCloud vApps