chef-lxc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad048909ff6c48250256ceefeda20d570420936
-  data.tar.gz: b08f1170d5e9fab374ede9d9574a07f3725c6793
+  metadata.gz: 9ba99730c548bcf0e27a3131a9c4ccd53f49ddcf
+  data.tar.gz: 13952edcce410d0c0999515a6bb89a786aff0cea
 SHA512:
-  metadata.gz: bf7c7af7788aae3b95d9319d00825d9b1b5cbee099ded9d3942beb253634e5334460dcb7ae312908c1feac22200a20846ef3e09c0cb7ed69387de03293bc46da
-  data.tar.gz: ff715f7e0d96b73c6004c9076dd583284074094441a82e21a824759c99f5c8de44b957f3fc70446009340a48757c6671ee52b857a430d4880a4f670137b1ad15
+  metadata.gz: a506cbb2277209230a1fcdef0b1149aea9f1d827f8f8e7f3268562dfaaef454115513d60e2e1d69885190f9215e027bac6155f9399476581042942f9364e994f
+  data.tar.gz: dab1929786fd6efbd9df24d08943fbc9d58715b838678b994b5cdc32ef1231807122fc2eb8c0044fad2a58950f0827873e43c1e0723eea202218dae2c4efb030

data/lib/chef/lxc/container_helper.rb

@@ -11,10 +11,11 @@ class Chef
         recipe_in_container(self, recipe_content, &block)
       end
 
-      def command(command)
+      def command(command, opts = {})
+        live_stream = opts[:live_stream] || $stdout
         out = execute(wait: true) do
           cmd = Mixlib::ShellOut.new(command)
-          cmd.live_stream = $stdout
+          cmd.live_stream = live_stream
           cmd.run_command
           cmd.exitstatus
         end

data/lib/chef/lxc/fleet.rb

@@ -19,12 +19,10 @@ class Chef
           if force
             ct.stop if ct.running?
             ct.destroy
-            provision(name, opts)
-            ct = container(name)
+            ct = provision(name, opts)
           end
         else
-          provision(name, opts)
-          ct = container(name)
+          ct = provision(name, opts)
         end
         ct.start unless ct.running?
         while ct.ip_addresses.empty?
@@ -41,9 +39,7 @@ class Chef
         ct
       end
 
-      private
-
-      def provision(name, opts)
+      def provision(name, opts = {})
         from = opts[:from]
         if from
           base = container(from)
@@ -53,10 +49,11 @@ class Chef
           bdevtype = opts[:bdevtype]
           bdevspecs = opts[:bdevspecs] || {}
           flags = opts[:flags] || 0
-          args = opts[:flags] || %w(-d ubuntu -r trusty -a amd64)
+          args = opts[:args] || %w(-d ubuntu -r trusty -a amd64)
           ct = container(name)
           ct.create(template, bdevtype, bdevspecs, flags, args)
         end
+        container(name)
       end
     end
   end

data/lib/chef/lxc/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module LXC
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/chef/lxc/fleet_spec.rb

@@ -100,4 +100,34 @@ describe Chef::LXC::Fleet do
     expect(role.run_list.count).to eq(1)
     expect(role.run_list.first.to_s).to eq('recipe[bar]')
   end
+
+  context '#provision' do
+    it 'uses ubuntu trusty amd64 by default' do
+      ct = double(::LXC::Container)
+      expect(ct).to receive(:create).with('download', nil,{}, 0, %w(-d ubuntu -r trusty -a amd64))
+      expect(::LXC::Container).to receive(:new).with('foo').twice.and_return(ct)
+      fleet.provision('foo')
+    end
+
+    it 'passes template and template arguments' do
+      ct = double(::LXC::Container)
+      expect(ct).to receive(:create).with('ubuntu', nil, {}, 0, %w(-r trusty -a amd64))
+      expect(::LXC::Container).to receive(:new).with('foo').twice.and_return(ct)
+      fleet.provision('foo', template: 'ubuntu', args: %w(-r trusty -a amd64))
+    end
+
+    it 'passes bdevtype and specs' do
+      ct = double(::LXC::Container)
+      expect(ct).to receive(:create).with('download', 'lvm',{baz: :bar}, 0, %w(-d ubuntu -r trusty -a amd64))
+      expect(::LXC::Container).to receive(:new).with('foo').twice.and_return(ct)
+      fleet.provision('foo', bdevtype: 'lvm', bdevspecs: {baz: :bar})
+    end
+
+    it 'passes clone flags' do
+      ct = double(::LXC::Container)
+      expect(ct).to receive(:create).with('download', nil, {}, 12, %w(-d ubuntu -r trusty -a amd64))
+      expect(::LXC::Container).to receive(:new).with('foo').twice.and_return(ct)
+      fleet.provision('foo', flags: 12)
+    end
+  end
 end

data/spec/chef_lxc_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Application::LXC do
   end
   it 'should install a package inside a container' do
     app = Chef::Application::LXC.new
-    app.config[:execute] = 'package "screen"'
+    app.config[:execute] = 'execute "apt-get update -y"'
     ARGV.clear
     ARGV << 'test'
     expect do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-lxc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef