Kouhei Sutou
null+****@clear*****
Sat Sep 27 18:56:08 JST 2014
Kouhei Sutou 2014-09-27 18:56:08 +0900 (Sat, 27 Sep 2014) New Revision: d126e1e62f8213d00e94f79b083f7f338ac41b17 https://github.com/groonga/packages.groonga.org/commit/d126e1e62f8213d00e94f79b083f7f338ac41b17 Message: We can't away from Bundler :< Modified files: Gemfile spec/spec_helper.rb Modified: Gemfile (+3 -0) =================================================================== --- Gemfile 2014-09-27 18:48:26 +0900 (951b30d) +++ Gemfile 2014-09-27 18:56:08 +0900 (cb81f80) @@ -2,3 +2,6 @@ source "https://rubygems.org/" gem "rake" gem "serverspec" + +# For Vagrant :< +gem "log4r" Modified: spec/spec_helper.rb (+3 -26) =================================================================== --- spec/spec_helper.rb 2014-09-27 18:48:26 +0900 (ac9fd5f) +++ spec/spec_helper.rb 2014-09-27 18:56:08 +0900 (3adbf5c) @@ -5,26 +5,6 @@ require "net/ssh" include SpecInfra::Helper::Ssh include SpecInfra::Helper::DetectOS -def without_bundler - bundler_environment_variable_names = [ - "BUNDLE_BIN_PATH", - "BUNDLE_GEMFILE", - "RUBYOPT", - ] - variables = {} - bundler_environment_variable_names.each do |name| - variables[name] = ENV[name] - ENV.delete(name) - end - begin - yield - ensure - bundler_environment_variable_names.each do |name| - ENV[name] = variables[name] - end - end -end - RSpec.configure do |c| if ENV["ASK_SUDO_PASSWORD"] require "highline/import" @@ -41,12 +21,9 @@ RSpec.configure do |c| c.host = host options = Net::SSH::Config.for(c.host) user = options[:user] || Etc.getlogin - config = nil - without_bundler do - system("vagrant", "up", host) - system("vagrant", "provision", host) - config = `vagrant ssh-config #{host}` - end + system("vagrant", "up", host) + system("vagrant", "provision", host) + config = `vagrant ssh-config #{host}` if config != "" config.each_line do |line| if match = /HostName (.*)/.match(line) -------------- next part -------------- HTML����������������������������...Download
