Permalink
Browse files

Move the use of global args into the CLI layer instead of the Box#scp…

…_file API

Fixes #53
  • Loading branch information...
1 parent ca76d16 commit 009dc4564907c7a207784841e66fee30e7d9d414 @rtyler committed Sep 3, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −2 lib/blimpy/box.rb
  2. +2 −1 lib/blimpy/cli.rb
View
@@ -208,10 +208,10 @@ def ssh_into(*args)
'-l', username, dns, *args)
end
- def scp_file(filename, directory='')
+ def scp_file(filename, directory='', *args)
filename = File.expand_path(filename)
run_command('scp', '-o', 'StrictHostKeyChecking=no',
- filename, "#{username}@#{dns}:#{directory}", *ARGV[3..-1])
+ filename, "#{username}@#{dns}:#{directory}", *args)
end
def bootstrap_livery
View
@@ -155,7 +155,8 @@ def scp(name, filename, *args)
exit 1
end
box.wait_for_sshd
- box.scp_file(filename)
+ # Pass any extra commands along to the `scp` invocation
+ box.scp_file(filename, '', *ARGV[3..-1])
end
desc 'provision BLIMP_NAME', 'Run the livery again'

0 comments on commit 009dc45

Please sign in to comment.