chef-lxc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d567115ba049ac8952d5d82075fecf2ab633c5
-  data.tar.gz: 709b4aab0423d46cec4e2af27fe4c9e2be49e814
+  metadata.gz: 0262d6fd87cc8eea3ba11ea0260baa9d3e00e739
+  data.tar.gz: ca65b6a466bb8d2a3c8de5563fdc9ae0e509515b
 SHA512:
-  metadata.gz: a23cbddca704a52d4999cccf55d6fc9df02137fc8aeecdd6935f59d618180d260de1c8da1170af9916806e638c56d054b1d95bbf4107263cdb170e4cd0c6ed66
-  data.tar.gz: b6ac7276e06f35163ca876fbe9e4b56c15b0a628f175fd4b67cf5763856eee2f751c5527a65b6d827243380df88f85d3370567d6e255380ea94f7bbdffd1f843
+  metadata.gz: 6eeb3c9e8224fed349bc4bf0cff860c9c6df21c0962c2a94bfacba6ec9cc1f9e22c6ff494a18ef018b03399a449a751cbdd249f63f228a716391613bd8a13581
+  data.tar.gz: b354cd3d2458f33aa795c460efbdb9cbe340a66c9661a523029dd960082953c398fd7d6888c70a83c34ade6b5574f406a1a8540ba5aa628186ffe3cb39a1a7f9

data/README.md

@@ -3,23 +3,21 @@
 [Chef](http://www.getchef.com/) integration for [LXC](http://linuxcontainers.org/).
 
 ## Installation
-Note: This library depends on [ruby-lxc](https://github.com/lxc/ruby-lxc), a native liblxc binding, ruby-lxc will be
-released around April, 2014(alongside LXC 1.0, Ubuntu 14.04 release). Till then,
-use bundler to experiement with chef-lxc.
+This library depends on [ruby-lxc](https://github.com/lxc/ruby-lxc), a native liblxc binding.
 
-Add this line to your application's Gemfile:
+Use standard rubygem way to install chef-lxc
 
-    gem 'chef-lxc', github: 'ranjib/chef-lxc'
-
-And then execute:
+    $ gem install chef-lxc
 
-    $ bundle
+## Usage
 
-Or install it yourself as:
+There are three ways you can use chef-lxc.
+* Use the command line tool
+* Use the lxc resource/provider from any chef recipe
+* Use the Chef::LXCHelper module from any arbitrary ruby script.
 
-    $ gem install chef-lxc
+### CLI examples
 
-## Usage
 - Execute a chef recipe against a running container (like chef-apply)
   ```sh
   lxc-create -n test -t ubuntu
@@ -34,14 +32,17 @@ or supply a file
   ```sh
   chef-lxc test /path/to/recipe.rb
   ```
+### Chef resource/provider examples
 
-- Create & manage containers (inside chef recipes)
-Following will create a default (ubuntu) container named `web`
+- Create & manage containers (inside chef recipes), named `web`
   ```ruby
+  require 'chef/lxc'
   lxc "web"
   ```
 A more elaborate example,
   ```ruby
+  require 'chef/lxc'
+
   lxc "web" do
     template "ubuntu"
 
@@ -56,6 +57,26 @@ A more elaborate example,
   end
   ```
 
+### Use Chef-Lxc from arbitrary ruby code
+- Install openssh-server package on a vanilla un-privileged ubuntu container and change the default ubuntu user's password
+
+  ```ruby
+  require 'lxc'
+  require 'chef'
+  require 'chef/lxc'
+
+  include Chef::LXCHelper
+
+  ct = LXC::Container.new('foo')
+  ct.create('download', nil, {}, 0, %w{-a amd64 -r trusty -d ubuntu}) # reference: http://www.rubydoc.info/gems/ruby-lxc/LXC/Container#create-instance_method
+  ct.start
+  sleep 5 # wait till network is up and DHCP allocates the IP
+  recipe_in_container(ct) do
+    package 'openssh-server'
+    execute 'echo "ubuntu:ubuntu" | chpasswd'
+  end
+  ```
+
 ## Contributing
 
 1. Fork it

data/lib/chef/application/lxc.rb

@@ -79,11 +79,11 @@ class Chef::Application::LXC < Chef::Application
     elsif config[:stdin]
       recipe_text = STDIN.read
     else
-      recipe_text = ::File.read(ARGV[1])
+      recipe_text = ::File.read(ARGV.first)
     end
     Chef::Config[:solo] = true
     ct = ::LXC::Container.new(ARGV.first)
-    recipe_in_container(ct, text: recipe_text)
+    recipe_in_container(ct, recipe_text)
   end
 
   def run_application

data/lib/chef/lxc/version.rb

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

data/lib/chef/lxc_helper.rb

@@ -3,7 +3,7 @@ require 'lxc/extra'
 
 class Chef
   module LXCHelper
-    def recipe_in_container(ct, options={})
+    def recipe_in_container(ct, recipe_text = nil, &recipe_block)
       client = Class.new(Chef::Client) do
         def run_ohai
           ohai.run_plugins
@@ -17,12 +17,8 @@ class Chef
         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
+        recipe.instance_eval(&recipe_block) if recipe_block
+        recipe.instance_eval(recipe_text, __FILE__, __LINE__) if recipe_text
         runner = Chef::Runner.new(run_context)
         runner.converge
       end

data/lib/chef/provider/lxc.rb

@@ -80,7 +80,7 @@ class Chef
           end
         end
         unless new_resource.recipe_block.nil?
-          recipe_in_container(ct, block: new_resource.recipe_block)
+          recipe_in_container(ct, &new_resource.recipe_block)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef