elecksee 1.0.10 → 1.0.12

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.12
+* Allow access to ephemeral setup without creation
+* Add `#destroy` method to `Lxc` instances
+
 ## v1.0.10
 * Add clone support
 * Allow command passage to ephemeral nodes

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'childprocess'
+
 gemspec

data/Gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: .
   specs:
-    elecksee (1.0.9)
+    elecksee (1.0.11)
       mixlib-shellout
       net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mixlib-shellout (1.1.0)
-    net-ssh (2.6.7)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    ffi (1.9.3)
+    mixlib-shellout (1.2.0)
+    net-ssh (2.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  childprocess
   elecksee!

data/lib/elecksee/ephemeral.rb

@@ -53,10 +53,10 @@ class Lxc
       @ephemeral_binds = []
       @lxc = nil
     end
-    
+
     def register_traps
       %w(TERM INT QUIT).each do |sig|
-        Signal.trap(sig){ cleanup }
+        Signal.trap(sig){ cleanup && raise }
       end
     end
 
@@ -71,6 +71,7 @@ class Lxc
       begin
         lxc.start
         if(ephemeral_command)
+          lxc.wait_for_state(:running)
           lxc.container_command(ephemeral_command)
         else
           cli_output
@@ -81,7 +82,11 @@ class Lxc
       end
       true
     end
-    
+
+    def create!
+      setup
+    end
+
     def start!(*args)
       register_traps
       setup
@@ -114,7 +119,7 @@ class Lxc
     end
 
     private
-    
+
     def setup
       create
       build_overlay
@@ -138,14 +143,14 @@ class Lxc
       )
       @ephemeral_overlay.mount
     end
-    
+
     def create
       Dir.glob(File.join(lxc_dir, original, '*')).each do |o_path|
         next unless File.file?(o_path)
         command("cp #{o_path} #{File.join(path, File.basename(o_path))}", :sudo => true)
       end
       @lxc = Lxc.new(name)
-      command("mkdir -p '#{lxc.path.join('rootfs')}'", :sudo => true)
+      command("mkdir -p #{lxc.path.join('rootfs')}", :sudo => true)
       update_net_hwaddr
     end
 

data/lib/elecksee/helpers/base.rb

@@ -1,19 +1,117 @@
 class Lxc
   class CommandFailed < StandardError
+    attr_accessor :original, :result
+    def initialize(orig, result=nil)
+      @original = orig
+      @result = result
+      super(orig.to_s)
+    end
+  end
+
+  class Timeout < CommandFailed
+  end
+
+  class CommandResult
+    attr_reader :original, :stdout, :stderr
+    def initialize(result)
+      @original = result
+      if(result.class.ancestors.map(&:to_s).include?('ChildProcess::AbstractProcess'))
+        extract_childprocess
+      elsif(result.class.to_s == 'Mixlib::ShellOut')
+        extract_shellout
+      else
+        raise TypeError.new("Unknown process result type received: #{result.class}")
+      end
+    end
+
+    def extract_childprocess
+      original.io.stdout.rewind
+      original.io.stderr.rewind
+      @stdout = original.io.stdout.read
+      @stderr = original.io.stderr.read
+      original.io.stdout.delete
+      original.io.stderr.delete
+    end
+
+    def extract_shellout
+      @stdout = original.stdout
+      @stderr = original.stderr
+    end
   end
 
   module Helpers
-  
+
     def sudo
       Lxc.sudo
     end
-    
+
     # Simple helper to shell out
     def run_command(cmd, args={})
+      cmd_type = Lxc.shellout_helper
+      unless(cmd_type)
+        if(defined?(ChildProcess))
+          cmd_type = :childprocess
+        else
+          cmd_type = :mixlib_shellout
+        end
+      end
+      case cmd_type
+      when :childprocess
+        require 'tempfile'
+        result = child_process_command(cmd, args)
+      when :mixlib_shellout
+        require 'mixlib/shellout'
+        result = mixlib_shellout_command(cmd, args)
+      else
+        raise ArgumentError.new("Unknown shellout helper provided: #{cmd_type}")
+      end
+      CommandResult.new(result)
+    end
+
+    def child_process_command(cmd, args)
       retries = args[:allow_failure_retry].to_i
       cmd = [sudo, cmd].join(' ') if args[:sudo]
       begin
-        shlout = Mixlib::ShellOut.new(cmd, 
+        s_out = Tempfile.new('stdout')
+        s_err = Tempfile.new('stderr')
+        s_out.sync
+        s_err.sync
+        cmd_parts = cmd.split(' ')
+        cmd_parts.delete_if(&:empty?)
+        c_proc = ChildProcess.build(*cmd_parts)
+        c_proc.environment.merge('HOME' => detect_home)
+        c_proc.io.stdout = s_out
+        c_proc.io.stderr = s_err
+        c_proc.start
+        begin
+          c_proc.poll_for_exit(args[:timeout] || 1200)
+        rescue ChildProcess::TimeoutError
+          c_proc.stop
+        ensure
+          raise CommandFailed.new("Command failed: #{cmd}", CommandResult.new(c_proc)) if c_proc.crashed?
+        end
+        c_proc
+      rescue CommandFailed
+        if(retries > 0)
+          log.warn "LXC run command failed: #{cmd}"
+          log.warn "Retrying command. #{args[:allow_failure_retry].to_i - retries} of #{args[:allow_failure_retry].to_i} retries remain"
+          sleep(0.3)
+          retries -= 1
+          retry
+        elsif(args[:allow_failure])
+          false
+        else
+          raise
+        end
+      end
+    end
+
+    def mixlib_shellout_command(cmd, args)
+      retries = args[:allow_failure_retry].to_i
+      cmd = [sudo, cmd].join(' ') if args[:sudo]
+      shlout = nil
+      begin
+        shlout = Mixlib::ShellOut.new(cmd,
           :logger => defined?(Chef) && defined?(Chef::Log) ? Chef::Log.logger : log,
           :live_stream => args[:livestream] ? STDOUT : nil,
           :timeout => args[:timeout] || 1200,
@@ -22,7 +120,7 @@ class Lxc
         shlout.run_command
         shlout.error!
         shlout
-      rescue Mixlib::ShellOut::ShellCommandFailed, CommandFailed, Mixlib::ShellOut::CommandTimeout
+      rescue Mixlib::ShellOut::ShellCommandFailed, CommandFailed, Mixlib::ShellOut::CommandTimeout => e
         if(retries > 0)
           log.warn "LXC run command failed: #{cmd}"
           log.warn "Retrying command. #{args[:allow_failure_retry].to_i - retries} of #{args[:allow_failure_retry].to_i} retries remain"
@@ -32,7 +130,7 @@ class Lxc
         elsif(args[:allow_failure])
           false
         else
-          raise
+          raise CommandFailed.new(e, CommandResult.new(shlout))
         end
       end
     end
@@ -40,7 +138,7 @@ class Lxc
     def command(*args)
       run_command(*args)
     end
-    
+
     def log
       if(defined?(Chef))
         Chef::Log
@@ -52,7 +150,7 @@ class Lxc
         @logger
       end
     end
-    
+
     # Detect HOME environment variable. If not an acceptable
     # value, set to /root or /tmp
     def detect_home(set_if_missing=false)

data/lib/elecksee/knife/config.rb

@@ -0,0 +1,37 @@
+require 'chef/mash'
+require 'chef/json_compat'
+
+class Lxc
+  class Knife
+    class Config
+
+      attr_reader :base_path
+      attr_reader :store
+
+      def initialize(args={})
+        
+        
+      def initialize(path='/etc/knife-lxc/config.json')
+        if(File.exists?(path))
+          @base_path = path
+          @store = Chef::JSONCompat.from_json(File.read(path))
+        else
+          raise ArgumentError.new("Provided path is not valid: #{path}")
+        end
+      end
+
+      def [](k)
+        @store[k]
+      end
+
+      def 
+      
+      def used_addresses
+      end
+
+      def available_addresses
+      end
+      
+    end
+  end
+end

data/lib/elecksee/lxc.rb

@@ -1,10 +1,9 @@
 require 'elecksee/helpers/base'
-require 'mixlib/shellout'
 require 'pathname'
 require 'tmpdir'
 
 class Lxc
-  
+
   # Pathname#join does not act like File#join when joining paths that
   # begin with '/', and that's dumb. So we'll make our own Pathname,
   # with a #join that uses File
@@ -13,7 +12,7 @@ class Lxc
       self.class.new(::File.join(self.to_path, *args))
     end
   end
-  
+
   include Helpers
 
   attr_reader :name, :base_path, :lease_file, :preferred_device
@@ -21,9 +20,10 @@ class Lxc
   class << self
 
     include Helpers
-    
+
     attr_accessor :use_sudo
     attr_accessor :base_path
+    attr_accessor :shellout_helper
 
     def sudo
       case use_sudo
@@ -33,11 +33,11 @@ class Lxc
         "#{use_sudo} "
       end
     end
-    
+
     def base_path
       @base_path || '/var/lib/lxc'
     end
-        
+
     # List running containers
     def running
       full_list[:running]
@@ -67,7 +67,7 @@ class Lxc
         end
       end.compact
     end
-    
+
     # name:: Name of container
     # Returns information about given container
     def info(name)
@@ -82,6 +82,7 @@ class Lxc
       else
         res[:state] = :unknown
         res[:pid] = -1
+        res
       end
     end
 
@@ -130,7 +131,7 @@ class Lxc
   def stopped?
     self.class.info(name)[:state] == :stopped
   end
- 
+
   # Returns if container is frozen
   def frozen?
     self.class.info(name)[:state] == :frozen
@@ -281,7 +282,7 @@ class Lxc
     run_command("#{sudo}lxc-stop -n #{name}", :allow_failure_retry => 3)
     wait_for_state(:stopped)
   end
-  
+
   # Freeze the container
   def freeze
     run_command("#{sudo}lxc-freeze -n #{name}")
@@ -309,15 +310,22 @@ class Lxc
     end
   end
 
+  # Destroy the container
+  def destroy
+    unless stopped?
+      stop
+    end
+    run_command("#{sudo}lxc-destroy -n #{name}")
+  end
+
   def direct_container_command(command, args={})
-    com = "#{sudo}ssh root@#{args[:ip] || container_ip} -i /opt/hw-lxc-config/id_rsa -oStrictHostKeyChecking=no '#{command}'"
     begin
-      cmd = Mixlib::ShellOut.new(com,
-        :live_stream => args[:live_stream],
-        :timeout => args[:timeout] || 1200
+      run_command(
+        "ssh root@#{args[:ip] || container_ip} -i /opt/hw-lxc-config/id_rsa -oStrictHostKeyChecking=no '#{command}'",
+        :sudo => true,
+        :timeout => args[:timeout],
+        :live_stream => args[:live_stream]
       )
-      cmd.run_command
-      cmd.error!
       true
     rescue
       raise if args[:raise_on_failure]
@@ -330,7 +338,7 @@ class Lxc
   def run_command(cmd, args={})
     retries = args[:allow_failure_retry].to_i
     begin
-      shlout = Mixlib::ShellOut.new(cmd, 
+      shlout = Mixlib::ShellOut.new(cmd,
         :logger => defined?(Chef) ? Chef::Log.logger : log,
         :live_stream => args[:livestream] ? nil : STDOUT,
         :timeout => args[:timeout] || 1200,
@@ -354,6 +362,7 @@ class Lxc
     end
   end
 
+>>>>>>> [ephemeral] lxc.destroy()
   def wait_for_state(desired_state, args={})
     args[:sleep_interval] ||= 1.0
     wait_total = 0.0
@@ -376,7 +385,7 @@ class Lxc
       home
     end
   end
-  
+
   # cmd:: Shell command string
   # retries:: Number of retry attempts (1 second sleep interval)
   # Runs command in container via ssh
@@ -414,3 +423,5 @@ class Lxc
   end
 
 end
+
+Lxc.shellout_helper = :mixlib_shellout

data/lib/elecksee/lxc_file_config.rb

@@ -5,13 +5,37 @@ class Lxc
     attr_reader :base
 
     class << self
+
+      def convert_to_hash(thing)
+        unless(thing.is_a?(Hash))
+          result = defined?(Mash) ? Mash.new : {}
+          thing.each do |k,v|
+            result[k] = v.respond_to?(:keys) && v.respond_to?(:values) ? convert_to_hash(v) : v
+          end
+        end
+        result || thing
+      end
+
+      def symbolize_hash(thing)
+        if(defined?(Mash))
+          Mash.new(thing)
+        else
+          result = {}
+          thing.each do |k,v|
+            result[k.to_sym] = v.is_a?(Hash) ? symbolize_hash(v) : v
+          end
+          result
+        end
+      end
+
       def generate_config(resource)
+        resource = symbolize_hash(convert_to_hash(resource))
         config = []
-        config << "lxc.utsname = #{resource.utsname}"
-        if(resource.aa_profile)
-          config << "lxc.aa_profile = #{resource.aa_profile}"
+        config << "lxc.utsname = #{resource[:utsname]}"
+        if(resource[:aa_profile])
+          config << "lxc.aa_profile = #{resource[:aa_profile]}"
         end
-        [resource.network].flatten.each do |net_hash|
+        [resource.[:network]].flatten.each do |net_hash|
           nhsh = Mash.new(net_hash)
           flags = nhsh.delete(:flags)
           %w(type link).each do |k|
@@ -24,14 +48,14 @@ class Lxc
             config << "lxc.network.flags = #{flags}"
           end
         end
-        if(resource.cap_drop)
-          config << "lxc.cap.drop = #{Array(resource.cap_drop).join(' ')}"
+        if(resource[:cap_drop])
+          config << "lxc.cap.drop = #{Array(resource[:cap_drop]).join(' ')}"
         end
         %w(pts tty arch devttydir mount mount_entry rootfs rootfs_mount pivotdir).each do |k|
-          config << "lxc.#{k.sub('_', '.')} = #{resource.send(k)}" if resource.send(k)
+          config << "lxc.#{k.sub('_', '.')} = #{resource[k.to_sym]}" if resource[k.to_sym]
         end
         prefix = 'lxc.cgroup'
-        resource.cgroup.each_pair do |key, value|
+        resource[:cgroup].each_pair do |key, value|
           if(value.is_a?(Array))
             value.each do |val|
               config << "#{prefix}.#{key} = #{val}"
@@ -49,7 +73,7 @@ class Lxc
       raise 'LXC config file not found' unless File.exists?(path)
       @path = path
       @network = []
-      @base = Mash.new
+      @base = defined?(Mash) ? Mash.new : {}
       parse!
     end
 

data/lib/elecksee/version.rb

@@ -2,5 +2,5 @@ module Elecksee
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.10')
+  VERSION = Version.new('1.0.12')
 end

metadata

@@ -1,48 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.0.10
-  prerelease: 
+  version: 1.0.12
+  prerelease:
 platform: ruby
 authors:
 - Chris Roberts
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 description: LXC helpers
 email: chrisroberts.code@gmail.com
 executables:
@@ -51,47 +55,50 @@ extensions: []
 extra_rdoc_files: []
 files:
 - elecksee.gemspec
+- Gemfile
+- README.md
+- elecksee-1.0.10.gem
+- LICENSE
+- CHANGELOG.md
+- Gemfile.lock
+- lib/elecksee.rb
 - lib/elecksee/clone.rb
 - lib/elecksee/version.rb
 - lib/elecksee/lxc_file_config.rb
+- lib/elecksee/ephemeral.rb
+- lib/elecksee/lxc.rb
 - lib/elecksee/helpers/copies.rb
 - lib/elecksee/helpers/options.rb
 - lib/elecksee/helpers/base.rb
+- lib/elecksee/knife/config.rb
 - lib/elecksee/storage/overlay_mount.rb
 - lib/elecksee/storage/virtual_device.rb
 - lib/elecksee/storage/overlay_directory.rb
-- lib/elecksee/ephemeral.rb
-- lib/elecksee/lxc.rb
-- lib/elecksee.rb
-- Gemfile
-- README.md
-- LICENSE
 - bin/lxc-awesome-ephemeral
-- CHANGELOG.md
-- Gemfile.lock
 homepage: http://github.com/chrisroberts/elecksee
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: LXC helpers
 test_files: []
-has_rdoc: