Skip to content

Commit

Permalink
Removed remaining extraneous bundle exec's
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeffrey Peckham and Vinicius Fuentes committed Apr 3, 2013
1 parent 7a63a63 commit 19a8cf4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bat/spec/helpers/bosh_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def self.delete_bosh_cli_config
end

def bosh_bin
BH.read_environment('BAT_BOSH_BIN', 'bundle exec bosh')
BH.read_environment('BAT_BOSH_BIN', 'bosh')
end

def bosh_director
Expand Down
2 changes: 1 addition & 1 deletion bat/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
config.before(:suite) do
director = BH::read_environment('BAT_DIRECTOR')
director.should_not be_nil
cmd = "bundle exec bosh --config #{BH::bosh_cli_config_path} --user admin " +
cmd = "bosh --config #{BH::bosh_cli_config_path} --user admin " +
"--password admin target #{director} 2>&1"
output = %x{#{cmd}}
$?.exitstatus.should == 0
Expand Down
2 changes: 1 addition & 1 deletion director/lib/cloud/dummy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def create_vm(agent_id, stemcell, resource_pool, networks, disk_locality = nil,
# so in order to kill all these new processes when cleaning up we need them
# in a single process group.
Process.setpgid(0, 0)
exec "bundle exec #{agent_cmd} > /tmp/bosh_test_cloud/bosh_agent.#{agent_id}.log 2>&1"
exec "#{agent_cmd} > /tmp/bosh_test_cloud/bosh_agent.#{agent_id}.log 2>&1"
end

Process.detach(agent_pid)
Expand Down
2 changes: 1 addition & 1 deletion spec/support/bosh_command_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def run(cmd)

def run_bosh(cmd, work_dir = nil)
Dir.chdir(work_dir || BOSH_WORK_DIR) do
run "bundle exec bosh -v -n --config '#{BOSH_CONFIG}' -C #{BOSH_CACHE_DIR} #{cmd}"
run "bosh -v -n --config '#{BOSH_CONFIG}' -C #{BOSH_CACHE_DIR} #{cmd}"
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/support/sandbox.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def start
FileUtils.rm_rf(TESTCASE_SQLITE_DB)

Dir.chdir(DIRECTOR_PATH) do
output = `bundle exec bin/migrate -c #{DIRECTOR_CONF}`
output = `bin/migrate -c #{DIRECTOR_CONF}`
unless $?.exitstatus == 0
puts "Failed to run migration:"
puts output
Expand Down

0 comments on commit 19a8cf4

Please sign in to comment.