jamie-lxc 0.0.1.alpha6 → 0.0.1.beta1

data/jamie-lxc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "jamie-lxc"
-  gem.version       = "0.0.1.alpha6"
+  gem.version       = "0.0.1.beta1"
   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.alpha19")
+  gem.add_dependency("jamie", ">= 0.1.0.beta1")
 
   gem.add_development_dependency("rake")
 

data/lib/jamie/driver/lxc.rb

@@ -7,22 +7,22 @@ module Jamie
 
     class Lxc < Jamie::Driver::SSHBase
 
-      default_config "use_sudo",        true
-      default_config "dhcp_lease_file", "/var/lib/misc/dnsmasq.leases"
-      default_config "port",            "22"
-      default_config "username",        "jamie"
-      default_config "password",        "jamie"
+      default_config :use_sudo,        true
+      default_config :dhcp_lease_file, "/var/lib/misc/dnsmasq.leases"
+      default_config :port,            "22"
+      default_config :username,        "jamie"
+      default_config :password,        "jamie"
 
       def create(state)
-        state["container_id"] = instance.name + "-" + ::SecureRandom.hex(3)
+        state[:container_id] = instance.name + "-" + ::SecureRandom.hex(3)
         clone_container(state)
         start_container(state)
-        state["hostname"] = container_ip(state)
-        wait_for_sshd(state["hostname"])
+        state[:hostname] = container_ip(state)
+        wait_for_sshd(state[:hostname])
       end
 
       def destroy(state)
-        if state["container_id"]
+        if state[:container_id]
           destroy_container(state)
         end
       end
@@ -30,33 +30,33 @@ module Jamie
       protected
 
       def clone_container(state)
-        run_command("lxc-clone -o #{config["base_container"]} -n #{state["container_id"]}")
+        run_command("lxc-clone -o #{config[:base_container]} -n #{state[:container_id]}")
       end
 
       def start_container(state)
-        run_command("lxc-start -n #{state["container_id"]} -d")
-        run_command("lxc-wait -n #{state["container_id"]} -s RUNNING")
+        run_command("lxc-start -n #{state[:container_id]} -d")
+        run_command("lxc-wait -n #{state[:container_id]} -s RUNNING")
       end
 
       def destroy_container(state)
-        run_command("lxc-destroy -n #{state["container_id"]} -f")
+        run_command("lxc-destroy -n #{state[:container_id]} -f")
       end
 
       def container_ip(state)
-        if ::File.exists?(config["dhcp_lease_file"])
+        if ::File.exists?(config[:dhcp_lease_file])
           30.times do
-            leases = ::File.readlines(config["dhcp_lease_file"]).map{ |line| line.split(" ") }
+            leases = ::File.readlines(config[:dhcp_lease_file]).map{ |line| line.split(" ") }
             leases.each do |lease|
-              if lease.include?(state["container_id"])
+              if lease.include?(state[:container_id])
                 return lease[2]
               end
             end
             sleep 3
           end
         else
-          raise ActionFailed, "LXC DHCP lease file does not exist '#{config["dhcp_lease_file"]}'"
+          raise ActionFailed, "LXC DHCP lease file does not exist '#{config[:dhcp_lease_file]}'"
         end
-        raise ActionFailed, "Could not determine IP address for LXC container '#{state["container_id"]}'"
+        raise ActionFailed, "Could not determine IP address for LXC container '#{state[:container_id]}'"
       end
 
     end

data/test/lxc_driver_tests.rb

@@ -9,24 +9,24 @@ describe Jamie::Driver::Lxc do
   before do
     @logger_output = StringIO.new
     driver_options = {
-      "jamie_root"     => File.dirname(__FILE__),
-      "base_container" => "ubuntu-1204"
+      :jamie_root      => File.dirname(__FILE__),
+      :base_container  => "ubuntu-1204"
     }
     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")
+      :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)
+    @logger_output.string.must_match(/Finished creating <test-ubuntu-1204> complete/i)
     @instance.destroy
-    @logger_output.string.must_match(/destruction of <test-ubuntu-1204> complete/i)
+    @logger_output.string.must_match(/Finished destroying 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.alpha6
+  version: 0.0.1.beta1
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-12 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.alpha19
+        version: 0.1.0.beta1
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha19
+        version: 0.1.0.beta1
   name: jamie
 - !ruby/object:Gem::Dependency
   type: :development