lxc 0.0.4 → 0.0.5

data/lib/lxc/container.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 class LXC
 
   # Container Error Class
@@ -55,7 +57,7 @@ class LXC
 
     # RegEx pattern for extracting the container PID from the "lxc-info"
     # command output.
-    REGEX_PID = /^pid:\s+([\d]+)$/
+    REGEX_PID = /^pid:\s+([-\d]+)$/
 
     # Returns the container name
     #
@@ -75,6 +77,7 @@ class LXC
     # Runs the "lxc-create" command.
     #
     # @param [Array] args Additional command-line arguments.
+    # @return [Symbol] The state of the container.
     def create(*args)
       self.exec("lxc-create", *args)
       self.state
@@ -82,12 +85,15 @@ class LXC
 
     # Destroy the container
     #
-    # Stops the container, then runs the "lxc-destroy" command.
+    # Runs the "lxc-destroy" command.  If the container has not been stopped
+    # first then this will fail unless '-f' is passed as an argument.  See
+    # the 'lxc-destroy' man page for more details.
     #
     # @param [Array] args Additional command-line arguments.
+    # @return [Symbol] The state of the container.
     def destroy(*args)
-      self.stop
       self.exec("lxc-destroy", *args)
+      self.state
     end
 
     # Start the container
@@ -188,6 +194,9 @@ class LXC
     #
     # Runs the "lxc-wait" command.
     #
+    # The timeout only works when using remote control via SSH and will orphan
+    # the process ('lxc-wait') on the remote host.
+    #
     # @param [Array] states An array of container states for which we will wait
     #   for the container to change state to.
     # @param [Integer] timeout How long in seconds we will wait before the
@@ -200,7 +209,7 @@ class LXC
       end.join('|')
 
       begin
-        Timeout::timeout(timeout) do
+        Timeout.timeout(timeout) do
           self.exec("lxc-wait", "-s", %('#{state_arg}'))
         end
       rescue Timeout::Error => e

data/lib/lxc/version.rb

@@ -2,7 +2,7 @@ class LXC
 
   unless const_defined?(:VERSION)
     # LXC Gem Version
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 
 end

data/spec/lxc/container_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+
+describe LXC::Container do
+
+  TEST_CONTAINER_NAME = "test-container"
+
+  subject {
+
+    ssh_connection = ::ZTK::SSH.new(
+      :host_name => "127.0.0.1",
+      :user => ENV['USER'],
+      :keys => "#{ENV['HOME']}/.ssh/id_rsa"
+    ).ssh
+
+    @lxc = LXC.new
+    @lxc.use_ssh = ssh_connection
+
+    LXC::Container.new(@lxc, TEST_CONTAINER_NAME)
+  }
+
+  describe "class" do
+
+    it "should be an instance of LXC::Container" do
+      subject.should be_an_instance_of LXC::Container
+    end
+
+    describe "attributes" do
+
+      describe "#name" do
+
+        it "should be readable and match what was passed to the initializer" do
+          subject.name.should == TEST_CONTAINER_NAME
+        end
+
+      end
+
+   end
+
+  end
+
+  describe "methods" do
+
+    describe "#exists?" do
+      it "should return false for an un-created remote container" do
+        subject.exists?.should == false
+      end
+    end
+
+    describe "#pid" do
+      it "should return -1 for an un-created remote container" do
+        subject.pid.should == -1
+      end
+    end
+
+    describe "#state" do
+      it "should return stopped for an un-created remote container" do
+        subject.state.should == :stopped
+      end
+    end
+
+    describe "#wait" do
+      it "should timeout while waiting for a non-existant remote container to start" do
+        subject.wait([:running], 1).should == false
+        %x(pkill -f lxc-wait)
+      end
+
+      it "should be successfully when waiting to stop a non-existant remote container" do
+        subject.wait([:stopped], 120).should == true
+      end
+    end
+
+  end
+
+end

data/spec/lxc_spec.rb

@@ -30,7 +30,7 @@ describe LXC do
 
       context "LXC Target Version #{lxc_version}" do
 
-        describe "ls" do
+        describe "#ls" do
 
           context "with containers" do
 
@@ -58,7 +58,7 @@ describe LXC do
 
         end
 
-        describe "exists?" do
+        describe "#exists?" do
 
           context "with containers" do
 
@@ -90,7 +90,7 @@ describe LXC do
 
         end
 
-        describe "ps" do
+        describe "#ps" do
           it "should return an array of strings representing the lxc process list" do
             subject.stub(:exec) { lxc_fixture(lxc_version, "lxc-ps.out") }
 
@@ -99,7 +99,7 @@ describe LXC do
           end
         end
 
-        describe "version" do
+        describe "#version" do
           it "should return a string representation of the installed LXC version" do
             subject.stub(:exec) { lxc_fixture(lxc_version, 'lxc-version.out') }
 
@@ -109,7 +109,7 @@ describe LXC do
           end
         end
 
-        describe "checkconfig" do
+        describe "#checkconfig" do
           it "should return an array of strings representing the LXC configuration" do
             subject.stub(:exec) { lxc_fixture(lxc_version, 'lxc-checkconfig.out') }
 
@@ -121,14 +121,14 @@ describe LXC do
           end
         end
 
-        describe "container" do
+        describe "#container" do
           it "should return a container object for the requested container" do
             result = subject.container("devop-test-1")
             result.should be_an_instance_of(::LXC::Container)
           end
         end
 
-        describe "containers" do
+        describe "#containers" do
 
           context "with containers" do
             it "should return an array of container objects" do
@@ -150,14 +150,14 @@ describe LXC do
 
         end
 
-        describe "inspect" do
+        describe "#inspect" do
           it "should return an information string about our class instance" do
             subject.inspect.should be_kind_of(String)
             subject.inspect.length.should be > 0
           end
         end
 
-        describe "exec" do
+        describe "#exec" do
 
           context "against local host" do
             it "should exec the supplied LXC command" do

metadata

@@ -2,7 +2,7 @@
 name: lxc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Zachary Patten
@@ -133,6 +133,7 @@ files:
 - spec/fixtures/0.8.0-rc2/lxc-ls-wo-containers.out
 - spec/fixtures/0.8.0-rc2/lxc-ps.out
 - spec/fixtures/0.8.0-rc2/lxc-version.out
+- spec/lxc/container_spec.rb
 - spec/lxc_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/zpatten/lxc
@@ -148,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4075966732520277240
+      hash: 479965379080138848
       segments: 
       - 0
       version: "0"
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4075966732520277240
+      hash: 479965379080138848
       segments: 
       - 0
       version: "0"
@@ -179,6 +180,7 @@ test_files:
 - spec/fixtures/0.8.0-rc2/lxc-ls-wo-containers.out
 - spec/fixtures/0.8.0-rc2/lxc-ps.out
 - spec/fixtures/0.8.0-rc2/lxc-version.out
+- spec/lxc/container_spec.rb
 - spec/lxc_spec.rb
 - spec/spec_helper.rb
 has_rdoc: