vagrant-shell-commander 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15261a751e3748d72ae2854152b6d178f7b8067d
-  data.tar.gz: 157a84e1cf72f54af228156dd71b46b74118865c
+  metadata.gz: 403a125165298249437e85389ce789910632112c
+  data.tar.gz: fd638477217db9608c676f844db41403f048f4eb
 SHA512:
-  metadata.gz: 32cb3646c609231e52928ed283f799f4cbba4221e72d44806c745d0bd6cc6e714cd9971690d74321fa039ebe2cc0b0de1a1ab24c466ec48e0956e0be0c90ebea
-  data.tar.gz: a22e56749097eb24220eedb05334acf34f101f56482499a2cec15e95bf8fefb8659539ba43034ac0466a6c979b8386208bb8c1767b9635047694cb79a27232d1
+  metadata.gz: 2ae90d5c54a55ae0b63ccf8ecb1eb0edc17afafd05ed404d8c4e3ceda3397144e282a81ccd57f6b6e97e118001bb75969c22684257b6c935ccf903f5047d94e2
+  data.tar.gz: 2a88eb19682d112a8eca43ddd66463f2b83e31561633666579831f6bdb845d9ceb226273d42aa52a3a08cb3aaa77e9548cbfbd4ac82b1e20384044c5f03ba4a4

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.1.2
 install: bundle install
 script: bundle exec rake

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", tag: 'v1.5.1'
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", tag: 'v1.6.2'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,51 +1,77 @@
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 6977e93ba98fd19112b1fed74dafb8619f581984
-  tag: v1.5.1
+  revision: 970ed5068ede4f6aae4b51e2cabe872aa924cacf
+  tag: v1.6.2
   specs:
-    vagrant (1.5.1)
-      bundler (~> 1.5.2)
+    vagrant (1.6.2)
+      bundler (>= 1.5.2, < 1.7.0)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      listen (~> 2.4.0)
+      listen (~> 2.7.1)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (>= 2.6.6, < 2.8.0)
+      net-ssh (>= 2.6.6, < 2.10.0)
       rb-kqueue (~> 0.2.0)
       wdm (~> 0.1.0)
+      winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-shell-commander (0.3.1)
+    vagrant-shell-commander (0.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    akami (1.2.2)
+      gyoku (>= 0.4.0)
+      nokogiri
+    builder (3.2.2)
     cane (2.6.0)
       parallel
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.5.1)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
+    debugger2 (1.0.0.beta2)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     ffi (1.9.3)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.1.1)
+      builder (>= 2.1.2)
+    httpclient (2.3.4.1)
+    httpi (0.9.7)
+      rack
     i18n (0.6.9)
-    listen (2.4.1)
+    listen (2.7.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
     log4r (1.1.10)
+    logging (1.8.1)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.3.6)
+    mini_portile (0.6.0)
     multi_json (1.7.7)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
+    net-ssh (2.9.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    nori (1.1.5)
     parallel (0.7.1)
+    rack (1.5.2)
     rake (10.1.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
@@ -66,13 +92,33 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.1.3)
       sexp_processor (~> 4.1)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
     sexp_processor (4.2.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     timers (1.1.0)
+    uuidtools (2.1.4)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
     wdm (0.1.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
     yard (0.8.6.2)
 
 PLATFORMS
@@ -81,6 +127,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   cane
+  debugger2
   rake
   reek
   rspec

data/README.md

@@ -58,7 +58,3 @@ This can be handy if, for example, you want an application to start on boot and
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgimenez/vagrant-shell-commander/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/Vagrantfile

@@ -1,5 +1,3 @@
-Vagrant.require_plugin "vagrant-shell-commander"
-
 Vagrant.configure("2") do |config|
   config.vm.box = "canonical-ubuntu-12.04"
   config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"

data/lib/vagrant-shell-commander/action.rb

@@ -1,3 +1,5 @@
+require "log4r"
+
 module VagrantPlugins
   module ShellCommander
     # Action for shell command hooking
@@ -11,8 +13,9 @@ module VagrantPlugins
       # @return nil
       #
       def initialize(app, env)
-        @app = app
-        @machine = env[:machine]
+        @app       = app
+        @env       = env
+        @logger    = Log4r::Logger.new("vagrant::plugins::shell-commander::action")
       end
       
       # Call method of this middleware
@@ -21,11 +24,13 @@ module VagrantPlugins
       # @return nil
       #
       def call(env)
+        @logger.debug("hook fired for action #{@env[:action_name]}, machine_action: #{@env[:machine_action]}")
         @app.call(env)
-        unless env[:machine].config.sh.after_share_folders.nil?
-          @machine.action(:ssh_run, 
-                          ssh_run_command: env[:machine].config.sh.after_share_folders,
-                          ssh_opts: {extra_args: []})
+        if @env[:machine] && @env[:machine].state.id != :poweroff &&
+           ! @env[:machine].config.sh.after_share_folders.nil?
+          @env[:machine].action(:ssh_run, 
+                                ssh_run_command: @env[:machine].config.sh.after_share_folders,
+                                ssh_opts: {extra_args: []})
         end
       end
     end

data/lib/vagrant-shell-commander/plugin.rb

@@ -13,10 +13,8 @@ module VagrantPlugins
         Config
       end
       
-      %w[up reload].each do |event|
-        action_hook("sh_hook_#{event}".to_sym, "machine_action_#{event}".to_sym) do |hook|
-          hook.append(Action)
-        end
+      action_hook :sh_hook do |hook|
+        hook.after(Vagrant::Action::Builtin::Provision, Action)
       end
     end
   end

data/lib/vagrant-shell-commander/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ShellCommander
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/action_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe VagrantPlugins::ShellCommander::Action do
   let(:app) {double(call: true)}
-  let(:machine) {double(action: true)}
-  let(:env) {double(:[] => machine)}
+  let(:state) {double(id: :poweron)}
   let(:cmd) {'cmd'}
   let(:sh) {double(after_share_folders: cmd)}
   let(:config) {double(sh: sh)}
-  let(:machine_env) {double(config: config)}
+  let(:machine_env) {double(config: config, state: state, action: true)}
   let(:action_env) {{machine: machine_env}}
+  let(:env) {double(:[] => machine_env)}
   let(:subject) {described_class.new(app, env)}
 
   describe "#call" do
@@ -20,23 +20,30 @@ describe VagrantPlugins::ShellCommander::Action do
 
     describe "SSHRun call" do
       it "should call SSHRun action of the current machine with the after_boot option as command" do
-        allow(env).to receive(:[]).with(:machine).and_return(machine)
-        
-        expect(machine).to receive(:action).with(:ssh_run, ssh_run_command: cmd, ssh_opts: {:extra_args=>[]})
+        expect(machine_env).to receive(:action).with(:ssh_run, ssh_run_command: cmd, ssh_opts: {extra_args: []})
 
         subject.call(action_env)
       end
       
-      it "should not call SSHRun action if after_boot option is nil" do
-        sh = double(after_share_folders: nil)
-        config = double(sh: sh)
-        machine_env = double(config: config)
+      it "should not call SSHRun action if after_share_folder option is nil" do
+        machine_env = double(config: config, state: state)
+        action_env = {machine: machine_env}
+        
+        expect(machine_env).not_to receive(:action)
+
+        subject.call(action_env)
+      end
+
+      it "should not call SSHRun action if machine is not powered on" do
+        state = double(id: :poweroff)
+        machine_env = double(config: config, state: state, action: true)
         action_env = {machine: machine_env}
         
-        expect(machine).not_to receive(:action)
+        expect(machine_env).not_to receive(:action)
 
         subject.call(action_env)
       end
+
     end
   end
 end

data/spec/plugin_spec.rb

@@ -18,20 +18,11 @@ describe VagrantPlugins::ShellCommander::Plugin do
   context 'action hooks' do
     let(:hook) {double(append: true, prepend: true)}
 
-    it "should define an action hook for machine_action_up" do
-      hook_proc = described_class.components.action_hooks[:machine_action_up][0]
+    it 'should define an action hook for after share folders' do
+      hook_proc = described_class.components.action_hooks[:__all_actions__][0]
       hook = double
-      expect(hook).to receive(:append).with(VagrantPlugins::ShellCommander::Action)
+      expect(hook).to receive(:after).with(Vagrant::Action::Builtin::Provision, VagrantPlugins::ShellCommander::Action)
       hook_proc.call(hook)
     end
-
-    it "should define an action hook for machine_action_reload" do
-      hook_proc = described_class.components.action_hooks[:machine_action_reload][0]
-      hook = double
-      expect(hook).to receive(:append).with(VagrantPlugins::ShellCommander::Action)
-      hook_proc.call(hook)
-    end
-
   end
-
 end

data/vagrant-shell-commander.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "cane"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "debugger2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-shell-commander
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Federico Gimenez Nieto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger2
+  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'
 description: Vagrant plugin for executing shell commands on guests machines and hooking
   them in the boot process
 email: