lxc 0.0.2 → 0.0.3

data/lib/lxc/container.rb

@@ -1,11 +1,16 @@
 class LXC
+
+  # Container Error Class
   class ContainerError < Error; end
 
+  # Main Container Class
+  #
+  # @author Zachary Patten <zachary@jovelabs.net>
   class Container
 
     # An array containing the valid container states extracted from the LXC
     # c-source code.
-    STATES = %w(stopped starting running stopping aborting freezing frozen thawed)
+    STATES = %w(stopped starting running stopping aborting freezing frozen thawed).map(&:to_sym)
 
     # @!method stopped?
     #   Returns true if the container is stopped, false otherwise.
@@ -39,8 +44,8 @@ class LXC
     #   Returns true if the container is thawed, false otherwise.
     #   @return [Boolean]
     STATES.each do |state|
-      define_method "#{state.downcase}?" do
-        (self.state == state.downcase.to_sym)
+      define_method "#{state}?" do
+        (self.state == state)
       end
     end
 
@@ -159,6 +164,32 @@ class LXC
       @lxc.exists?(self.name)
     end
 
+    # Wait for a specific container state
+    #
+    # Runs the "lxc-wait" command.
+    #
+    # @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
+    #   operation times out.
+    # @return [Boolean] Returns true of the state change happened, false
+    #   otherwise.
+    def wait(states, timeout=60)
+      state_arg = states.map do |state|
+        state.to_s.upcase.strip
+      end.join('|')
+
+      begin
+        Timeout::timeout(timeout) do
+          self.exec("wait", "-s", %('#{state_arg}'))
+        end
+      rescue Timeout::Error => e
+        return false
+      end
+
+      return true
+    end
+
     # Linux container command execution wrapper
     #
     # Executes the supplied command by injecting the container name into the

data/lib/lxc/version.rb

@@ -1,3 +1,8 @@
 class LXC
-  VERSION = "0.0.2" unless const_defined?(:VERSION)
+
+  unless const_defined?(:VERSION)
+    # LXC Gem Version
+    VERSION = "0.0.3"
+  end
+
 end

data/lib/lxc.rb

@@ -2,7 +2,7 @@ require 'ztk'
 
 require 'lxc/version'
 
-# Main LXC (Linux Container) Class
+# Top-Level LXC Class
 #
 # @author Zachary Patten <zachary@jovelabs.net>
 class LXC
@@ -45,6 +45,11 @@ class LXC
   # output.
   REGEX_VERSION = /^lxc version:\s+([\w\W]+)$/
 
+  # SED command for removing ANSI colors
+  #
+  # @see http://www.commandlinefu.com/commands/view/3584/remove-color-codes-special-characters-with-sed CommandLineFu - Remove Color Codes (Special Characters) with SED
+  SED_REMOVE_ANSI = %q(sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g")
+
   def initialize
     @use_sudo = false
     @use_ssh  = nil
@@ -122,9 +127,9 @@ class LXC
   # Runs the "lxc-checkconfig" command.
   #
   # @param [Array] args Additional command-line arguments.
-  # @return [Array<String>] Output text of the "lxc-ps" command.
+  # @return [Array<String>] Output text of the "lxc-checkconfig" command.
   def checkconfig(*args)
-    self.exec("checkconfig", *args).split("\n")
+    self.exec("checkconfig", *args, " | #{SED_REMOVE_ANSI}").split("\n")
   end
 
   # Linux container command execution wrapper

metadata

@@ -1,152 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: lxc
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ztk
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id008
 description: An interface for controlling local or remote Linux Containers (LXC)
-email:
+email: 
 - zachary@jovelabs.com
-executables:
+executables: 
 - lxc-console
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc.template
@@ -173,37 +136,39 @@ files:
 - spec/lxc_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/zpatten/lxc
-licenses:
+licenses: 
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3183710469568139405
+      segments: 
       - 0
-      hash: 4541588393573481545
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3183710469568139405
+      segments: 
       - 0
-      hash: 4541588393573481545
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An interface for controlling local or remote Linux Containers (LXC)
-test_files:
+test_files: 
 - spec/fixtures/0.7.5/lxc-checkconfig.out
 - spec/fixtures/0.7.5/lxc-ls-w-containers.out
 - spec/fixtures/0.7.5/lxc-ls-wo-containers.out