vagrant-service-manager 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5865b4ded5fb8b167fb6bad3617ced706128d9ad
-  data.tar.gz: 50ee25f87f5008d4358fd8b530809c60688b535d
+  metadata.gz: 67b33f8cb75eaf6a041a69431520ca3df0a30580
+  data.tar.gz: 387aa826a1d9172407c21dd5997086f40feeae5c
 SHA512:
-  metadata.gz: 7982fc202d71510528e996d352f5228ad422563447bc614c6f28936839390fd4df188d8f2df264d4b82155fe121a07cd575e00de76f5026a12ab03bb6b141b77
-  data.tar.gz: e137145f206dc26bb95ec8a8aeadceb54aab1e1a16e2938db2521f8f94801b7aa3baf0e0e63fded8b1cc409a126a8024a21e66247bf5693c30c61c8ae5fa5663
+  metadata.gz: 1a66b2f3b78ef4d94b1d28e2eb54e6a9ac94ff027d5493661a476197e7cd541a40ce1229f3d6bca4dfa9ec5dbc2168bb0e552bd827edc2b689baedeacb33d3c7
+  data.tar.gz: 30913a431397314ad817e6b5e5f5d64071569b6acbb49858f6a6a993f40635d7c172a5539c74da6a4d2bf3e42e559427f04534b1a9bdaf2afa67be5f73ea1496

data/CHANGELOG.adoc

@@ -1,6 +1,14 @@
 = Revision History
 :toc:
 
+[[v1.5.0-jan-24-2017]]
+== 1.5.0 January 24, 2017
+* Fix #446 Support folder as path in install-cli '--path' option @budhrg
+* Fix #441 install-cli with --path give wrong export @budhrg
+* Fix #449 Update ‘oc’ version getting installed via install-cli to 1.4.0 @budhrg
+* Fix #443 Double quote is missing in the HTTP Proxy Settings doc @budhrg
+* Fix adb-atomic-developer-bundle doc url on README @trishnaguha
+
 [[v1.4.1-nov-17-2016]]
 == 1.4.1 November 17, 2016
 * Fix #346 Adding a Rake task for Asciidoctor and enabling Guard and Live Reload @hferentschik

data/README.adoc

@@ -12,7 +12,7 @@ provided by the ADB and is a must have for most ADB users. +
 This plugin makes it easier to use the ADB with host-based tools such as
 Eclipse and the docker and kubernetes CLI commands. Details on how to
 use ADB with this plugin can be found in the
