jamie-lxc 0.0.1.alpha5 → 0.0.1.alpha6

data/jamie-lxc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "jamie-lxc"
-  gem.version       = "0.0.1.alpha5"
+  gem.version       = "0.0.1.alpha6"
   gem.authors       = ["Sean Porter"]
   gem.email         = ["portertech@gmail.com"]
   gem.description   = "LXC driver for Jamie"
@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
   gem.has_rdoc      = false
 
-  gem.add_dependency("jamie", ">= 0.1.0.alpha18")
+  gem.add_dependency("jamie", ">= 0.1.0.alpha19")
 
   gem.add_development_dependency("rake")
 

data/lib/jamie/driver/lxc.rb

@@ -1,5 +1,4 @@
 require "securerandom"
-require "benchmark"
 require "jamie"
 
 module Jamie
@@ -14,18 +13,15 @@ module Jamie
       default_config "username",        "jamie"
       default_config "password",        "jamie"
 
-      def create(instance, state)
+      def create(state)
         state["container_id"] = instance.name + "-" + ::SecureRandom.hex(3)
-        elapsed_time = ::Benchmark.measure do
-          clone_container(state)
-          start_container(state)
-          state["hostname"] = container_ip(state)
-          wait_for_sshd(state["hostname"])
-        end
-        puts "       Created #{state["container_id"]} in #{elapsed_time.real} seconds."
+        clone_container(state)
+        start_container(state)
+        state["hostname"] = container_ip(state)
+        wait_for_sshd(state["hostname"])
       end
 
-      def destroy(instance, state)
+      def destroy(state)
         if state["container_id"]
           destroy_container(state)
         end

data/test/lxc_driver_tests.rb

@@ -1,24 +1,32 @@
 require "minitest/spec"
 require "minitest/autorun"
+require "stringio"
 
 require File.join(File.dirname(__FILE__), "..", "lib", "jamie", "driver", "lxc")
 
 describe Jamie::Driver::Lxc do
 
   before do
-    suite = Jamie::Suite.new("name" => "test", "run_list" => Array.new)
-    config = {
-      "jamie_root" => File.dirname(__FILE__),
+    @logger_output = StringIO.new
+    driver_options = {
+      "jamie_root"     => File.dirname(__FILE__),
       "base_container" => "ubuntu-1204"
     }
-    driver = Jamie::Driver::Lxc.new(config)
-    platform = Jamie::Platform.new("name" => "ubuntu-1204", "driver" => driver)
-    @instance = Jamie::Instance.new(suite, platform)
+    instance_options = {
+      "logger"   => Jamie::Logger.new(:stdout => @logger_output),
+      "suite"    => Jamie::Suite.new("name" => "test", "run_list" => Array.new),
+      "platform" => Jamie::Platform.new("name" => "ubuntu-1204"),
+      "driver"   => Jamie::Driver::Lxc.new(driver_options),
+      "jr"       => Jamie::Jr.new("test")
+    }
+    @instance = Jamie::Instance.new(instance_options)
   end
 
   it "can clone a base lxc container" do
     @instance.create
+    @logger_output.string.must_match(/creation of <test-ubuntu-1204> complete/i)
     @instance.destroy
+    @logger_output.string.must_match(/destruction of <test-ubuntu-1204> complete/i)
   end
 
 end

metadata

@@ -2,14 +2,14 @@
 name: jamie-lxc
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 0.0.1.alpha5
+  version: 0.0.1.alpha6
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha18
+        version: 0.1.0.alpha19
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha18
+        version: 0.1.0.alpha19
   name: jamie
 - !ruby/object:Gem::Dependency
   type: :development