vagrant-service-manager 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf741305f765a3885caab63cddcfdd6428d3ddf9
-  data.tar.gz: 799608609c331ee3a35586a53d56139cbfbe0998
+  metadata.gz: db7d21ac315f5396203911de486a543e43c3afa7
+  data.tar.gz: 63bfe53f87818feb3d5419bebe116b1ece15dd53
 SHA512:
-  metadata.gz: 90d35a506e05a208df03011389b0da295c5b526581c24542d9aef32dfc84344f9e1842761a62e6df78dbff5b9dd4abdfba0dee3edb076c35d34bc6ec478df419
-  data.tar.gz: 867fcc3a0cbcb1adf96d615fcffa02816af73651ad4009f8672618e2483a395df5e0d1d212969fc9b02f4c89f66a1277332802bcb396712c5da8e53e28d6a6c7
+  metadata.gz: d064533950594f7784f42d60d040b285310a9871f57b25014ee5233b995d2274d36847e3a241cee0daa18f91efbd24e5353a94c1d2007168719b109637197b77
+  data.tar.gz: 37a7972b7aff6ea2cfa9f28e5c15d29a178c6d4daea897c12c47178cc4f9745f45e62bf4105d863307c484bc5999ff8bf5c54bea2f2cc48342ec5183478e6925

data/.config/cucumber.yml

@@ -1,7 +1,8 @@
 # config/cucumber.yml
 ##YAML Template
 ---
-default: --profile html
+default: --profile html --tags ~@ci-only
+all: --profile html
 
 pretty: --format pretty -b
 html: --format progress --format html --out=build/features_report.html -b

data/.github/ISSUE_TEMPLATE.MD

@@ -0,0 +1,39 @@
+<!--
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository.
+For more information about reporting issues, see
+https://github.com/budhrg/vagrant-service-manager/blob/master/CONTRIBUTING.adoc#submitting-issues.
+-->
+
+**OS details:**
+
+
+**Provider:**
+VirtualBox and/or Libvirt and/or HyperV (for CDK only)
+
+
+**Output of `vagrant -v`:**
+```
+(paste your output here)
+```
+
+**Output of `vagrant plugin list`:**
+```
+(paste your output here)
+```
+
+**Output of `vagrant service-manager box version`:**
+```
+(paste your output here)
+```
+
+**Steps to reproduce the issue:**
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+**Describe the results you expected:**

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v1.2.2 Aug 04, 2016
+
+- Fix #365 undefined method `captures' for nil:NilClass @budhrg
+- Fix #348 Handle 302 redirection in install-cli URL validation @budhrg
+- Adding docs about using Cucumber tags @hferentschik
+- Fix #357 Unable to download cli if user used latest tag or a alpha/beta tag @budhrg
+- Fix #358 Adding reference to ADB installation documentation @hferentschik
+- Fix #352 Create ISSUE_TEMPLATE.MD @budhrg
+
 ## v1.2.1 Jul 15, 2016
 
 - Fix #343 Updated CHANGELOG for user name @budhrg

data/README.adoc

@@ -35,6 +35,9 @@ Vagrant plugin installation method:
 $ vagrant plugin install vagrant-service-manager
 ------------------------------------------------
 
+NOTE: To resolve any issues with the plugin installation and for more information on how to install Vagrant on various systems, refer to the
+https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst[ADB installation instructions].
+
 == Usage
 
 === Example execution of the plugin
@@ -213,9 +216,18 @@ acceptance tests. They can be run via:
 $ bundle exec rake features
 ---------------------------
 
+You can run a single feature specifying the path to the feature file
+to run via the _FEATURE_ environment variable:
+
+-----------------------------------------------------------------------
+$ bundle exec rake features FEATURE=features/<feature-filename>.feature
+-----------------------------------------------------------------------
+
 NOTE: These Cucumber tests do not run on Windows, pending resolution of
 https://github.com/projectatomic/vagrant-service-manager/issues/213[Issue #213].
 
+==== Controlling virtualization provider and box type via _PROVIDER_ and _BOX_ environment variables
+
 Per default, only the scenarios for ADB in combination with the
 VirtualBox provider are run. However, you can also run the tests against CDK
 and/or use the Libvirt provider using the environment variables _BOX_
@@ -232,23 +244,43 @@ $ bundle exec rake features BOX=cdk,adb
 $ bundle exec rake features BOX=cdk,adb PROVIDER=libvirt,virtualbox
 -----------------------------------------------------
 
+==== Test boxes
+
 The _features_ task will transparently download the required Vagrant
-boxes and cache them in _.boxes_. The cache can be cleared
-via the _clean_boxes_ task.
+boxes and cache them in the _.boxes_ directory. The cache can be cleared
+via the _clean_boxes_ task. For implementation details refer to the
+https://github.com/projectatomic/vagrant-service-manager/blob/master/Rakefile[Rakefile].
 
 Using the variable _NIGHTLY=true_ you can make sure that the
 latest nightly build of the CDK is used (VPN access required).
-Per default the latest public release of the CDK is used.
 
-You can also run a single feature specifying the explicit feature file
-to use:
+--------------------------------------------------
+# Uses the latest nightly build of the CDK instead of the latest public release as per developer.redhat.com
+$ bundle exec rake features BOX=cdk NIGHTLY=true
+--------------------------------------------------
 
------------------------------------------------------------------------
-$ bundle exec rake features FEATURE=features/<feature-filename>.feature
------------------------------------------------------------------------
+NOTE: Per default the latest public release of the CDK is used.
+
+==== Cucumber tags
+
+Some of the scenarios take a long time to run, so in order to keep the
+turn-around time on the development machine acceptable, we also make
+use of the _@ci-only_ https://github.com/cucumber/cucumber/wiki/Tags[tag].
+
+Per default scenarios annotated with _@ci-only_ are only run on the
+https://ci.centos.org/job/vagrant-service-manager[CI server]. Also, to run these tests locally,
+you need to activate the _all_ profile:
+
+--------------------------------------------------
+bundle exec rake features CUCUMBER_OPTS='-p all'
+--------------------------------------------------
+
+For other defined profiles refer to Cucumber config file https://github.com/projectatomic/vagrant-service-manager/blob/master/.config/cucumber.yml[cucumber.yml].
+
+==== Cucumber test reports
 
 After test execution, the Cucumber test reports can be found under
-_build/features_report.html_. They can also be opened via:
+_build/features_report.html_. They can be opened via:
 
 ---------------------------------------
 $ bundle exec rake features:open_report

data/features/adb-openshift.feature

@@ -0,0 +1,81 @@
+Feature: Command output from various OpenShift related commands in ADB
+  service-manager should return the correct output from commands affecting OpenShift in ADB
+
+  @ci-only
+  Scenario Outline: Boot and execute commands
+    Given box is <box>
+    And provider is <provider>
+    And a file named "Vagrantfile" with:
+    """
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
+
+    Vagrant.configure('2') do |config|
+      config.vm.box = '<box>'
+      config.vm.box_url = 'file://../../.boxes/<box>-<provider>.box'
+      config.vm.network :private_network, ip: '<ip>'
+      config.vm.synced_folder '.', '/vagrant', disabled: true
+      config.servicemanager.services = 'docker, openshift'
+
+      config.servicemanager.openshift_image_tag = 'v1.2.1'
+      config.servicemanager.openshift_image_name = 'openshift/origin'
+      config.servicemanager.openshift_docker_registry = 'docker.io'
+    end
+    """
+
+    When I successfully run `bundle exec vagrant up --provider <provider>`
+    # TODO, for some reason I can not use 'successfully' here. Seems the exit code is not 0 in this case!?
+    And I run `bundle exec vagrant service-manager env openshift`
+    Then stdout from "bundle exec vagrant service-manager env openshift" should be evaluable in a shell
+    And stdout from "bundle exec vagrant service-manager env openshift" should contain:
+    """
+    # You can access the OpenShift console on: https://<ip>:8443/console
+    # To use OpenShift CLI, run: oc login https://<ip>:8443
+    export OPENSHIFT_URL=https://<ip>:8443
+    export OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    export DOCKER_REGISTRY=hub.openshift.centos7-adb.<ip>.xip.io
+
+    # run following command to configure your shell:
+    # eval "$(vagrant service-manager env openshift)"
+    """
+
+    When I successfully run `bundle exec vagrant service-manager env openshift --script-readable`
+    Then stdout from "bundle exec vagrant service-manager env openshift --script-readable" should be script readable
+    And stdout from "bundle exec vagrant service-manager env openshift --script-readable" should contain:
+    """
+    OPENSHIFT_URL=https://<ip>:8443
+    OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    DOCKER_REGISTRY=hub.openshift.centos7-adb.<ip>.xip.io
+    """
+
+    When I successfully run `bundle exec vagrant service-manager env`
+    Then stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_HOST=tcp://<ip>:2376"
+    And stdout from "bundle exec vagrant service-manager env" should match /export DOCKER_CERT_PATH=.*\/.vagrant\/machines\/cdk\/virtualbox\/docker/
+    And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_TLS_VERIFY=1"
+    And stdout from "bundle exec vagrant service-manager env" should match /export DOCKER_API_VERSION=1.2\d/
+    And stdout from "bundle exec vagrant service-manager env" should match /# eval "\$\(vagrant service-manager env\)"/
+    And stdout from "bundle exec vagrant service-manager env" should contain:
+    """
+    # openshift env:
+    # You can access the OpenShift console on: https://<ip>:8443/console
+    # To use OpenShift CLI, run: oc login https://<ip>:8443
+    export OPENSHIFT_URL=https://<ip>:8443
+    export OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    export DOCKER_REGISTRY=hub.openshift.centos7-adb.<ip>.xip.io
+
+    # run following command to configure your shell:
+    # eval "$(vagrant service-manager env)"
+    """
+
+    When I successfully run `bundle exec vagrant up --provider <provider>`
+    And I run `bundle exec vagrant service-manager install-cli openshift`
+    Then the exit status should be 0
+    And the binary "oc" should be installed
+
+    Examples:
+      | box   | provider   | ip          |
+      | adb   | virtualbox | 10.10.10.42 |
+      | adb   | libvirt    | 10.10.10.42 |

data/features/{openshift.feature → cdk-openshift.feature}

@@ -1,5 +1,5 @@
-Feature: Command output from various OpenShift related commands
-  service-manager should return the correct output from commands affecting OpenShift
+Feature: Command output from various OpenShift related commands in CDK
+  service-manager should return the correct output from commands affecting OpenShift in CDK
 
   @openshift
   Scenario Outline: Boot and execute commands
@@ -55,7 +55,7 @@ Feature: Command output from various OpenShift related commands
     Then stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_HOST=tcp://<ip>:2376"
     And stdout from "bundle exec vagrant service-manager env" should match /export DOCKER_CERT_PATH=.*\/.vagrant\/machines\/cdk\/virtualbox\/docker/
     And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_TLS_VERIFY=1"
-    And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_API_VERSION=1.21"
+    And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_API_VERSION=1.2\d"
     And stdout from "bundle exec vagrant service-manager env" should match /# eval "\$\(vagrant service-manager env\)"/
     And stdout from "bundle exec vagrant service-manager env" should contain:
     """

data/features/support/env.rb

@@ -5,9 +5,8 @@ require 'find'
 ###############################################################################
 # Aruba config and Cucumber hooks
 ###############################################################################
-
 Aruba.configure do |config|
-  config.exit_timeout = 300
+  config.exit_timeout = 3600
   config.activate_announcer_on_command_failure = [:stdout, :stderr]
   config.working_directory = 'build/aruba'
 end

data/lib/vagrant-service-manager/binary_handlers/adb_openshift_binary_handler.rb

@@ -21,9 +21,9 @@ module VagrantPlugins
         data = Net::HTTP.get(URI(tag_url))
         tokens = data.match("-v#{@version}-(.*)-#{archive_ext}").captures
         tokens.first unless tokens.empty?
-      rescue StandardError => e
+      rescue StandardError
         @ui.error e.message
-        exit 126
+        raise I18n.t('servicemanager.commands.install_cli.unsupported_version')
       end
 
       def os_type

data/lib/vagrant-service-manager/binary_handlers/binary_handler.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
       }.freeze
       VERSION_CMD = {
         docker: "docker version --format '{{.Server.Version}}'",
-        openshift: "oc version | grep 'oc' | grep -oE '[0-9.]+'"
+        openshift: "oc version | grep -oE 'oc v([0-9a-z.]+-?[a-z0-9]*.?[0-9])' | sed -E 's/oc v//'"
       }.freeze
       BINARY_REGEX = {
         windows: { docker: %r{\/docker.exe$}, openshift: /oc.exe$/ },
@@ -100,9 +100,11 @@ module VagrantPlugins
         req.use_ssl = true if url.scheme == 'https'
         res = req.request_head(url.path)
 
-        unless res.code == '200'
+        unless %w(200 302).include? res.code
           raise URLValidationError, I18n.t('servicemanager.commands.install_cli.url_validation_error')
         end
+
+        true
       end
 
       private

data/lib/vagrant-service-manager/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServiceManager
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.2.2'.freeze
   end
 end

data/locales/en.yml

@@ -188,6 +188,10 @@ en:
           '%{service}' service is not enabled.
         kube_not_supported: |-
           Installation of Kubernetes client library via the install-cli command is not supported yet.
+        unsupported_version: |-
+          Something went wrong to find the correct download link.
+          We recommend you to use '--cli-version' for your desired client version.
+          If still facing issues, please report to https://github.com/projectatomic/vagrant-service-manager.
 
       status:
         nil: |-

data/test/vagrant-service-manager/binary_handlers/adb_docker_binary_handler_test.rb

@@ -54,6 +54,11 @@ module VagrantPlugins
       end
 
       it 'should validate download url' do
+        @handler.build_download_url
+        @handler.validate_url.must_equal true
+      end
+
+      it 'should raise error with invalid --cli-version' do
         @options['--cli-version'] = '111.222.333'
         @handler = ADBDockerBinaryHandler.new(@machine, @machine.env, @options)
         @handler.build_download_url

data/test/vagrant-service-manager/binary_handlers/adb_openshift_binary_handler_test.rb

@@ -45,6 +45,11 @@ module VagrantPlugins
       end
 
       it 'should validate download url' do
+        @handler.build_download_url
+        @handler.validate_url.must_equal true
+      end
+
+      it 'should raise error with invalid --cli-version' do
         @options['--cli-version'] = '111.222.333'
         @handler = ADBDockerBinaryHandler.new(@machine, @machine.env, @options)
         @handler.build_download_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Provides setup information, including environment variables and certificates,
@@ -34,15 +34,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .ci/ansible/roles/centos/tasks/main.yml
-- .ci/ansible/roles/centos/vars/main.yml
-- .ci/ansible/site.yml
-- .ci/jenkins-execute-script.py
-- .config/cucumber.yml
-- .gitattributes
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
+- ".ci/ansible/roles/centos/tasks/main.yml"
+- ".ci/ansible/roles/centos/vars/main.yml"
+- ".ci/ansible/site.yml"
+- ".ci/jenkins-execute-script.py"
+- ".config/cucumber.yml"
+- ".gitattributes"
+- ".github/ISSUE_TEMPLATE.MD"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.adoc
 - Gemfile
@@ -50,11 +51,12 @@ files:
 - README.adoc
 - Rakefile
 - commands.adoc
+- features/adb-openshift.feature
 - features/box-command.feature
+- features/cdk-openshift.feature
 - features/env-command.feature
 - features/help-command.feature
 - features/install-cli.feature
-- features/openshift.feature
 - features/service-operation.feature
 - features/support/env.rb
 - lib/vagrant-service-manager.rb
@@ -114,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: To provide the user a CLI to configure the ADB/CDK for different use cases