lxc 0.0.3 → 0.0.4

data/README.md

@@ -1,6 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/lxc.png)](http://badge.fury.io/rb/lxc)
+[![Dependency Status](https://gemnasium.com/zpatten/lxc.png)](https://gemnasium.com/zpatten/lxc)
 [![Build Status](https://secure.travis-ci.org/zpatten/lxc.png)](http://travis-ci.org/zpatten/lxc)
 [![Code Climate](https://codeclimate.com/github/zpatten/lxc.png)](https://codeclimate.com/github/zpatten/lxc)
-[![Dependency Status](https://gemnasium.com/zpatten/lxc.png)](https://gemnasium.com/zpatten/lxc)
 
 # LXC
 

data/lib/lxc.rb

@@ -85,7 +85,7 @@ class LXC
   # @param [Array] args Additional command-line arguments.
   # @return [Array<String>] A list of container names.
   def ls(*args)
-    self.exec("ls", *args).split("\n").uniq
+    self.exec("lxc-ls", *args).split("\n").uniq
   end
 
   # Check if a container exists
@@ -106,7 +106,7 @@ class LXC
   # @param [Array] args Additional command-line arguments.
   # @return [Array<String>] Output text of the "lxc-ps" command.
   def ps(*args)
-    self.exec("ps", *args).split("\n")
+    self.exec("lxc-ps", *args).split("\n")
   end
 
   # Linux container version
@@ -116,7 +116,7 @@ class LXC
   # @param [Array] args Additional command-line arguments.
   # @return [String] The installed version of LXC.
   def version(*args)
-    result = self.exec("version", *args).scan(REGEX_VERSION)
+    result = self.exec("lxc-version", *args).scan(REGEX_VERSION)
     result.flatten!.compact!
 
     result.first.strip
@@ -129,7 +129,7 @@ class LXC
   # @param [Array] args Additional command-line arguments.
   # @return [Array<String>] Output text of the "lxc-checkconfig" command.
   def checkconfig(*args)
-    self.exec("checkconfig", *args, " | #{SED_REMOVE_ANSI}").split("\n")
+    self.exec("lxc-checkconfig", *args, " | #{SED_REMOVE_ANSI}").split("\n")
   end
 
   # Linux container command execution wrapper
@@ -142,17 +142,15 @@ class LXC
   # If use_ssh is non-nil then all commands will be execute via the assigned
   # Net::SSH Session.
   #
-  # No internal checking is performed against the object assigned to use_ssh as
-  # to avoid an un-necessary direct dependency on the net-ssh gems.
-  #
   # @param [Array] args Additional command-line arguments.
   # @return [Array<String>] Stripped output text of the executed command.
   def exec(*args)
     command = args.shift
 
     arguments = Array.new
-    arguments << "sudo" if (@use_sudo == true)
-    arguments << "lxc-#{command}"
+    arguments << %(sudo) if (@use_sudo == true)
+    arguments << %(DEBIAN_FRONTEND="noninteractive")
+    arguments << command
     arguments << args
     arguments = arguments.flatten.compact.join(' ')
 
@@ -165,7 +163,11 @@ class LXC
         end
       end
     else
-      output << @use_ssh.exec!(arguments)
+      if @use_ssh.respond_to?(:exec!)
+        output << @use_ssh.exec!(arguments)
+      else
+        raise Error, "The object you assigned to use_ssh does not respond to #exec!"
+      end
     end
 
     output.join.strip

data/lib/lxc/container.rb

@@ -70,6 +70,26 @@ class LXC
       @name = name
     end
 
+    # Create the container
+    #
+    # Runs the "lxc-create" command.
+    #
+    # @param [Array] args Additional command-line arguments.
+    def create(*args)
+      self.exec("lxc-create", *args)
+      self.state
+    end
+
+    # Destroy the container
+    #
+    # Stops the container, then runs the "lxc-destroy" command.
+    #
+    # @param [Array] args Additional command-line arguments.
+    def destroy(*args)
+      self.stop
+      self.exec("lxc-destroy", *args)
+    end
+
     # Start the container
     #
     # Runs the "lxc-start" command with the "--daemon" flag.
@@ -77,7 +97,7 @@ class LXC
     # @param [Array] args Additional command-line arguments.
     # @return [Symbol] The state of the container.
     def start(*args)
-      self.exec("start", "--daemon", *args)
+      self.exec("lxc-start", "--daemon", *args)
       self.state
     end
 
@@ -88,7 +108,7 @@ class LXC
     # @param [Array] args Additional command-line arguments.
     # @return [Symbol] The state of the container.
     def stop(*args)
-      self.exec("stop", *args)
+      self.exec("lxc-stop", *args)
       self.state
     end
 
@@ -106,7 +126,7 @@ class LXC
     # @param [Array] args Additional command-line arguments.
     # @return [Symbol] The state of the container.
     def freeze(*args)
-      self.exec("freeze", *args)
+      self.exec("lxc-freeze", *args)
       self.state
     end
 
@@ -117,7 +137,7 @@ class LXC
     # @param [Array] args Additional command-line arguments.
     # @return [Symbol] The state of the container.
     def unfreeze(*args)
-      self.exec("unfreeze", *args)
+      self.exec("lxc-unfreeze", *args)
       self.state
     end
 
@@ -128,7 +148,7 @@ class LXC
     # @param [Array] args Additional command-line arguments.
     # @return [Array] Lines of output from the executed command.
     def info(*args)
-      self.exec("info", *args).split("\n").uniq.flatten
+      self.exec("lxc-info", *args).split("\n").uniq.flatten
     end
 
     # State of the container
@@ -181,13 +201,13 @@ class LXC
 
       begin
         Timeout::timeout(timeout) do
-          self.exec("wait", "-s", %('#{state_arg}'))
+          self.exec("lxc-wait", "-s", %('#{state_arg}'))
         end
       rescue Timeout::Error => e
         return false
       end
 
-      return true
+      true
     end
 
     # Linux container command execution wrapper
@@ -203,7 +223,7 @@ class LXC
     def exec(*args)
       arguments = Array.new
       arguments << args.shift
-      arguments << "--name=#{self.name}"
+      arguments << %(--name=#{self.name})
       arguments << args
       arguments.flatten!.compact!
 

data/lib/lxc/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: lxc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Zachary Patten
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-13 00:00:00 Z
+date: 2013-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ztk
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3183710469568139405
+      hash: 4075966732520277240
       segments: 
       - 0
       version: "0"
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3183710469568139405
+      hash: 4075966732520277240
       segments: 
       - 0
       version: "0"