vagrant-triggers 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8ad1f94f85b3254ddbe243f0e4624b2cdc2ca4
-  data.tar.gz: de5f4ed124442ae02058d9aadea4b04ad5555ff3
+  metadata.gz: 20f85521449cec74e8c6c0947943879e3464e031
+  data.tar.gz: 60dd75ac51dd416be9c09262b612bc9499d65ef8
 SHA512:
-  metadata.gz: e8a08937ca2418e411d7fb5991cbd39f611785533ad19fb13022f1fa04cbad285adf9018b3f2e70d993eb80ea7ac14d5c3e110866ed12ea4e25ac861902a0f4c
-  data.tar.gz: 2e7f17653c43b5893fa791ed0f39b21556e28aff328951a238d023ca0bc4c10d2e82beefa1415aef6f0b3cde31f0382e16355e4f060070b7e95b0492d5e82784
+  metadata.gz: 8bb36d46e8cd09f65e8bb0f7e3eb74d1ac3d92857a0a3b9ce51fb3d1a2d2b9849573597b5f3cdf64b34c26c90f29c9b841e1b5e5fe9672f0764ebcd9a0c95630
+  data.tar.gz: 448e39b6038ef926e3d95c3d1abe7d7927b3b5e86e8062ea0a7fbc61f33673eb46c8787668f7c41fb4b674fa1ed4c62b82eca9d0ff62741bc682054d513f6008

data/.travis.yml

@@ -6,7 +6,7 @@ before_install:
   - rvm @global do gem uninstall -ax bundler
   - gem install bundler -v 1.5.3
 env:
-  - VAGRANT_VERSION=v1.6.2
+  - VAGRANT_VERSION=v1.6.5
 matrix:
   include:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.2 (September 12, 2014)
+
+IMPROVEMENTS:
+
+  - Use Vagrant communicator interface for running remote commands [(#17)](https://github.com/emyl/vagrant-triggers/issues/17)
+  - Allow options to be overridden by a single command.
+
 ## 0.4.1 (June 20, 2014)
 
 BUG FIXES:

data/README.md

@@ -46,7 +46,7 @@ The first argument is the command in which the trigger will be tied. It could be
 ### Options
 
 * ```:append_to_path => ["dir", "dir"]```: additional places where looking for scripts. See [this wiki page](https://github.com/emyl/vagrant-triggers/wiki/The-:append_to_path-option) for details.
-* ```:force => true```: continue even one of the scripts fails (exits with non-zero code)
+* ```:force => true```: continue even if one of the scripts fails (exits with non-zero code)
 * ```:stdout => true```: display script output
 * ```:vm => ["vm1", /vm[2-3]/]```: fire only for matching virtual machines. Value can be a string, a regexp or an array of strings and/or regexps.
 
@@ -60,6 +60,19 @@ For additional details you can take a look to the [VagrantPlugins::Triggers::DSL
 
 Triggers won't run if ```VAGRANT_NO_TRIGGERS``` environment variable is set.
 
+## A simple example
+
+Cleanup some temporary files after machine destroy:
+
+```ruby
+
+Vagrant.configure("2") do |config|
+  config.trigger.after :destroy do
+    run "rm -Rf tmp/*"
+  end
+end
+```
+
 ## A more detailed example
 
 In the following example a VirtualBox VM (not managed by Vagrant) will be tied to the machine defined in ```Vagrantfile```, to make so that it follows its lifecycle:

data/lib/vagrant-triggers/dsl.rb

@@ -18,8 +18,8 @@ module VagrantPlugins
 
       def run(raw_command, options = {})
         info I18n.t("vagrant_triggers.action.trigger.executing_command", :command => raw_command)
-        command     = Shellwords.shellsplit(raw_command)
-        env_backup  = ENV.to_hash
+        command    = Shellwords.shellsplit(raw_command)
+        env_backup = ENV.to_hash
         begin
           build_environment
           result = Vagrant::Util::Subprocess.execute(command[0], *command[1..-1])
@@ -28,18 +28,22 @@ module VagrantPlugins
         ensure
           ENV.replace(env_backup)
         end
-        if result.exit_code != 0 && !@options[:force]
-          raise Errors::CommandFailed, :command => raw_command, :stderr => result.stderr
-        end
-        if @options[:stdout]
-          info I18n.t("vagrant_triggers.action.trigger.command_output", :output => result.stdout)
-        end
-        result.stdout
+        process_result(raw_command, result, @options.merge(options))
       end
       alias_method :execute, :run
 
       def run_remote(raw_command, options = {})
-        run("vagrant ssh -c '#{raw_command}' #{@machine.name}", options)
+        info I18n.t("vagrant_triggers.action.trigger.executing_remote_command", :command => raw_command)
+        stderr = ""
+        stdout = ""
+        exit_code = @machine.communicate.sudo(raw_command, :elevated => true, :good_exit => (0..255).to_a) do |type, data|
+          if type == :stderr
+            stderr += data
+          elsif type == :stdout
+            stdout += data
+          end
+        end
+        process_result(raw_command, Vagrant::Util::Subprocess::Result.new(exit_code, stdout, stderr), @options.merge(options))
       end
       alias_method :execute_remote, :run_remote
 
@@ -75,6 +79,16 @@ module VagrantPlugins
         # Add the VAGRANT_NO_TRIGGERS variable to avoid loops
         ENV["VAGRANT_NO_TRIGGERS"] = "1"
       end
+
+      def process_result(command, result, options)
+        if result.exit_code != 0 && !options[:force]
+          raise Errors::CommandFailed, :command => command, :stderr => result.stderr
+        end
+        if options[:stdout]
+          info I18n.t("vagrant_triggers.action.trigger.command_output", :output => result.stdout)
+        end
+        result.stdout
+      end
     end
   end
 end

data/lib/vagrant-triggers/plugin.rb

@@ -1,3 +1,5 @@
+require "vagrant"
+
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < "1.2.0"

data/lib/vagrant-triggers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Triggers
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/locales/en.yml

@@ -9,6 +9,8 @@ en:
           ---------------
         executing_command: |-
           Executing command "%{command}"...
+        executing_remote_command: |-
+          Executing remote command "%{command}"...
         running_triggers: |-
           Running triggers %{condition} %{action}...
     errors:

data/spec/vagrant-triggers/dsl_spec.rb

@@ -150,11 +150,27 @@ describe VagrantPlugins::Triggers::DSL do
     end
   end
 
-  context "run_remote" do
-    it "should generate a 'vagrant ssh -c' command" do
-      machine.stub(:name => "vm1")
-      @dsl.should_receive(:run).with("vagrant ssh -c '#{@command}' vm1", {})
-      @dsl.run_remote(@command, {})
+  context "run a remote command" do
+    before do
+      Vagrant::Util::Subprocess::Result.stub(:new => result)
+      machine.stub_chain(:communicate, :sudo).and_return(0)
+    end
+
+    it "should raise an error if executed command exits with non-zero code" do
+      result.stub(:exit_code => 1)
+      expect { @dsl.run_remote(@command) }.to raise_error(VagrantPlugins::Triggers::Errors::CommandFailed)
+    end
+
+    it "shouldn't raise an error if executed command exits with non-zero code but :force option was specified" do
+      dsl = described_class.new(ui, machine, :force => true)
+      result.stub(:exit_code => 1)
+      expect { dsl.run_remote(@command) }.not_to raise_error()
+    end
+
+    it "should display output if :stdout option was specified" do
+      dsl = described_class.new(ui, machine, :stdout => true)
+      ui.should_receive(:info).with(/Some output/)
+      dsl.run_remote(@command)
     end
   end
 end

data/vagrant-triggers.gemspec

@@ -50,5 +50,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "< 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-triggers
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Emiliano Ticci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: This plugin allow the definition of arbitrary scripts that will run on
   the host before and/or after Vagrant commands.
 email: emiticci@gmail.com