vagrant-triggers 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f85521449cec74e8c6c0947943879e3464e031
-  data.tar.gz: 60dd75ac51dd416be9c09262b612bc9499d65ef8
+  metadata.gz: 159436e13aaf71caaa81c3a6a00da3c0fa8c25fd
+  data.tar.gz: e5e506a5a8f1e906684f64be70caa4aef254baa8
 SHA512:
-  metadata.gz: 8bb36d46e8cd09f65e8bb0f7e3eb74d1ac3d92857a0a3b9ce51fb3d1a2d2b9849573597b5f3cdf64b34c26c90f29c9b841e1b5e5fe9672f0764ebcd9a0c95630
-  data.tar.gz: 448e39b6038ef926e3d95c3d1abe7d7927b3b5e86e8062ea0a7fbc61f33673eb46c8787668f7c41fb4b674fa1ed4c62b82eca9d0ff62741bc682054d513f6008
+  metadata.gz: 64e9a96d651fe687502f7e5b86990ae568d945402677651247a2343bf6892a31c56abc890466dbe7694be09ea4e2969aaf70bd9e0307330b3f627a34587aa7e2
+  data.tar.gz: fe8b7755b9580968d0ad0ffeab537f30a5a69b166d3bacc665ead3d21530948493909ff65691b34ab7a6f8ebdac1d0f33becb681e860c866d42544557278a506

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
 before_install:
   - gem update --system
   - rvm @global do gem uninstall -ax bundler
+  - gem uninstall -ax bundler
   - gem install bundler -v 1.5.3
 env:
   - VAGRANT_VERSION=v1.6.5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.3 (November 26, 2014)
+
+BUG FIXES:
+
+  - Passing strings to ```:vm``` option now works [(#30)](https://github.com/emyl/vagrant-triggers/issues/30)
+  - Use Bundler.with_clean_env to remove bundler artifacts from environment [(#25)](https://github.com/emyl/vagrant-triggers/issues/25)
+
 ## 0.4.2 (September 12, 2014)
 
 IMPROVEMENTS:

data/lib/vagrant-triggers/action/trigger.rb

@@ -39,7 +39,7 @@ module VagrantPlugins
               if trigger[:options][:vm]
                 match = false
                 Array(trigger[:options][:vm]).each do |pattern|
-                  match = true if trigger_env[:vm].match(pattern)
+                  match = true if trigger_env[:vm].match(Regexp.new(pattern))
                 end
                 next unless match
               end

data/lib/vagrant-triggers/dsl.rb

@@ -21,8 +21,11 @@ module VagrantPlugins
         command    = Shellwords.shellsplit(raw_command)
         env_backup = ENV.to_hash
         begin
-          build_environment
-          result = Vagrant::Util::Subprocess.execute(command[0], *command[1..-1])
+          result = nil
+          Bundler.with_clean_env do
+            build_environment
+            result = Vagrant::Util::Subprocess.execute(command[0], *command[1..-1])
+          end
         rescue Vagrant::Errors::CommandUnavailable, Vagrant::Errors::CommandUnavailableWindows
           raise Errors::CommandUnavailable, :command => command[0]
         ensure
@@ -72,10 +75,6 @@ module VagrantPlugins
         ENV["PATH"] = new_path
         @logger.debug("PATH modified: #{ENV["PATH"]}")
 
-        # Remove bundler settings from RUBYOPT
-        ENV["RUBYOPT"] = (ENV["RUBYOPT"] || "").gsub(/-rbundler\/setup\s*/, "")
-        @logger.debug("RUBYOPT modified: #{ENV["RUBYOPT"]}")
-
         # Add the VAGRANT_NO_TRIGGERS variable to avoid loops
         ENV["VAGRANT_NO_TRIGGERS"] = "1"
       end

data/lib/vagrant-triggers/version.rb

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

data/spec/vagrant-triggers/action/trigger_spec.rb

@@ -72,7 +72,7 @@ describe VagrantPlugins::Triggers::Action::Trigger do
 
   context ":vm option" do
     before do
-      machine.stub(:name).and_return("vm1")
+      machine.stub(:name).and_return(:vm1)
     end
 
     it "should fire trigger when :vm option match" do

data/spec/vagrant-triggers/dsl_spec.rb

@@ -122,7 +122,7 @@ describe VagrantPlugins::Triggers::DSL do
       end
     end
 
-    ["GEM_HOME", "GEM_PATH", "GEMRC"].each do |env_var|
+    ["BUNDLE_BIN_PATH", "BUNDLE_GEMFILE", "GEM_PATH", "GEMRC"].each do |env_var|
       it "should not pass #{env_var} to the executed command" do
         Vagrant::Util::Subprocess.should_receive(:execute) do |command|
           expect(ENV).not_to have_key(env_var)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-triggers
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Emiliano Ticci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler