vagrant-triggers 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feda77ab141c553c1886766fd74d69ddfb0b2153
-  data.tar.gz: 0b73b4f744e7f5c0aec0a769eaa90629076c2c98
+  metadata.gz: eab5f910be37b40cbc9319586e7c0c5e4f2248a0
+  data.tar.gz: 998cad1f949056e3632426d3df13a237f4fa8371
 SHA512:
-  metadata.gz: 5ec60cd4c036eaedf2f64d9f5e63559d00dfc39d7a29eab6cd7e38b4de3a1d9d5acb4d0dc65d8ad02c2e5767d5c69c9ce22bacb610cf609084466edcad85a491
-  data.tar.gz: 8d05d7c3abf88ccabc6a93b2542183a36bfdfe9d7aea0abdba3e41c2fbfc047e8a3fbab2eafc61af1fc06165cdb2fc35a37978fcdaab5307bc9a2b0e7f80f370
+  metadata.gz: baa61783466b63533d4c13aa9377998bb8333d25b16824e9026e188714ff508cabe44f3df713b1f80ddcecb5613c3a042f5ba546cf415383706a5cabade943ec
+  data.tar.gz: 9d40978b228fe256578e62b4f1f8935f59f31b316c6abbba4e230ad675dfd2ea59fa523d4697ff58cd32c31a4b057bb7dce7866630214d64eb702a0fdb4c2802

data/.travis.yml

@@ -7,7 +7,10 @@ before_install:
   - gem uninstall -ax bundler
   - gem install bundler -v 1.5.3
 env:
-  - VAGRANT_VERSION=v1.7.1
+  global:
+    - SPEC_OPTS="--tag ~skip_travis"
+  matrix:
+    - VAGRANT_VERSION=v1.7.4
 matrix:
   include:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.1 (August 3, 2015)
