vagrant-service-manager 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4fffe47264ba2b029362806a88f8495c947d70
-  data.tar.gz: e5b0d7ac1bdaf82879b1f238860f7a38d6b01808
+  metadata.gz: d986d92937e542b815d38f6d34bd7911ca12d887
+  data.tar.gz: 3fde086dabca156fd5a958edf3832b77909545fe
 SHA512:
-  metadata.gz: c2576875e9f19647ed220bad985427a74e195954b6e0f1ee551bdd19f212774c2e7cd64c8005b93af3722bd3739474c2f56a4ef32d938c0e5ab96b006198a2e3
-  data.tar.gz: c7c57eeb19ca720a7ffe38bd7bb29e04b7dee290cded645aabb1c61efa1669e36d493d7c8d80de55db07f11e81dbbb38fca58d2279b6cafd2b21fe2c5961c7db
+  metadata.gz: ba9588c35837fc5f063a92186459fb11d6d7fccdfeb38ff10bb894c2659c6d5b21b78d40a2f4c105a0b29142ab84ab6a3483091bea04a3e027d5b4294f6f71e1
+  data.tar.gz: 8130ab6f386b595a102de50d81be20c7777d4ee4d40548a5e25f6ae37e0ec17afd98f543b21ac5dd52b97d25bd66e1395dbc2defc26e55422ce912bfb6f61b76

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## v1.0.1 Apr 12, 2016
+- Updated SPEC (v1.0.0) for url, date and format @budhrg
+- Added Table of Contents for README @bexelbie
+- Fix #160: "vagrant service-manager restart openshift" not working as expected @budhrg
+- Fix #166: For CDK box, provisioners are not executed by default on Vagrant up @budhrg
+- Fix #170: vagrant-service-manager version 1.0.1 release @navidshaikh
+
 ## v1.0.0 Apr 07, 2016
 - Fix #132: vagrant-service-manager 1.0.0 release @navidshaikh
 - Fix #133: Adds restart command for services @navidshaikh

data/README.md

@@ -1,8 +1,17 @@
 # vagrant-service-manager
 
+* [Objective](#objective)
+* [Quick Start](#quick_start)
+* [Exit codes](#exit_codes)
+* [IP Address Detection](#ip_addr)
+* [Get Involved/Contact Us](#involved)
+* [How to Develop/Test](#develop)
+  * [How to build the Vagrant plugin using Bundler](#bundler)
+* [Builds](#builds)
+
 This plugin provides setup information, including environment variables and certificates, required to access services provided by an [Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle).  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 this usage pattern can be found in the [ADB Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
 
-##Objective
+## Objective <a name="objective"></a>
 
 * To provide the user a CLI to configure the
 [ADB](https://github.com/projectatomic/adb-atomic-developer-bundle)
@@ -18,7 +27,7 @@ is  Vagrant box that provides a ready-to-use development environment
 for container applications. With ADB, developers can dive right into
 producing complex, multi-container applications.
 
-## Quick Start
+## Quick Start <a name="quick_start"></a>
 
 1. Install `vagrant-service-manager` plugin:
 
@@ -66,7 +75,7 @@ producing complex, multi-container applications.
 
 7. Begin using your host-based tools.
 
-## Exit codes
+## Exit codes <a name="exit_codes"></a>
 
 The following table lists the plugin's exit codes and their meaning:
 
@@ -77,19 +86,19 @@ Exit Code Number | Meaning
 3                | Vagrant box is not running and must be before this command can succeed
 126              | A service inside the box is not running / Command invoked cannot execute
 
-## IP Address Detection
+## IP Address Detection <a name="ip_addr"></a>
 
 There is no standarized way of detection Vagrant box IP addresses.
 This code uses the last IPv4 address available from the set of configured
 addresses that are *up*.  i.e. if eth0, eth1, and eth2 are all up and
 have IPv4 addresses, the address on eth2 is used.
 
-## Get Involved/Contact Us
+## Get Involved/Contact Us <a name="involved"></a>
 
   * IRC: #atomic and #nulecule on freenode
   * Mailing List: container-tools@redhat.com
 
-## How to Develop/Test
+## How to Develop/Test <a name="develop"></a>
 
 1. Install the Atomic Developer Bundle (ADB), as
 [documented](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst)
@@ -121,7 +130,7 @@ in the ADB project.  Do not start the box yet.
 
   5. Create a Github release
 
-### How to build the Vagrant plugin using Bundler
+### How to build the Vagrant plugin using Bundler <a name="bundler"></a>
 
 You can also use Bundler to build the plugin and install it manually in
 your Vagrant environment
@@ -138,7 +147,7 @@ Install the plugin using:
     vagrant plugin install pkg/<gem name>
 
 
-## Builds
+## Builds <a name="builds"></a>
 
 - Gemfile: https://rubygems.org/gems/vagrant-service-manager
 

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

@@ -5,7 +5,7 @@ module Vagrant
   module ServiceManager
     DOCKER_PATH = '/home/vagrant/.docker'
     SUPPORTED_SERVICES = ['docker', 'openshift', 'kubernetes']
-    SCCLI_SERVICES = ["openshift", "k8s"]
+    SCCLI_SERVICES = ['openshift', 'k8s']
 
     class Command < Vagrant.plugin(2, :command)
       OS_RELEASE_FILE = '/etc/os-release'
@@ -266,21 +266,24 @@ module Vagrant
       end
 
       def restart_service(service)
-
-        if SCCLI_SERVICES.include? service
-          # TODO : Handle the case where user wants to pass extra arguments to OpenShift service
-          command = "sudo sccli #{service}"
-        else
-          command = "sudo systemctl restart #{service}"
-        end
-
-        with_target_vms(nil, { single_target: true}) do |machine|
-          machine.communicate.execute(command) do |type, error|
-            if type == :stderr
-              @env.ui.error(error)
-              exit 126
-            end
+        errors = []
+        command = if SCCLI_SERVICES.include? service
+                    # TODO : Handle the case where user wants to pass extra arguments
+                    # to OpenShift service
+                    "sccli #{service}"
+                  else
+                    "systemctl restart #{service}"
+                   end
+
+        with_target_vms(nil, single_target: true) do |machine|
+          exit_code = machine.communicate.sudo(command) do |type, error|
+            errors << error if type == :stderr
+          end
+          unless exit_code.zero?
+            @env.ui.error errors.join("\n")
+            exit exit_code
           end
+          exit_code
         end
       end
 

data/lib/vagrant-service-manager/services/open_shift.rb

@@ -8,14 +8,17 @@ module Vagrant
       end
 
       def execute
+        errors = []
         full_cmd = "#{@extra_cmd} sccli openshift"
 
-        @machine.communicate.sudo(full_cmd) do |type, data|
-          if type == :stderr
-            @ui.error(data)
-            exit 126
-          end
+        exit_code = @machine.communicate.sudo(full_cmd) do |type, error|
+          errors << error if type == :stderr
+        end
+        unless exit_code.zero?
+          @env.ui.error errors.join("\n")
+          exit exit_code
         end
+        exit_code
       end
 
       private

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

@@ -1,5 +1,5 @@
 module Vagrant
   module ServiceManager
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/vagrant-service-manager.spec

@@ -2,12 +2,12 @@
 %global vagrant_plugin_name vagrant-service-manager
 
 Name: %{vagrant_plugin_name}
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 Summary: To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment.
 Group: Development/Languages
 License: GPLv2
-URL: https://github.com/bexelbie/vagrant-service-manager
+URL: https://github.com/projectatomic/vagrant-service-manager
 Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem
 Requires(posttrans): vagrant
 Requires(preun): vagrant
@@ -39,7 +39,7 @@ gem unpack %{SOURCE0}
 gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
 
 %build
-# Create the gem as gem install only works on a gem file
+# Create the gem as "gem install" only works on a gem file
 gem build %{vagrant_plugin_name}.gemspec
 
 # %%vagrant_plugin_install compiles any C extensions and installs the gem into ./%%gem_dir
@@ -88,7 +88,14 @@ popd
 %{vagrant_plugin_instdir}/.gitattributes
 
 %changelog
-* Tue Mar 29 2016 Navid Shaikh - 1.0.0-1
+* Tue Apr 12 2016 Navid Shaikh - 1.0.1-1
+- Updated SPEC (v1.0.0) for url, date and format @budhrg
+- Added Table of Contents for README @bexelbie
+- Fix #160: "vagrant service-manager restart openshift" not working as expected @budhrg
+- Fix #166: For CDK box, provisioners are not executed by default on Vagrant up @budhrg
+- Fix #170: vagrant-service-manager version 1.0.1 release @navidshaikh
+
+* Thu Apr 7 2016 Navid Shaikh - 1.0.0-1
 - Bumps the plugin version to 1.0.0
 - Fix #132: vagrant-service-manager 1.0.0 release @navidshaikh
 - Fix #133: Adds restart command for services @navidshaikh
@@ -96,7 +103,7 @@ popd
 - Fix #150: Adds .gitattributes to fix the CHANGELOG.md merge conflicts @bexelbie
 - Fix #142: Removes # before human readable output of openshift env info @navidshaikh
 - Fix #75 and #141: Improves `vagrant service-manager env` output @navidshaikh
-- Fix#146: Updates docker 1.9.1 API call for `docker version` @navidshaikh
+- Fix #146: Updates docker 1.9.1 API call for `docker version` @navidshaikh
 - Updating CONTRIBUTING with note about entry loc @bexelbie
 - Update IP detection routine and fix for libvirt @bexelbie
 - Fix #50: Add --help @budhrg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies: []
 description: Provides setup information, including environment variables and certificates,
   required to access services provided by ADB/CDK.