kitchen-lxc 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 418715ee25b2e76bc05bdb529246672c285a4a03
-  data.tar.gz: b6e88dd94c7188b5c42dd26b43bf5f918ffa9aaf
+  metadata.gz: 9b48bbd0c4877b4b20f9d4ba3a96210d484810aa
+  data.tar.gz: 0012088b2a49f1a0abd894727b8c951985cf29b2
 SHA512:
-  metadata.gz: 4a257a729d514716151fc6f81ea5efb460dcf640daf59624828d2afafa9009dc5aac6fbe34c91df51c5c32a10cd3eaf005ed8426d3b568a32a17bc7a637871c0
-  data.tar.gz: 0733d4006ea2409a31a359899349f4f932c54f86da727b45e6cc234aeaf2fd6caec644a77c4a36fdfe4a4a95e3c8eff267945bcdf81c143373fed2d7f9f1b836
+  metadata.gz: 865ecb374db59a9b18301e9134cc14cb54989ddd1df6565d7cd55b88370200d60d780ec97d5e04c2d3ef986914cbd78167ce64bf439ea57f1d9c0eb498dac2e7
+  data.tar.gz: 8f0e81d162ce7775afe5bb8687d240e349818e47e8ba80b3caf78c18bc114c8e494a86cd2d461b3200b20d62a032de34b7e934a7afa66c851eb522ee805a6057

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Sean Porter
+Copyright (c) 2013 Sean Porter (and Chris Roberts)
 
 MIT License
 

data/README.md

@@ -3,10 +3,9 @@
 The LXC driver for the Chef convergence integration test harness,
 [Test Kitchen](https://github.com/test-kitchen).
 
-Kitchen LXC creates an ephemeral clone of a "base" LXC container to
-run a test suite.
+Kitchen LXC uses ephemeral containers to run a test suite.
 
-You may want to use the
+You may want to use this instead of the
 [Docker driver](https://github.com/portertech/kitchen-docker).
 
 ## Installation
@@ -23,8 +22,8 @@ And then execute:
 
 ### Configuration
 
-#### base_container
-The base LXC container to be cloned for each Test Kitchen suite.
+#### lxc_directory
+The base LXC container directory on the host.
 
 #### username
 The username used to login to the container.
@@ -41,6 +40,29 @@ The SSH port used to login to the container.
 
 Defaults to 22.
 
+### System layout
+
+This driver will map the platform name to a container name
+with the defined lxc directory. The name is munged with a
+simple gsub regex:
+
+```ruby
+name.gsub(/[_\-.]/, '')
+```
+
+and it will then look for container names that start with
+the updated platform name. So, if the platform name is
+'ubuntu', and the host system has 'ubuntu_1204' and 'ubuntu_1404',
+the container used will be 'ubuntu_1204'
+
+### System setup
+
+An easy way to setup the host machine is to use the `vagabond` cookbook.
+It will provide you with a collection of platforms including ubuntu,
+centos, and debian. Just copy the `/opt/hw-lxc-config/id_rsa` to the
+user's default key. This will remove the need to futz with user/pass
+configuration.
+
 ### Example
 
 `.kitchen.local.yml`
@@ -50,9 +72,8 @@ Defaults to 22.
 driver_plugin: lxc
 
 platforms:
-- name: ubuntu_1204
+- name: ubuntu
   driver_config:
-    base_container: ubuntu_1204 # your base container name
     username: kitchen # defaults to "root"
     password: kitchen # defaults to "root"
 ```
@@ -73,6 +94,10 @@ Instance        Driver  Provisioner  Last Action
 default-ubuntu_1204  Lxc     Chef Solo    <Not Created>
 ```
 
+## Note
+
+Tests are failing right now. They'll be fixed soon!
+
 ## Contributing
 
 1. Fork it

data/kitchen-lxc.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |gem|
   gem.name          = "kitchen-lxc"
-  gem.version       = "0.0.1"
-  gem.authors       = ["Sean Porter"]
-  gem.email         = ["portertech@gmail.com"]
+  gem.version       = "0.1.0"
+  gem.authors       = ["Sean Porter", "Chris Roberts"]
+  gem.email         = ["portertech@gmail.com", "code@chrisroberts.org"]
   gem.description   = "LXC driver for Test Kitchen"
   gem.summary       = "LXC driver for Test Kitchen"
-  gem.homepage      = "https://github.com/portertech/kitchen-lxc"
+  gem.homepage      = "https://github.com/chrisroberts/kitchen-lxc"
   gem.license       = "MIT"
   gem.has_rdoc      = false
 
-  gem.add_dependency("test-kitchen", ">= 1.0.0.beta.4")
-  gem.add_dependency("elecksee", ">= 1.0.14")
+  gem.add_dependency("test-kitchen", '~> 1.2', '>= 1.2.1')
+  gem.add_dependency("elecksee", '~> 1.0', '>= 1.0.22')
 
   gem.add_development_dependency("rake")
 

data/lib/kitchen/driver/lxc.rb

@@ -13,13 +13,17 @@ module Kitchen
       default_config :username, "root" # most LXC templates use this
       default_config :password, "root" # most LXC templates use this
 
-      default_config :original do |driver|
-        driver[:base_container]
-      end
-
       no_parallel_for :create
 
       def create(state)
+        name = instance.platform.name.gsub(/[_\-.]/, '')
+        names = Dir.glob(instance.driver.fetch(:lxc_directory, '/var/lib/lxc/*')).map do |path|
+          if(File.directory?(path))
+            File.basename(path)
+          end
+        end.compact.sort
+        config[:original] = names.detect{|n| n.start_with?(name)}
+
         container = ::Lxc::Ephemeral.new(config.to_hash)
         container.create!
 
@@ -35,13 +39,11 @@ module Kitchen
       def destroy(state)
         if state[:container_name]
           lxc = ::Lxc.new(state[:container_name])
-          lxc.destroy
+          lxc.stop
         end
       end
 
     end
 
-    class LXC < Lxc; end
-
   end
 end

data/test/lxc_driver_tests.rb

@@ -1,24 +1,25 @@
 require "minitest/spec"
 require "minitest/autorun"
 require "stringio"
+require 'ostruct'
 
 require File.join(File.dirname(__FILE__), "..", "lib", "kitchen", "driver", "lxc")
 
 describe Kitchen::Driver::Lxc do
 
   before do
-    @base_container = ENV["BASE_CONTAINER"]
-    raise "You must set BASE_CONTAINER" unless @base_container
     driver_options = {
       :kitchen_root   => File.dirname(__FILE__),
-      :base_container => @base_container
     }
     @logger_output = StringIO.new
     instance_options = {
       :logger   => Kitchen::Logger.new(:stdout => @logger_output),
       :suite    => Kitchen::Suite.new(:name => "test", :run_list => Array.new),
       :platform => Kitchen::Platform.new(:name => @base_container),
-      :driver   => Kitchen::Driver::Lxc.new(driver_options)
+      :driver   => Kitchen::Driver::Lxc.new(driver_options),
+      :provisioner => Kitchen::Provisioner::Base.new,
+      :busser => Object.new,
+      :state_file => Kitchen::StateFile.new('default', OpenStruct.new(:name => 'ubuntu'))#Kitchen::Busser
     }
     @instance = Kitchen::Instance.new(instance_options)
   end

metadata

@@ -1,65 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Sean Porter
+- Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: elecksee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: 1.0.22
 - !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'
 description: LXC driver for Test Kitchen
 email:
 - portertech@gmail.com
+- code@chrisroberts.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,7 +81,7 @@ files:
 - kitchen-lxc.gemspec
 - lib/kitchen/driver/lxc.rb
 - test/lxc_driver_tests.rb
-homepage: https://github.com/portertech/kitchen-lxc
+homepage: https://github.com/chrisroberts/kitchen-lxc
 licenses:
 - MIT
 metadata: {}
@@ -77,17 +91,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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LXC driver for Test Kitchen