+
+BUG FIXES:
+
+  - Change directory to environment root path before running host commands [(#44)](https://github.com/emyl/vagrant-triggers/issues/44)
+  - ```:stdout``` and ```:stderr``` options defaults to true when using provisioner [(#42)](https://github.com/emyl/vagrant-triggers/issues/42)
+  - Properly escape regexp in DSL [(#46)](https://github.com/emyl/vagrant-triggers/issues/46)
+
 ## 0.5.0 (December 29, 2014)
 
 **BEHAVIOURAL CHANGES:**

data/README.md

@@ -76,12 +76,38 @@ 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.
 
+### Attaching to every command
+
+The special name `:ALL` can be used as a wildcard for every vagrant command:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.trigger.before :ALL do
+    ...
+  end
+end
+```
+
+### Blacklisting commands
+
+Commands can be blacklisted, so that the `:ALL` wildcard has no effect on them:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.trigger.blacklist :destroy
+  config.trigger.before :ALL do
+    ...
+  end
+end
+```
+
+Multiple commands can be blacklisted using an array.
+
 ## 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/*"

data/lib/vagrant-triggers/config/provisioner.rb

@@ -6,7 +6,10 @@ module VagrantPlugins
         attr_reader :trigger_body
 
         def initialize
-          @options = {}
+          @options = {
+            :stderr => true,
+            :stdout => true
+          }
         end
 
         def fire(&block)
@@ -14,7 +17,7 @@ module VagrantPlugins
         end
 
         def set_options(options)
-          @options = options
+          @options.merge!(options)
         end
       end
     end

data/lib/vagrant-triggers/dsl.rb

@@ -41,8 +41,10 @@ module VagrantPlugins
           Bundler.with_clean_env do
             build_environment
             @buffer.clear
-            result = Vagrant::Util::Subprocess.execute(command[0], *command[1..-1], :notify => [:stdout, :stderr]) do |channel, data|
-              @command_output.call(channel, data, options)
+            Dir.chdir(@machine.env.root_path) do
+              result = Vagrant::Util::Subprocess.execute(command[0], *command[1..-1], :notify => [:stdout, :stderr]) do |channel, data|
+                @command_output.call(channel, data, options)
+              end
             end
           end
           info I18n.t("vagrant_triggers.action.trigger.command_finished")
@@ -87,7 +89,7 @@ module VagrantPlugins
         # Create the new PATH removing Vagrant bin directory
         # and appending directories specified through the
         # :append_to_path option
-        new_path  = ENV["VAGRANT_INSTALLER_ENV"] ? ENV["PATH"].gsub(/#{ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]}.*?#{File::PATH_SEPARATOR}/, "") : ENV["PATH"]
+        new_path  = ENV["VAGRANT_INSTALLER_ENV"] ? ENV["PATH"].gsub(/#{Regexp.quote(ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])}.*?#{Regexp.quote(File::PATH_SEPARATOR)}/, "") : ENV["PATH"]
         new_path += Array(@options[:append_to_path]).map { |dir| "#{File::PATH_SEPARATOR}#{dir}" }.join
         ENV["PATH"] = new_path
         @logger.debug("PATH modified: #{ENV["PATH"]}")

data/lib/vagrant-triggers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Triggers
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/vagrant-triggers/config/provisioner_spec.rb

@@ -3,6 +3,16 @@ require "spec_helper"
 describe VagrantPlugins::Triggers::Config::Provisioner do
   let(:config)  { described_class.new }
 
+  describe "defaults" do
+    it "should default :stdout option to true" do
+      expect(config.options[:stdout]).to be true
+    end
+
+    it "should default :stderr option to true" do
+      expect(config.options[:stderr]).to be true
+    end
+  end
+
   describe "fire" do
     it "should record trigger code" do
       code = Proc.new { "foo" }
@@ -13,9 +23,14 @@ describe VagrantPlugins::Triggers::Config::Provisioner do
 
   describe "set_options" do
     it "should set options" do
-      options = { :foo => "bar", :baz => "bat" }
+      options = { :foo => "bar" }
       config.set_options(options)
-      expect(config.options).to eq(options)
+      expect(config.options[:foo]).to eq("bar")
+    end
+
+    it "should override defaults" do
+      config.set_options(:stdout => false)
+      expect(config.options[:stdout]).to be false
     end
   end
 end

data/spec/vagrant-triggers/dsl_spec.rb

@@ -5,7 +5,8 @@ describe VagrantPlugins::Triggers::DSL do
   let(:result) { double("result", :exit_code => 0, :stderr => stderr) }
   let(:stderr) { double("stderr") }
 
-  let(:machine) { double("machine", :ui => ui) }
+  let(:machine) { double("machine", :env => env, :ui => ui) }
+  let(:env)     { double("env", :root_path => ENV["PWD"]) }
   let(:ui)      { double("ui", :info => info) }
   let(:info)    { double("info") }
 
@@ -72,6 +73,15 @@ describe VagrantPlugins::Triggers::DSL do
       @options = { :notify => [:stdout, :stderr] }
     end
 
+    it "should change directory to environment root path" do
+      machine.stub_chain(:env, :root_path).and_return("/")
+      Vagrant::Util::Subprocess.should_receive(:execute) do |command|
+        expect(Dir.pwd).to eq("/")
+        result
+      end
+      @dsl.run(@command)
+    end
+
     it "should raise an error if executed command exits with non-zero code" do
       result.stub(:exit_code => 1)
       expect { @dsl.run(@command) }.to raise_error(VagrantPlugins::Triggers::Errors::CommandFailed)
@@ -162,7 +172,7 @@ describe VagrantPlugins::Triggers::DSL do
         File.open("#{ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]}/bin/#{@command}", "w+", 0700) { |file| }
       end
 
-      it "should raise a CommandUnavailable error" do
+      it "should raise a CommandUnavailable error", :skip_travis => true do
         expect { @dsl.run(@command) }.to raise_error(VagrantPlugins::Triggers::Errors::CommandUnavailable)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-triggers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Emiliano Ticci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler