vagrant-berkshelf 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a2450761b98810abf51927012c55b88ac90bf4
-  data.tar.gz: b04465ef7dbe4f308e63963cf3c22af17f44d03c
+  metadata.gz: 2feaee3fa0bba53fc033e08d798eb92fea7a7d67
+  data.tar.gz: 118dc4a9f16781b91c4a48cb2e6ae42a548d9a18
 SHA512:
-  metadata.gz: 09926641b9e5cdfff95d753cca85f18163fcdeeff73376c238aa558f99ebec209ecc9fd69b5ef61ece9b3d5a75c9bcfd57183fefa892cd8afb2b8ff8cae72499
-  data.tar.gz: fb4de06ffc0c8a2326d884b6bef6befb92a0034fad0f7b2526eb312e13c917232fe660e5c75640bd777e141548dce43cfdc9f19d19f2e48db9038234896cb22d
+  metadata.gz: 3183d6bbb5f5e9e5fe1570ec152b37fc38810452965077d2238325c89183d48945ed7b14e03da87b36c1818b54f2d7334230b9d552e4ee2f81867197e7f757c1
+  data.tar.gz: 1a35670f803c4785f54b0fd0b2c68c95ea4ae620b417fac1aa1aa742ef3cb3ae7b44eddb40a48d88c4df57359914ee55b0c1f0dfdae8ee63867d94e759e3c304

data/.travis.yml

@@ -2,6 +2,10 @@ sudo: false
 language: ruby
 cache: bundler
 
+branches:
+  only:
+    master
+
 matrix:
   include:
     - rvm: 2.2.5

data/Gemfile

@@ -1,9 +1,10 @@
 source 'https://rubygems.org'
 
-gemspec
-
 group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'spork'
+  gem 'rspec'
+  gem 'rake'
 end
 
 group :plugins do

data/lib/vagrant-berkshelf/helpers.rb

@@ -59,7 +59,7 @@ module VagrantPlugins
 
         final_command = [berks_bin, command, *args]
 
-        Bundler.with_clean_env do
+        Vagrant::Util::Env.with_clean_env do
           r = Subprocess.execute(*final_command)
           if r.exit_code != 0
             raise BerksCommandFailed.new(final_command.join(' '), r.stdout, r.stderr)
@@ -146,43 +146,6 @@ module VagrantPlugins
         env[:machine].data_dir.join("berkshelf")
       end
 
-      #
-      # Execute the given command, removing any Ruby-specific environment
-      # variables. This is an "enhanced" version of +Bundler.with_clean_env+,
-      # which only removes Bundler-specific values. We need to remove all
-      # values, specifically:
-      #
-      # - _ORIGINAL_GEM_PATH
-      # - GEM_PATH
-      # - GEM_HOME
-      # - GEM_ROOT
-      # - BUNDLE_BIN_PATH
-      # - BUNDLE_GEMFILE
-      # - RUBYLIB
-      # - RUBYOPT
-      # - RUBY_ENGINE
-      # - RUBY_ROOT
-      # - RUBY_VERSION
-      #
-      # This will escape Vagrant's environment entirely, which is required if
-      # calling an executable that lives in another Ruby environment. The
-      # original environment restored at the end of this call.
-      #
-      # @param [Proc] block
-      #   the block to execute with the cleaned environment
-      #
-      def with_clean_env(&block)
-        original = ENV.to_hash
-
-        ENV.delete("_ORIGINAL_GEM_PATH")
-        ENV.delete_if { |k,_| k.start_with?("BUNDLE_") }
-        ENV.delete_if { |k,_| k.start_with?("GEM_") }
-        ENV.delete_if { |k,_| k.start_with?("RUBY") }
-
-        yield
-      ensure
-        ENV.replace(original.to_hash)
-      end
     end
   end
 end

data/lib/vagrant-berkshelf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Berkshelf
-    VERSION = "5.1.0"
+    VERSION = "5.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spork