vcloud-net_launcher 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a460a417176f2d135c093c59de11e31054d8bd6c
-  data.tar.gz: d9c88366f56f06a1e25ddaefe4908239624122a5
+  metadata.gz: 739863d3e62e98affe880c20599c211b48599ce4
+  data.tar.gz: daf3ded7f790d846d3a42c955e91ca1c5c45407e
 SHA512:
-  metadata.gz: 7ae6304584262e1f5921e5250b4c337747d6b5e83244550436c354ad34aac46d2ea10387ff7a896501828af7fb10e41d23f7b050d26c2db37a06f4fa437ff54b
-  data.tar.gz: b9bbfa1b14d1e0ee7f4bd3c6b1ef9c96f2609799e266afc290e958352eacf435f5f14a63877d439ff7f3962e0ec532c0985c1f56fd03c93a76514eca16ea5290
+  metadata.gz: eb3a54353bb68580354565c4bae966564aa5e0f5f256c1744a2d23215d4d1ceb04b0f12455be4bbb4092f7345cbb438f8ae3e7649975029ae1a7c8c188ed5cb9
+  data.tar.gz: 43cd70904825cde67410350c205c4dfd81870ba10ac4833b835c99047052dc2edb15a12e53d7ec903bbce0035b040085ee65af2efb3b183e69c4ab75ce89e771

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,10 @@
+## 2.1.0 (2017-06-23)
+
+  - Removed support for Ruby older than 2.2.2
+  - Added support for Ruby 2.3.0 and 2.4.0
+  - Updated dependency on new version of vCloud Core
+  - Various bug fixes
+
 ## 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 Net 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

@@ -46,7 +46,7 @@ GUI and re-run `vcloud-net-launch`.
 
 ## Contributing
 
-We welcome contributions. Please see the [contributing guidelines](/CONTRIBUTING.md).
+Please see the [contributing guidelines](/CONTRIBUTING.md).
 
 ## Other settings
 

data/lib/vcloud/net_launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module NetLauncher
-    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/net_launcher/net_launch_schema_spec.rb

@@ -11,7 +11,7 @@ describe Vcloud::NetLauncher do
       }
 
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_true
+      expect(validator.valid?).to be true
       expect(validator.errors).to be_empty
     end
 
@@ -32,7 +32,7 @@ describe Vcloud::NetLauncher do
       }
 
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_true
+      expect(validator.valid?).to be true
       expect(validator.errors).to be_empty
     end
 
@@ -44,7 +44,7 @@ describe Vcloud::NetLauncher do
       }
 
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_false
+      expect(validator.valid?).to be false
       expect(validator.errors).to eq(["base: parameter 'no_networks_here' is invalid", "base: missing 'org_vdc_networks' parameter"])
     end
 
@@ -59,7 +59,7 @@ describe Vcloud::NetLauncher do
         ]
       }
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_true
+      expect(validator.valid?).to be true
       expect(validator.errors).to be_empty
     end
 
@@ -82,7 +82,7 @@ describe Vcloud::NetLauncher do
       }
 
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_true
+      expect(validator.valid?).to be true
       expect(validator.errors).to be_empty
     end
 
@@ -100,7 +100,7 @@ describe Vcloud::NetLauncher do
       }
 
       validator = Vcloud::Core::ConfigValidator.validate(:base, test_config, Vcloud::NetLauncher::Schema::NET_LAUNCH)
-      expect(validator.valid?).to be_false
+      expect(validator.valid?).to be false
       expect(validator.errors).to eq(["ip_ranges: missing 'end_address' parameter"])
     end
   end

data/vcloud-net_launcher.gemspec

@@ -20,17 +20,16 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.3'
+  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-net_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-30 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: Tool to launch and configure vCloud networks. Uses vcloud-core.
 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
@@ -169,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      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 networks