chef-lxc 0.0.2.rc.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWJhM2RiZWFmYTljYzhkNWE5OTcxMjU3MTJmNTBkNDU0MTQ3YWUwMg==
-  data.tar.gz: !binary |-
-    MmM3ZTIyYzBmNjJkNzA5ZTk1NDMxMjk2ZDNkNDkxMDI2OGFlYTllNw==
+SHA1:
+  metadata.gz: 74d567115ba049ac8952d5d82075fecf2ab633c5
+  data.tar.gz: 709b4aab0423d46cec4e2af27fe4c9e2be49e814
 SHA512:
-  metadata.gz: !binary |-
-    MzhmODNiNDI5NTlmOGUyNGEyYzQwOTBhY2ZhZmVhNTY3YmUxMDY4M2U2ZDZk
-    YjYwNGViOWQ0NzVjMDRiNDVkNDI1ZGJjNzMxZWViNjE5ODQwNWI1ZDhiZTA0
-    ZjE4NDczZDlkZTViZTFiNGM5NzcwMmY3NGJiY2JjNDBjNTUyM2I=
-  data.tar.gz: !binary |-
-    NDRmYWVjMzZjYWZkMDcwYTBlMjA0Y2YzYWYzMTMxMDg4NDk1MGVjMTZlODg4
-    MTAzZDlkY2MzZjQ0OGNjODkzYTE3NzlmOTg0YWQyMDg1MzViNzMzM2I2YWUw
-    NTViNDA2YzMyNDMyNTFiZmUwZDI0MWVjZmE5OGVkNDc3ZjYxMWY=
+  metadata.gz: a23cbddca704a52d4999cccf55d6fc9df02137fc8aeecdd6935f59d618180d260de1c8da1170af9916806e638c56d054b1d95bbf4107263cdb170e4cd0c6ed66
+  data.tar.gz: b6ac7276e06f35163ca876fbe9e4b56c15b0a628f175fd4b67cf5763856eee2f751c5527a65b6d827243380df88f85d3370567d6e255380ea94f7bbdffd1f843

data/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gemspec
 gem 'serverspec'
 gem 'specinfra', github: 'ranjib/specinfra', branch: 'lxc'
+gem 'ruby-lxc'
+gem 'pry'

data/chef-lxc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.bindir        = "bin"
 
-  spec.add_dependency "chef", "= 11.8.4.ohai7.0"
+  spec.add_dependency "chef", ">= 11"
   spec.add_dependency "ruby-lxc"
   spec.add_dependency "lxc-extra"
   spec.homepage    = 'https://github.com/ranjib/chef-lxc'

data/lib/chef/application/lxc.rb

@@ -1,16 +1,18 @@
 require 'chef'
 require 'highline'
-require 'chef/lxc'
 require 'chef/application'
 require 'chef/client'
 require 'chef/config'
 require 'chef/log'
+require 'chef/lxc_helper'
 require 'fileutils'
 require 'tempfile'
 require 'chef/providers'
 require 'chef/resources'
+require 'digest/md5'
 
 class Chef::Application::LXC < Chef::Application
+  include Chef::LXCHelper
 
   banner "Usage: chef-lxc CONTAINER [RECIPE_FILE] [-e RECIPE_TEXT] [-s]"
 
@@ -81,25 +83,7 @@ class Chef::Application::LXC < Chef::Application
     end
     Chef::Config[:solo] = true
     ct = ::LXC::Container.new(ARGV.first)
-    client.ohai.load_plugins
-    ct.execute do
-      client.run_ohai
-      client.load_node
-      client.build_node
-      run_context = Chef::RunContext.new(client.node, {}, client.events)
-      recipe = Chef::Recipe.new("(chef-lxc cookbook)", "(chef-lxc recipe)", run_context)
-      recipe.instance_eval(recipe_text, '/foo/bar.rb', 1)
-      runner = Chef::Runner.new(run_context)
-      runner.converge
-    end
-  end
-
-  def client
-    @client ||= Class.new(Chef::Client) do
-      def run_ohai
-        ohai.run_plugins
-      end
-    end.new
+    recipe_in_container(ct, text: recipe_text)
   end
 
   def run_application

data/lib/chef/lxc/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module LXC
-    VERSION = "0.0.2.rc.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/chef/lxc.rb

@@ -1,10 +1,3 @@
-require 'lxc'
-require 'lxc/extra'
-require 'chef/lxc/version'
-require 'chef/provider/lxc'
+require 'chef/lxc_helper'
 require 'chef/resource/lxc'
-
-class Chef
-  module LXC
-  end
-end
+require 'chef/provider/lxc'

data/lib/chef/lxc_helper.rb

@@ -0,0 +1,31 @@
+require 'lxc'
+require 'lxc/extra'
+
+class Chef
+  module LXCHelper
+    def recipe_in_container(ct, options={})
+      client = Class.new(Chef::Client) do
+        def run_ohai
+          ohai.run_plugins
+        end
+      end.new
+      client.ohai.load_plugins
+      ct.execute do
+        Chef::Config[:solo] = true
+        client.run_ohai
+        client.load_node
+        client.build_node
+        run_context = Chef::RunContext.new(client.node, {}, client.events)
+        recipe = Chef::Recipe.new("chef-loxc-cookbook", "chef-lxc-recipe", run_context)
+        if options[:block]
+          recipe.instance_eval(&new_resource.recipe_block)
+        elsif options[:text]
+          recipe.instance_eval(options[:text], __FILE__, __LINE__)
+        else
+        end
+        runner = Chef::Runner.new(run_context)
+        runner.converge
+      end
+    end
+  end
+end

data/lib/chef/provider/lxc.rb

@@ -1,9 +1,9 @@
-require 'chef/provider'
-require 'lxc'
+require 'chef/lxc_helper'
 
 class Chef
   class Provider
     class Lxc < Chef::Provider
+      include Chef::LXCHelper
 
       attr_reader :ct
 
@@ -26,14 +26,33 @@ class Chef
         unless ct.defined?
           converge_by("create container '#{ct.name}'") do
             template = new_resource.lxc_template.type
-            block_device = new_resource.lxc_template.bd
             template_options = new_resource.lxc_template.options
             flags = 0
-            ct.create(template, block_device, flags, template_options)
+            ct.create(
+              new_resource.lxc_template.type,
+              new_resource.block_device,
+              new_resource.bdev_specs,
+              new_resource.flags,
+              new_resource.lxc_template.options
+            )
+            update_config
           end
         end
       end
 
+      def update_config
+        updated_items = []
+        new_resource.config.each do |key, expected_value|
+          if ct.config_item(key) != expected_value
+            ct.set_config_item(key, expected_value)
+            updated_items << key
+          end
+        end
+        unless updated_items.empty?
+          ct.save_config
+        end
+      end
+
       def action_stop
         if ct.running?
           converge_by("stop container '#{ct.name}'") do
@@ -42,14 +61,26 @@ class Chef
         end
       end
 
+      def action_reboot
+        converge_by("reboot container '#{ct.name}'") do
+          ct.reboot
+        end
+      end
+
       def action_start
         unless ct.running?
           converge_by("start container '#{ct.name}'") do
             ct.start
+            if new_resource.wait_for_network
+              until ct.ip_addresses.empty?
+                Chef::Log.debug('waiting for ip allocation')
+                sleep 1
+              end
+            end
           end
         end
         unless new_resource.recipe_block.nil?
-          run_recipe
+          recipe_in_container(ct, block: new_resource.recipe_block)
         end
       end
 
@@ -60,29 +91,6 @@ class Chef
           end
         end
       end
-
-      def run_recipe
-        client.ohai.load_plugins
-        ct.execute do
-          Chef::Config[:solo] = true
-          client.run_ohai
-          client.load_node
-          client.build_node
-          run_context = Chef::RunContext.new(client.node, {}, client.events)
-          recipe = Chef::Recipe.new(new_resource.name,'inline', run_context)
-          recipe.instance_eval(&new_resource.recipe_block)
-          runner = Chef::Runner.new(run_context)
-          runner.converge
-        end
-      end
-
-      def client
-        @client ||= Class.new(Chef::Client) do
-          def run_ohai
-            ohai.run_plugins
-          end
-        end.new
-      end
     end
   end
 end

data/lib/chef/resource/lxc.rb

@@ -4,24 +4,17 @@ class Chef
   class Resource
     class Lxc < Chef::Resource
 
-      class InlineRecipe
-      end
-
       class LXCTemplate
-        attr_reader :type, :bd, :options
-        def initialize(type='ubuntu')
+        attr_reader :type, :options
+
+        def initialize(type='download')
           @type = type
-          @bd = nil
-          @options = []
+          @options = %w{-d ubuntu -r trusty -a amd64}
         end
 
         def args(args)
           @options = args
         end
-
-        def block_device(bd)
-          @bd = bd
-        end
       end
 
       identity_attr :container_name
@@ -33,15 +26,40 @@ class Chef
         @container_name = name
         @provider = Chef::Provider::Lxc
         @action = :create
-        @allowed_actions += [:start, :stop, :destroy, :create]
+        @allowed_actions += [:start, :stop, :destroy, :create, :reboot]
         @lxc_template = LXCTemplate.new
         @recipe_block = nil
+        @block_device = nil
+        @bdev_specs = {}
+        @flags = 0
+        @config = {}
+        @wait_for_network = true
       end
 
       def container_name(arg = nil)
         set_or_return(:container_name, arg, kind_of: [ String ] )
       end
 
