linux_container 1.0 → 1.1

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.1. scp into container support
 v1.0. state() should always return a string
 v0.9. default to aufs only for 0.8 for ephemeral
 v0.8. Support lxc 0.9

data/lib/linux_container.rb

@@ -66,13 +66,25 @@ class LinuxContainer
   end
 
   def ssh(cmd)
+    execute('ssh', *ssh_args, "#{username}@#{ip}", cmd)
+  end 
+
+  def scp_to(srcpath, dstpath, *args)
+    execute('scp', *args, *ssh_args, srcpath, "#{username}@#{ip}:#{dstpath}")
+  end 
+
+  def scp_from(srcpath, dstpath, *args)
+    execute('scp', *args, *ssh_args, "#{username}@#{ip}:#{srcpath}", dstpath)
+  end 
+
+  def ssh_args
     raise "cannot ssh without ip" unless ip
     args = ['-o','StrictHostKeyChecking=no','-o','UserKnownHostsFile=/dev/null']
     args.push('-i', ssh_key_path) if ssh_key_path
-    args.push("#{username}@#{ip}", cmd)
-    execute('ssh', *args)
+    args
   end 
 
+
   def sshable?
     ssh('true') rescue false
   end
@@ -100,7 +112,7 @@ class LinuxContainer
       end
     end
   end
-  
+
 #############################################################################
 
   def lxc_execute(cmd, *args)

data/linux_container.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "linux_container"
-  s.version = "1.0"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]

data/test/test_all.rb

@@ -49,6 +49,9 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
     assert($ec.wait_for { ip }, 'wait_for ip')
     assert($ec.wait_for { sshable? }, 'wait_for sshable?')
     assert_equal "hi\n", $ec.execute('echo hi')
+    File.unlink('/tmp/lsb-release') rescue nil
+    $ec.scp_from('/etc/lsb-release', '/tmp/lsb-release')
+    assert File.exists?('/tmp/lsb-release')
     $ec.stop
     assert($ec.wait_for { !running? }, 'wait_for !running?')
     assert($ec.wait_for { !File.exists?($ec.dir) }, 'wait_for directory deletion')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_container
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors: