linux_container 1.4 → 1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc1ZDc1MDMyZTBhNDJhZDNmMGRlZTgzZjIzZjNiMzEyZDlhMzUyZg==
+    NTc3NjJiMDNlMDAyZjRkM2VlMjE2ZWM3MWJlNzI4YmNlODQxMzQ5OQ==
   data.tar.gz: !binary |-
-    NzU1MDUyMjQyYzk2OWE5NTg4ZmRmOGEzYzRhNjVjMTAxNzBjZjYwNQ==
+    NTYwMzc0MzM2NmE4YTAyNjg1ZDgxMDZjNzM2NWM3NmE3MmIxZTY2Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWVmMmQxMzhkZTQ1MjI2MGQ2ZjEyOGM0OTZjZWZhNGQ2ZTcyNzAzNzM4YjA2
-    NDM2YTcwZDc5ZjAyYWQ5YjcyZDgyODk2Y2ViZDI1MzVjMjVkNDcwNjZiMzdm
-    NWY4N2U0OTIxYWMwYTQyMjk1ZGMwZjA2NDk1NWM3YzUyZDg2NjY=
+    M2MxZmM4NWUwZjU5NjYzNzU0NjYxNGU5MWJhNzNhZjNhODc5NmFkYmNmN2M5
+    YTExNWM0MThhOGJjM2IzYWJiZjUwNTUyZTg0ZWRjMjA4ZmRiMjhjMTQ2N2Nh
+    YjM1MTY4YzIwMmMxMTdkOTE5OTg2NzI3YTFjZDc3MTg1YTAzMTc=
   data.tar.gz: !binary |-
-    MjJiM2EyZTAwZjVkYjY1Yjc0Njk2NjQ1NTdlNTVlNzBhMDYxMzIzM2QyMjJi
-    M2U5MjQyMjk0ZGI3ODRmMGJlMTc3Y2Q3NDQyNzc5MWE3OTQ5MWNiY2FhMjkx
-    YzYwNTI5ZDBmMjM1ZmNhMjJkYjE5OWZjZDA0NTJmZjJkNGUxNjI=
+    YTY0N2ZlOWExYjk4NTRlN2ExMGQ3Yzk5NmY0NmU4OTExYTBiN2ZlOGJmYzA0
+    OGM0NGEwYzdiZjA3MWZjNjA4MTFkMTQ3NzA1ZDkxNzM5MmFkMDk3ZjYyZmU3
+    ZmZmNGJkNzcxNzgwZGI3ZGM3N2RjOWJiNzQyYTdkNTY3MWIxM2Y=

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.5. match new ephemeral container naming scheme
 v1.4. parent_container feature
 v1.3. make aufs overridable for lxc 0.9+
 v1.2. make overlayfs overridable for lxc 0.8

data/lib/linux_container.rb

@@ -47,7 +47,7 @@ class LinuxContainer
   
   def parent_container
     n = name.dup
-    self.class.new(name: n) if n.sub!(/-temp-[0-9A-Za-z]+$/, '')
+    self.class.new(name: n) if n.sub!(/(-temp)?-[0-9A-Za-z]+$/, '')
   end
 
   def start_ephemeral(config={})

data/linux_container.gemspec

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

@@ -15,7 +15,7 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
     $sshkey = "/tmp/linuxcontainergemtestssh#{$$}"
     `ssh-keygen -q -t rsa -f #{$sshkey} -N ''` unless File.exists?($sshkey)
     $c = LinuxContainer.new(name: 'linuxcontainergemtest', ssh_key_path: $sshkey)
-    $c.create or raise "Create failed"
+    $c.create(release: 'precise') or raise "Create failed"
   end
 
   def test_state
@@ -44,7 +44,7 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
 
   def test_ephemeral
     assert($ec = $c.start_ephemeral)
-    assert_match /^linuxcontainergemtest-temp-[a-zA-Z0-9]+$/, $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')
@@ -61,7 +61,7 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
   def test_ephemeral_overlayfs
     assert($ec = $c.start_ephemeral('union-type' => 'overlayfs'))
     assert($ec.wait_for { running? }, 'wait_for running?')
-    assert_match /type overlayfs/, `mount`.lines.grep(/#{$ec.name}/).first
+    assert($ec.wait_for { ip }, 'wait_for ip')
     $ec.stop
     assert($ec.wait_for { !running? }, 'wait_for !running?')
   end

metadata

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