+      def wait_for_network(arg = nil)
+        set_or_return(:wait_for_network, arg, kind_of: [ TrueClass, FalseClass ] )
+      end
+
+      def config(arg=nil)
+        set_or_return(:config, arg, kind_of: [ Hash ] )
+      end
+
+      def flags(arg = nil)
+        set_or_return(:flags, arg, kind_of: [ Fixnum ] )
+      end
+
+      def block_device(arg = nil)
+        set_or_return(:block_device, arg, kind_of: [ String ] )
+      end
+
+      def bdev_specs(arg = nil)
+        set_or_return(:bdev_specs, arg, kind_of: [ Hash ] )
+      end
+
       def template(type = 'ubuntu', &block)
         @lxc_template = LXCTemplate.new(type)
         if block_given?

data/spec/chef/recipe_spec.rb

@@ -9,17 +9,20 @@ describe 'inline recipe' do
   before(:all) do
     execute_recipe('recipe.rb')
   end
+  after(:all) do
+    destroy_ct
+  end
 
   let(:ct) do
     LXC::Container.new('chef')
   end
 
   it 'container should be created' do
-    expect(ct.defined?).to be_true
+    expect(ct.defined?).to be(true)
   end
 
   it 'container should be running' do
-    expect(ct.running?).to be_true
+    expect(ct.running?).to be(true)
   end
 
   it 'should create test directory' do

data/spec/chef/simple_spec.rb

@@ -9,16 +9,19 @@ describe 'Chef lxc resource/provider' do
   before(:all) do
     execute_recipe('simple.rb')
   end
+  after(:all) do
+    destroy_ct
+  end
 
   let(:ct) do
     LXC::Container.new('chef')
   end
 
   it 'should create the container' do
-    expect(ct.defined?).to be_true
+    expect(ct.defined?).to be(true)
   end
 
   it 'should not start the container' do
-    expect(ct.running?).to be_false
+    expect(ct.running?).to be(false)
   end
 end

data/spec/chef/template_spec.rb

@@ -10,22 +10,26 @@ describe 'Chef lxc resource/provider' do
     execute_recipe('template.rb')
   end
 
+  after(:all) do
+    destroy_ct
+  end
+
   let(:ct) do
     LXC::Container.new('chef')
   end
 
   it 'container should be created' do
-    expect(ct.defined?).to be_true
+    expect(ct.defined?).to be(true)
   end
 
   it 'container should be running' do
-    expect(ct.running?).to be_true
+    expect(ct.running?).to be(true)
   end
 
-  it 'container should be ubuntu 10.04' do
+  it 'container should be ubuntu 14.04' do
     version = ct.execute do
         `lsb_release -a`
       end
-    expect(version).to match(/10\.04/)
+    expect(version).to match(/14\.04/)
   end
 end

data/spec/chef_lxc_spec.rb

@@ -4,12 +4,11 @@ require 'chef/application/lxc'
 describe Chef::Application::LXC do
   before(:all) do
     c = LXC::Container.new('test')
-    c.create('ubuntu') unless c.defined?
+    c.create('download', nil, {}, 0, %w{-d ubuntu -r trusty -a amd64}) unless c.defined?
     c.start unless c.running?
   end
   after(:all) do
-    c = LXC::Container.new('test')
-    c.stop if c.running?
+    destroy_ct
   end
   it 'should install a package inside a container' do
     app = Chef::Application::LXC.new

data/spec/data/recipe.rb

@@ -1,12 +1,18 @@
 require 'chef/lxc'
 
 lxc 'chef' do
-  recipe do
-
-    directory '/opt/test'
 
-    package 'apache2'
+  template 'download' do
+    args ['-d', 'ubuntu', '-r', 'trusty', '-a', 'amd64']
+  end
 
+  recipe do
+    execute 'sleep 10'
+    execute 'apt-get update -y'
+    directory '/opt/test'
+    package 'apache2' do
+      retries 5
+    end
     service 'apache2' do
       action [:start, :enable]
     end

data/spec/data/template.rb

@@ -2,8 +2,8 @@ require 'chef/lxc'
 
 lxc "chef" do
 
-  template "ubuntu" do
-    args %w{-r lucid}
+  template "download" do
+    args %w{-r trusty -d ubuntu -a amd64}
   end
 
   action [:create, :start]

data/spec/spec_helper.rb

@@ -17,6 +17,11 @@ module LXCSpecHelper
     command.run_command
     command
   end
+  def destroy_ct
+    c = LXC::Container.new('chef')
+    c.stop if c.running?
+    c.destroy if c.defined?
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: chef-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.2.rc.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.8.4.ohai7.0
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.8.4.ohai7.0
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: ruby-lxc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lxc-extra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: LXC bindings for Chef
@@ -116,7 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,6 +126,7 @@ files:
 - lib/chef/application/lxc.rb
 - lib/chef/lxc.rb
 - lib/chef/lxc/version.rb
+- lib/chef/lxc_helper.rb
 - lib/chef/provider/lxc.rb
 - lib/chef/resource/lxc.rb
 - spec/chef/recipe_spec.rb
@@ -146,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LXC bindings for Chef