linux_container 1.3 → 1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJjMTU1MTEyNDM2MDNiMDU1Njg0YmZiYTE1NjI5NjQ0ODI2OGY2NA==
+    Mjc1ZDc1MDMyZTBhNDJhZDNmMGRlZTgzZjIzZjNiMzEyZDlhMzUyZg==
   data.tar.gz: !binary |-
-    M2VmMTFlZWE3OTYwNGM5OGRhZTQ3NjgxMzM0ZmE4YTA5OWEyNTU0NA==
+    NzU1MDUyMjQyYzk2OWE5NTg4ZmRmOGEzYzRhNjVjMTAxNzBjZjYwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGVhZGNkMTc4MWU5YTk1ZmY4NWFmMzJmNGU4NGU4YTVkYjI3NmI3YjYyYTA5
-    NzU2ZWFiZTY0MGFjMDM1ZTYwN2QyNzBhMzM5ZDc4Y2YxNWI5NGI5MzgzNzUw
-    MWFiOGI2NGNhMjM0NTdkODA3MmM4MjA5ZTViNjc5OTViOGQ0OWE=
+    MWVmMmQxMzhkZTQ1MjI2MGQ2ZjEyOGM0OTZjZWZhNGQ2ZTcyNzAzNzM4YjA2
+    NDM2YTcwZDc5ZjAyYWQ5YjcyZDgyODk2Y2ViZDI1MzVjMjVkNDcwNjZiMzdm
+    NWY4N2U0OTIxYWMwYTQyMjk1ZGMwZjA2NDk1NWM3YzUyZDg2NjY=
   data.tar.gz: !binary |-
-    N2M1YjQ0MTliMDk5NzJkM2FiYmUyZDVmNWVhNDQ1ODdjOWU0Njg2NDNmNjQz
-    NmU0YTllYTYzMmRhMjc3NTA4N2ZkYzA5NzY1NDJkODNmZWEyNDM2YzUyNzE4
-    Mjk1YTI0MGE0ZmZiYTQxN2FlMWY0YWQwYmYyMmM0MGI2NWVmMTE=
+    MjJiM2EyZTAwZjVkYjY1Yjc0Njk2NjQ1NTdlNTVlNzBhMDYxMzIzM2QyMjJi
+    M2U5MjQyMjk0ZGI3ODRmMGJlMTc3Y2Q3NDQyNzc5MWE3OTQ5MWNiY2FhMjkx
+    YzYwNTI5ZDBmMjM1ZmNhMjJkYjE5OWZjZDA0NTJmZjJkNGUxNjI=

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.4. parent_container feature
 v1.3. make aufs overridable for lxc 0.9+
 v1.2. make overlayfs overridable for lxc 0.8
 v1.1. scp into container support

data/README.md

@@ -43,6 +43,8 @@ very little disk space, which then disappears when shut down.
 
     > e = c.start_ephemeral
     > e.wait_for { ip && sshable? }
+    > e.parent_container
+     => #<LinuxContainer:...>
 
 
 ### Clone an existing container and start it in background, with 512M memlimit
@@ -62,7 +64,7 @@ very little disk space, which then disappears when shut down.
     > c.shutdown '-t', '120'
 
 
-### Force shutdown
+### Force shutdown & delete
 
     > c.destroy '-f'
 

data/lib/linux_container.rb

@@ -44,6 +44,11 @@ class LinuxContainer
     fromname = self.class === from ? from.name : from
     lxc_execute('clone', '-o',fromname, *args)
   end
+  
+  def parent_container
+    n = name.dup
+    self.class.new(name: n) if n.sub!(/-temp-[0-9A-Za-z]+$/, '')
+  end
 
   def start_ephemeral(config={})
     argshash = {'orig' => name, 'user' => username}.merge!(config)

data/linux_container.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linux_container"
-  s.version = "1.3"
+  s.version = "1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2013-04-10"
+  s.date = "2013-04-24"
   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"]

data/test/test_all.rb

@@ -44,7 +44,8 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
 
   def test_ephemeral
     assert($ec = $c.start_ephemeral)
-    assert_match /^linuxcontainergemtest.+/, $ec.name
+    assert_match /^linuxcontainergemtest-temp-[a-zA-Z0-9]+$/, $ec.name
+    assert_equal $c.name, $ec.parent_container.name
     assert($ec.wait_for { running? }, 'wait_for running?')
     assert($ec.wait_for { ip }, 'wait_for ip')
     assert($ec.wait_for { sshable? }, 'wait_for sshable?')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_container
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for ephemeral LXC linux containers
 email: andrew@modulus.org