vagrant-service-manager 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1481c0b9ea6e3df13c4ca4cb57a2a2303bc614e
-  data.tar.gz: a961c8cf041ef5a7a55b58dddfda6cdcce3f5303
+  metadata.gz: 54c81b4b64ff2de2506fa8fc9436a50655edea16
+  data.tar.gz: 06822f05ffd1fe483965fe356de9f243d5d216a2
 SHA512:
-  metadata.gz: 104f0cad9c9359c60cac0a9046df48a125b179617a3a2bb655f76c58ca3b013f3c7cbcd98a474468794398bf827ee6acd0bf244bd6009fe67f12be9c2f4bf902
-  data.tar.gz: 631f15089eea088d3edc235145014965348d3cc1156fb6480e8f393e30302df266047796419171bf3389a75c1c12defdf032868860df7398e8d00d6fe05c4543
+  metadata.gz: 995db1cf5395f6984c2fff80497b1d691ddb7aeb76b514c9bcb45b92045e6af8af848495c9732d7ca213a273db2499301d4fdd536b6662c0a79c3fd100471ae2
+  data.tar.gz: 45a3c8d775b2fde742fdf89c5291c6621791de45fcbdd4e27ca841b6897a6b231ed99adee3b04203475fa5648b5afb33047a559d5702095f3516a988516a63e6

data/.rubocop.yml

@@ -4,10 +4,12 @@ AllCops:
   Exclude:
     - 'build/**/*'
 
-# Offense count: 57
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
 Metrics/LineLength:
   Max: 120
   Exclude:
     - 'Rakefile'
+
+Metrics/ClassLength:
+  Max: 209
+  Exclude:
+    - 'lib/vagrant-service-manager/command.rb'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.3.1 Aug 25, 2016
+- Fix #257 proper error message on restarting a stopped service @budhrg
+- Fix #379 Success message after vagrant up for Kubernetes @budhrg
+
 ## v1.3.0 Aug 12, 2016
 - Fix #374 Fix kubernetes acceptance test @budhrg
 - Fix #372 Detect already downloaded oc binary in Windows @budhrg

data/features/adb-openshift.feature

@@ -18,17 +18,13 @@ Feature: Command output from various OpenShift related commands in ADB
       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'
+      config.servicemanager.services = 'docker, openshift'
     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`
+    And I successfully 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:
     """
@@ -51,31 +47,10 @@ Feature: Command output from various OpenShift related commands in ADB
     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`
+    When 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/lib/vagrant-service-manager/action/log_configured_service.rb

@@ -0,0 +1,26 @@
+module VagrantPlugins
+  module ServiceManager
+    module Action
+      class LogConfiguredServices
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @ui = env[:ui]
+          @services = @machine.config.servicemanager.services.split(',').map(&:strip)
+        end
+
+        def call(env)
+          @app.call(env)
+
+          @services.each do |service|
+            if !PluginUtil.service_running?(@machine, service)
+              @ui.info I18n.t('servicemanager.actions.service_failure', service: service.capitalize)
+            elsif PluginUtil.service_running?(@machine, service)
+              @ui.info I18n.t('servicemanager.actions.service_success', service: service.capitalize)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-service-manager/action/setup_network.rb

@@ -24,10 +24,7 @@ module VagrantPlugins
         end
 
         def add_private_network
-          @ui.info <<-MSG
-When using virtualbox, a non-NAT network interface is required.
-Adding a private network using DHCP
-          MSG
+          @ui.info I18n.t('servicemanager.action.private_network')
           @machine.config.vm.network :private_network, type: :dhcp
         end
       end

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

@@ -248,6 +248,14 @@ module VagrantPlugins
             PluginUtil.generate_kubeconfig(machine, @env.ui, File.dirname(ServiceManager.bin_dir))
           end
         end
+      rescue StandardError => e
+        if operation == 'restart' && e.message.include?("Start #{service} first")
+          @env.ui.error I18n.t('servicemanager.commands.operation.start_service_first')
+        else
+          @env.ui.error e.message.squeeze
+        end
+
+        exit 126
       end
 
       def display_box_ip(script_readable = false)

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

@@ -21,6 +21,7 @@ module VagrantPlugins
       action_hook(:servicemanager, :machine_action_up) do |hook|
         hook.before(VagrantPlugins::ProviderVirtualBox::Action::Network, setup_network)
         hook.after(Vagrant::Action::Builtin::SyncedFolders, Service)
+        hook.after Vagrant::Action::Builtin::Provision, final_actions
       end
 
       def self.setup_network
@@ -28,6 +29,12 @@ module VagrantPlugins
           b.use Action::SetupNetwork
         end
       end
+
+      def self.final_actions
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Action::LogConfiguredServices
+        end
+      end
     end
   end
 end

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

@@ -107,8 +107,6 @@ module VagrantPlugins
         end
 
         exit_code
-      rescue StandardError => e
-        ui.error e.message.squeeze
       end
 
       def self.execute_once(machine, ui, command)

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

@@ -22,6 +22,9 @@ module VagrantPlugins
             PluginUtil.copy_certs_to_host(@machine, secrets_path, @ui)
           end
         end
+      rescue StandardError => e
+        @ui.error e.message.squeeze
+        exit 126
       end
 
       def status

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

@@ -13,6 +13,9 @@ module VagrantPlugins
           exit_code = PluginUtil.execute_and_exit_on_fail(@machine, @ui, command)
           PluginUtil.generate_kubeconfig(@machine, @ui, @plugin_dir) if exit_code.zero?
         end
+      rescue StandardError => e
+        @ui.error e.message.squeeze
+        exit 126
       end
 
       def status

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

@@ -16,6 +16,9 @@ module VagrantPlugins
         end
       rescue Vagrant::Errors::GuestCapabilityNotFound
         PluginLogger.debug('Guest capability not found while starting OpenShift service')
+      rescue StandardError => e
+        @ui.error e.message.squeeze
+        exit 126
       end
 
       def status

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServiceManager
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

data/locales/en.yml

@@ -187,6 +187,7 @@ en:
         sccli_only_support: |-
           Only sccli services are supported. For example:
             docker, openshift and kubernetes
+        start_service_first: 'Please start the service first before restarting.'
       install_cli:
         message: |-
           # Binary %{when} available at %{path}
@@ -213,6 +214,14 @@ en:
           Unknown service '%{service}'.
           Supported services are %{services}.
 
+# Action related translations
+    actions:
+      service_success: '%{service} service configured successfully...'
+      service_failure: '%{service} service failed to configure properly...'
+      private_network: |-
+        When using Virtualbox, a non-NAT network interface is required.
+        Adding a private network using DHCP
+
 # Kube config template translation
     kube_config: |-
       apiVersion: v1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -61,6 +61,7 @@ files:
 - features/service-operation.feature
 - features/support/env.rb
 - lib/vagrant-service-manager.rb
+- lib/vagrant-service-manager/action/log_configured_service.rb
 - lib/vagrant-service-manager/action/setup_network.rb
 - lib/vagrant-service-manager/archive_handlers/tar_handler.rb
 - lib/vagrant-service-manager/archive_handlers/zip_handler.rb