lxc 0.2.12 → 0.2.13

data/bin/lxc-console

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 ################################################################################
 #
 #      Author: Zachary Patten <zachary AT jovelabs DOT com>
@@ -17,7 +18,8 @@
 #   limitations under the License.
 #
 ################################################################################
-#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
 
 def lxc_console
   require 'pry'

data/lib/lxc/config.rb

@@ -140,8 +140,8 @@ class LXC
 
       content.split("\n").map(&:strip).each do |line|
         key, value = line.split('=').map(&:strip)
-        if key =~ /network/
-          if key =~ /network.type/
+        if key =~ /lxc\.network/
+          if key =~ /lxc\.network\.type/
             # this is a new network object
             @networks << network
             network = Hash.new

data/lib/lxc/runner.rb

@@ -0,0 +1,17 @@
+require 'timeout'
+
+class LXC
+
+  # Runner Error Class
+  class RunnerError < LXCError; end
+
+  # Main Runner Class
+  #
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  class Runner
+
+    autoload :Shell, 'lxc/runners/shell'
+    autoload :SSH,   'lxc/runners/ssh'
+
+  end
+end

data/lib/lxc/runners/shell.rb

@@ -0,0 +1,81 @@
+class LXC
+  class Runner
+
+    class ShellError < RunnerError; end
+
+    class Shell
+      require 'socket'
+
+      # Controls if sudo is prefixed on all executed commands.
+      #
+      # @overload use_sudo=(value)
+      #   Sets if all executed commands should be prefixed with sudo.
+      #   @param [Boolean] value
+      #
+      # @overload use_sudo
+      #   Gets if we are prefixing all executed commands with sudo.
+      #
+      # @return [Boolean] Returns true if we are prefixing commands with "sudo";
+      #   otherwise false.
+      attr_accessor :use_sudo
+
+      # @param [Hash] options Options hash.
+      # @option options [Boolean] :use_sudo (false) Whether or not to prefix all
+      #   commands with 'sudo'.
+      def initialize(options={})
+        @hostname = Socket.gethostname.split('.').first.strip
+
+        @ui       = (options[:ui] || ZTK::UI.new)
+        @use_sudo = (options[:use_sudo] || false)
+      end
+
+      # Linux container command execution wrapper
+      #
+      # Runs the supplied LXC command.  The first element in the "args" splat is the
+      # command to be execute, the rest of the elements are treated as command line
+      # arguments.
+      #
+      # If use_sudo is true then all commands will be prefix with "sudo".
+      # If use_ssh is non-nil then all commands will be execute via the assigned
+      # Net::SSH Session.
+      #
+      # @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 << command
+        arguments << args
+        arguments = arguments.flatten.compact.join(' ')
+
+        output = Array.new
+
+        begin
+          ::ZTK::PTY.spawn(arguments) do |reader, writer, pid|
+            while (buffer = reader.readpartial(1024))
+              output << buffer
+            end
+          end
+        rescue EOFError
+          # NOOP
+        end
+
+        output.join
+      end
+
+      # Provides a concise string representation of the class
+      # @return [String]
+      def inspect
+        tags = Array.new
+        tags << "host=#{@hostname.inspect}"
+        tags << "use_sudo=#{@use_sudo.inspect}"
+        tags = tags.join(' ')
+
+        "#<#{self.class} #{tags}>"
+      end
+
+    end
+  end
+end

data/lib/lxc/version.rb

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

data/lib/lxc.rb

@@ -10,8 +10,9 @@ class LXC
   # Top-Level Error Class
   class LXCError < StandardError; end
 
-  autoload :Config, 'lxc/config'
+  autoload :Config,    'lxc/config'
   autoload :Container, 'lxc/container'
+  autoload :Runner,    'lxc/runner'
 
   # Controls if sudo is prefixed on all executed commands.
   #

data/spec/lxc_spec.rb

@@ -199,7 +199,8 @@ describe LXC do
               @ssh_connection = ::ZTK::SSH.new(
                 :host_name => "127.0.0.1",
                 :user => ENV['USER'],
-                :keys => "#{ENV['HOME']}/.ssh/id_rsa"
+                :keys => File.join(ENV['HOME'], '.ssh', 'id_rsa'),
+                :keys_only => true
               ).ssh
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxc
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
@@ -161,6 +161,8 @@ files:
 - lib/lxc.rb
 - lib/lxc/config.rb
 - lib/lxc/container.rb
+- lib/lxc/runner.rb
+- lib/lxc/runners/shell.rb
 - lib/lxc/version.rb
 - lxc.gemspec
 - spec/lxc/config_spec.rb
@@ -214,12 +216,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2981418491518284885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2981418491518284885
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25