linux_container 1.7 → 1.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWU5MGEzNTc4MWE5MWNiNTdiMGNiMWM4N2U2ZTBjZmNhZTVlZGM3MA==
+  data.tar.gz: !binary |-
+    NGYwYjgxYTU5NTNhZDkwOWUyNDk0YTlmNThhYWRiYTA0OTM1ZjU5OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MGE2OWE2ZGM2NjdkZWY5ZmU0N2EyNmQ3ZjBhMTc3NDY1ZmEzOGJlMTNmYzQ0
+    YTQzNTcyYjk3N2Y1ZTlkNjJiYjRhOTc2YzRiODY0OTcyMjA4MGE4ZDYxNjFi
+    M2YzNTU5NjVjZmQ5MDcwOTVhYWYxM2Y4ODQ1YzE0NTJmZjZjMWM=
+  data.tar.gz: !binary |-
+    Nzc0NWE3YTE2MDU3ZDE1NDk1YjBhM2I3N2Y3MGIwZDViYjEwNjU0NjZjY2Jm
+    NWQ3MjA4MGYwZjc1NjFjYjUwYWIwNzc3NmUwOGIzZDM0MDRhMWIxMGRhNTRm
+    YjU5MDk0Yjk0MGZkZWNkMDkwMDUyOGFhYTZkNGM4NDAyYmY4NGY=

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.8. Yield execute/ssh output line by line
 v1.7. use Process.spawn instead of background shell for ephemeral
 v1.6. additional ephemeral container naming chars
 v1.5. match new ephemeral container naming scheme

data/README.md

@@ -68,6 +68,10 @@ that uses little disk space. This container disappears when shut down.
 
     > c.destroy '-f'
 
+### SSH a long running command
+
+    > c.ssh('mason build') {|log| print "->#{log}" }
+
 ### other commands
 
     execute, kill, wait, cgroup, ps, info, freeze, unfreeze, netstat

data/lib/linux_container.rb

@@ -71,8 +71,8 @@ class LinuxContainer
     self.class.new(name: newname, ssh_key_path: ssh_key_path, username: username)
   end
 
-  def ssh(cmd)
-    execute('ssh', *ssh_args, "#{username}@#{ip}", cmd)
+  def ssh(cmd, &bl)
+    execute('ssh', *ssh_args, "#{username}@#{ip}", cmd, &bl)
   end 
 
   def scp_to(srcpath, dstpath, *args)
@@ -85,7 +85,7 @@ class LinuxContainer
 
   def ssh_args
     raise "cannot ssh without ip" unless ip
-    args = ['-o','StrictHostKeyChecking=no','-o','UserKnownHostsFile=/dev/null']
+    args = ['-o','StrictHostKeyChecking=no','-o','UserKnownHostsFile=/dev/null','-q']
     args.push('-i', ssh_key_path) if ssh_key_path
     args
   end 
@@ -127,7 +127,13 @@ class LinuxContainer
   
   def execute(*cmd)
     cmdstring = "#{self.class.sudo_if_needed} #{cmd.shift} #{Shellwords.join(cmd)}"
-    result = `#{cmdstring} 2>&1`
+    result = ''
+    IO.popen("#{cmdstring} 2>&1", 'r') do |io|
+      io.each_line do |line|
+        yield line if block_given?
+        result << line
+      end
+    end
     raise "command failed: #{cmdstring.inspect}\n#{result}" unless $? == 0
     result
   end

data/linux_container.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linux_container"
-  s.version = "1.7"
+  s.version = "1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2013-06-23"
+  s.date = "2013-08-20"
   s.description = "Ruby gem for ephemeral LXC linux containers"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/linux_container.rb"]
@@ -15,16 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Linux_container", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "linux_container"
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "Ruby gem for ephemeral LXC linux containers"
   s.test_files = ["test/test_all.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end

data/test/test_all.rb

@@ -49,7 +49,13 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
     assert($ec.wait_for { running? }, 'wait_for running?')
     assert($ec.wait_for { ip }, 'wait_for ip')
     assert($ec.wait_for { sshable? }, 'wait_for sshable?')
-    assert_equal "hi\n", $ec.execute('echo hi')
+    
+    assert_equal "hi!\n", $ec.ssh('echo hi!')
+    
+    yield_result = nil
+    $ec.execute('echo hi!') {|line| yield_result = line }
+    assert_equal "hi!\n", yield_result
+    
     File.unlink('/tmp/lsb-release') rescue nil
     $ec.scp_from('/etc/lsb-release', '/tmp/lsb-release')
     assert File.exists?('/tmp/lsb-release')

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_container
 version: !ruby/object:Gem::Version
-  version: '1.7'
-  prerelease: 
+  version: '1.8'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for ephemeral LXC linux containers
 email: andrew@modulus.org
@@ -29,6 +28,7 @@ files:
 - linux_container.gemspec
 homepage: https://github.com/andys/linux_container
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -40,22 +40,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: linux_container
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem for ephemeral LXC linux containers
 test_files:
 - test/test_all.rb