-https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst[ADB
+https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.adoc[ADB
 Documentation].
 
 '''
@@ -36,7 +36,7 @@ $ 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].
+https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.adoc[ADB installation instructions].
 
 == Usage
 
@@ -58,7 +58,7 @@ https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/in
 
 1.  Start the ADB vagrant box using `vagrant up`. For detailed
 instructions consult the
-https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst[Installation
+https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.adoc[Installation
 Documentation].
 +
 NOTE: When the vagrant-service-manager plugin is loaded and an ADB box is
@@ -159,9 +159,9 @@ services like Docker and OpenShift to function correctly. +
 You can do so via:
  +
 -----
-config.servicemanager.proxy = <Proxy URL>
-config.servicemanager.proxy_user = <Proxy user name>
-config.servicemanager.proxy_password = <Proxy user password>
+config.servicemanager.proxy = "<Proxy URL>"
+config.servicemanager.proxy_user = "<Proxy user name>"
+config.servicemanager.proxy_password = "<Proxy user password>"
 -----
 
 When these settings are applied, they are passed through to the Docker and OpenShift services. In an unauthenticated proxy environment, the `proxy_user` and `proxy_password` configurations can be omitted.
@@ -173,7 +173,7 @@ The vagrant-service-manager helps you configure the service of your choice:
 
 . Enable the desired service(s) in the ADB Vagrantfile as:
 +
-`config.servicemanager.services = 'openshift'`
+`config.servicemanager.services = "openshift"`
 +
 [NOTE]
 ====

data/commands.adoc

@@ -242,14 +242,14 @@ As per default, binaries are downloaded to
 To install client binary for Docker:
 
 ----------------------------------------------------------------------------------------------------
-$ vagrant service-manager install-cli docker --cli-version 1.9.1 --path /home/johndoe/bin/docker
+$ vagrant service-manager install-cli docker --cli-version 1.9.1 --path /home/johndoe/bin
 # Binary already available at /home/johndoe/bin/docker
 # run binary as:
 # docker <command>
 export PATH=/home/johndoe/bin:$PATH
 
 # run following command to configure your shell:
-# eval "$(VAGRANT_NO_COLOR=1 vagrant service-manager install-cli docker | tr -d '\r')"
+# eval "$(VAGRANT_NO_COLOR=1 vagrant service-manager install-cli docker --path /home/johndoe/bin | tr -d '\r')"
 ----------------------------------------------------------------------------------------------------
 
 

data/features/adb-openshift.feature

@@ -65,10 +65,10 @@ Feature: Command output from various OpenShift related commands in ADB
     And the binary "oc" of service "openshift" should be installed with version "1.3.0"
     And stdout from "bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0" should be evaluable in a shell
 
-    When I evaluate and run `bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0 --path #{ENV['VAGRANT_HOME']}/oc`
+    When I evaluate and run `bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0 --path #{ENV['VAGRANT_HOME']}`
     Then the exit status should be 0
     And the binary should be installed in path "#{ENV['VAGRANT_HOME']}/oc"
-    And stdout after evaluating and running "bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0 --path #{ENV['VAGRANT_HOME']}/oc" should be evaluable in a shell
+    And stdout after evaluating and running "bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0 --path #{ENV['VAGRANT_HOME']}" should be evaluable in a shell
 
     When I successfully run `bundle exec vagrant reload`
     And I sleep for 10 seconds

data/features/cdk-openshift.feature

@@ -32,7 +32,7 @@ Feature: Command output from various OpenShift related commands in CDK
     ==> default: Docker service configured successfully...
     ==> default: OpenShift service configured successfully...
     """
-    
+
     And I successfully run `bundle exec vagrant service-manager status`
     Then stdout from "bundle exec vagrant service-manager status" should contain "openshift - running"
 
@@ -87,10 +87,10 @@ Feature: Command output from various OpenShift related commands in CDK
     And the binary "oc" of service "openshift" should be installed with version "1.3.0"
     And stdout from "bundle exec vagrant service-manager install-cli openshift --cli-version 1.3.0" should be evaluable in a shell
 
-    When I evaluate and run `bundle exec vagrant service-manager install-cli openshift --path #{ENV['VAGRANT_HOME']}/oc`
+    When I evaluate and run `bundle exec vagrant service-manager install-cli openshift --path #{ENV['VAGRANT_HOME']}`
     Then the exit status should be 0
     And the binary should be installed in path "#{ENV['VAGRANT_HOME']}/oc"
-    And stdout after evaluating and running "bundle exec vagrant service-manager install-cli openshift --path #{ENV['VAGRANT_HOME']}/oc" should be evaluable in a shell
+    And stdout after evaluating and running "bundle exec vagrant service-manager install-cli openshift --path #{ENV['VAGRANT_HOME']}" should be evaluable in a shell
 
     When I successfully run `bundle exec vagrant reload`
     And I successfully run `bundle exec vagrant service-manager status openshift`

data/features/docker.feature

@@ -172,18 +172,18 @@ Feature: Command output from box command
     And the binary "docker" of service "docker" should be installed with version "1.12.1"
     And the stderr should not contain anything
 
-    When I evaluate and run `bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}/docker`
+    When I evaluate and run `bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}`
     Then the exit status should be 0
     And the binary should be installed in path "#{ENV['VAGRANT_HOME']}/docker"
     And the stderr should not contain anything
 
-    When I evaluate and run `bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}/unknown_dir/docker`
+    When I evaluate and run `bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}/unknown_dir`
     Then the exit status should be 126
-    And stderr from evaluating and running "bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}/unknown_dir/docker" should match /Directory path #{ENV['VAGRANT_HOME']}/unknown_dir is invalid or doesn't exist/
+    And stderr from evaluating and running "bundle exec vagrant service-manager install-cli docker --path #{ENV['VAGRANT_HOME']}/unknown_dir" should match /Directory path #{ENV['VAGRANT_HOME']}/unknown_dir is invalid or doesn't exist/
 
-    When I run `bundle exec vagrant service-manager install-cli docker --path /foo/bar/docker`
+    When I run `bundle exec vagrant service-manager install-cli docker --path /foo/bar`
     Then the exit status should be 126
-    And stderr from evaluating and running "bundle exec vagrant service-manager install-cli docker --path /foo/bar/docker" should match /Permission denied @ dir_s_mkdir - /foo/
+    And stderr from evaluating and running "bundle exec vagrant service-manager install-cli docker --path /foo/bar" should match /Permission denied @ dir_s_mkdir - /foo/
 
     ####################################################################################################################
     # START/STOP/STATUS/RESTART command

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

@@ -39,7 +39,7 @@ module VagrantPlugins
         @args = { insecure: false }
         @type = options[:type]
         @version = options['--cli-version'] || PluginUtil.execute_once(@machine, @ui, VERSION_CMD[@type])
-        @path = options['--path'] || binary_path
+        @path = options['--path'] ? "#{options['--path']}/#{binary_name}" : binary_path
         @temp_bin_dir = "#{ServiceManager.temp_dir}/#{@type}"
       end
 

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

@@ -4,7 +4,7 @@ module VagrantPlugins
     class CDKOpenshiftBinaryHandler < ADBOpenshiftBinaryHandler
       # Default to latest stable origin oc version for CDK as it is different than
       # OSE oc version running inside CDK development environment
-      LATEST_OC_VERSION = '1.2.1'.freeze
+      LATEST_OC_VERSION = '1.4.0'.freeze
 
       def initialize(machine, env, options)
         options['--cli-version'] = LATEST_OC_VERSION unless options['--cli-version']

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

@@ -45,8 +45,7 @@ module VagrantPlugins
 
         # return if --path is not specified
         return unless @options.key?('--path')
-        dir_name = File.dirname(@options['--path'])
-        return if File.exist?(dir_name) # return if directory exists
+        return if File.exist?(@options['--path'])
         @env.ui.info I18n.t('servicemanager.commands.install_cli.invalid_binary_path', dir_path: dir_name)
         exit 126
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServiceManager
-    VERSION = '1.4.1'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip