linux_container 1.1 → 1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDM4ZDdiZDVmZDI0OTAyYzVjMDBlZWMzY2ZjMzRjZTNjMjhhZTQ5MQ==
+  data.tar.gz: !binary |-
+    YTBjMTEwODU4YjVmMDFlOTUwNWJjMjI1Nzc2YjViM2M2MjMyOWFmOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmYzZmFmODE2YjI5MmNhOWIyZDJkMTMyZTg5YTU5M2IzNTFhNTk2NWFhYzU5
+    MWQ5NDEyOTVlZGI2MWIwZmY1Y2EwNzFmYzIwZGNhMjRkNmU2YmQxNDJiOGYz
+    YzBjMzliZjY3Y2MzMzViNWM4M2IzMGZiNjY0YTZjNTE4Yzk4ZDk=
+  data.tar.gz: !binary |-
+    YTI1MDk1OGJiODkzZjQ1NGZhM2NiNmY2N2JiZmU1MTNjNmYzMjIxMDEzYzIw
+    NzY5YTk0ZTU4ODU3ZThmNjkyYjRlMzk2NzgzNzBlNjIxOTBiYmEyMzdiNzMx
+    NTg0M2I0MTRmZjg0MWIxZTZkMzIwOWE5NTY5OWQxODBkOTMxN2Y=

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.2. make overlayfs overridable for lxc 0.8
 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

data/lib/linux_container.rb

@@ -46,16 +46,15 @@ class LinuxContainer
   end
 
   def start_ephemeral(config={})
-    defaults = {'orig' => name, 'user' => username}
+    argshash = {'orig' => name, 'user' => username, 'union-type' => 'overlayfs'}.merge!(config)
     args = []
-    if self.class.version == '0.8'
-      defaults.merge!('union-type' => 'aufs')
-      args.push '-U', defaults.delete('union-type')
-    else
-      defaults.merge!('union-type' => 'overlayfs')
+    if self.class.version == '0.8' # ubuntu quantal and older
+      args.push '-U', argshash.delete('union-type')
+    else # ubuntu raring and newer
       args << '-d'
     end
-    args.push *defaults.merge!(config).map {|k, v| "--#{k}=#{v}" }
+    args.push *argshash.map {|k, v| "--#{k}=#{v}" }
+    
     logfile_path = bg_execute('lxc-start-ephemeral', *args)
     newname = nil
     while newname.nil?

data/linux_container.gemspec

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_container
 version: !ruby/object:Gem::Version
-  version: '1.1'
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-10 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