elecksee 1.0.20 → 1.0.22

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.22
+* Update underlying implementation for execute
+* Provide better info interpretation
+* Scrub bundler environment variables if found
+
 ## v1.0.20
 * Fix `LxcFileConfig` population when using `Chef::Resource` instance
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elecksee (1.0.11)
+    elecksee (1.0.21)
       mixlib-shellout
       net-ssh
 
@@ -11,7 +11,7 @@ GEM
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     ffi (1.9.3)
-    mixlib-shellout (1.2.0)
+    mixlib-shellout (1.3.0)
     net-ssh (2.7.0)
 
 PLATFORMS

data/lib/elecksee/helpers/base.rb

@@ -49,6 +49,7 @@ class Lxc
 
     # Simple helper to shell out
     def run_command(cmd, args={})
+      result = nil
       cmd_type = Lxc.shellout_helper
       unless(cmd_type)
         if(defined?(ChildProcess))
@@ -57,16 +58,18 @@ class Lxc
           cmd_type = :mixlib_shellout
         end
       end
+      com_block = nil
       case cmd_type
       when :childprocess
         require 'tempfile'
-        result = child_process_command(cmd, args)
+        com_block = lambda{ child_process_command(cmd, args) }
       when :mixlib_shellout
         require 'mixlib/shellout'
-        result = mixlib_shellout_command(cmd, args)
+        com_block = lambda{ mixlib_shellout_command(cmd, args) }
       else
         raise ArgumentError.new("Unknown shellout helper provided: #{cmd_type}")
       end
+      result = defined?(Bundler) ? Bundler.with_clean_env{ com_block.call } : com_block.call
       result == false ? false : CommandResult.new(result)
     end
 

data/lib/elecksee/lxc.rb

@@ -1,4 +1,6 @@
 require 'elecksee/helpers/base'
+require 'securerandom'
+require 'shellwords'
 require 'pathname'
 require 'tmpdir'
 
@@ -71,18 +73,23 @@ class Lxc
     # name:: Name of container
     # Returns information about given container
     def info(name)
-      res = {:state => nil, :pid => nil}
-      info = run_command("#{sudo}lxc-info -n #{name}", :allow_failure_retry => 3).stdout.split("\n")
-      if(info.first)
-        parts = info.first.split(' ')
-        res[:state] = parts.last.downcase.to_sym
-        parts = info.last.split(' ')
-        res[:pid] = parts.last.to_i
-        res
+      info = run_command("#{sudo}lxc-info -n #{name}", :allow_failure_retry => 3, :allow_failure => true)
+      if(info)
+        Hash[
+          info.stdout.split("\n").map do |string|
+            string.split(': ').map(&:strip)
+          end.map do |key, value|
+            key = key.tr(' ', '_').downcase.to_sym
+            if(key == :state)
+              value = value.downcase.to_sym
+            elsif(value.to_i.to_s == value)
+              value = value.to_i
+            end
+            [key, value]
+          end
+        ]
       else
-        res[:state] = :unknown
-        res[:pid] = -1
-        res
+        Hash[:state, :unknown, :pid, -1]
       end
     end
 
@@ -270,34 +277,34 @@ class Lxc
   # Start the container
   def start(*args)
     if(args.include?(:no_daemon))
-      run_command("#{sudo}lxc-start -n #{name}")
+      run_command("lxc-start -n #{name}", :sudo => true)
     else
-      run_command("#{sudo}lxc-start -n #{name} -d")
+      run_command("lxc-start -n #{name} -d", :sudo => true)
       wait_for_state(:running)
     end
   end
 
   # Stop the container
   def stop
-    run_command("#{sudo}lxc-stop -n #{name}", :allow_failure_retry => 3)
+    run_command("lxc-stop -n #{name}", :allow_failure_retry => 3, :sudo => true)
     wait_for_state(:stopped)
   end
 
   # Freeze the container
   def freeze
-    run_command("#{sudo}lxc-freeze -n #{name}")
+    run_command("lxc-freeze -n #{name}", :sudo => true)
     wait_for_state(:frozen)
   end
 
   # Unfreeze the container
   def unfreeze
-    run_command("#{sudo}lxc-unfreeze -n #{name}")
+    run_command("lxc-unfreeze -n #{name}", :sudo => true)
     wait_for_state(:running)
   end
 
   # Shutdown the container
   def shutdown
-    run_command("#{sudo}lxc-shutdown -n #{name}")
+    run_command("lxc-shutdown -n #{name}", :sudo => true)
     wait_for_state(:stopped, :timeout => 120)
     # This block is for fedora/centos/anyone else that does not like lxc-shutdown
     if(running?)
@@ -315,7 +322,29 @@ class Lxc
     unless stopped?
       stop
     end
-    run_command("#{sudo}lxc-destroy -n #{name}")
+    run_command("lxc-destroy -n #{name}", :sudo => true)
+  end
+
+  # command:: command string
+  # opts:: option hash (:networking)
+  # Execute command string within container
+  def execute(command, opts={})
+    if(stopped?)
+      cmd = Shellwords.split(command)
+      result = nil
+      begin
+        tmp_execute_script(command, opts) do |script_path|
+          result = run_command("lxc-execute -n #{name} -- #{script_path}", :sudo => true)
+        end
+      rescue => e
+        if(e.result.stderr.downcase.include?('failed to find an lxc-init'))
+          $stderr.puts "ERROR: Missing `lxc-init` installation on container (#{name}). Install lxc-init on container before using `#execute`!"
+        end
+        raise
+      end
+    else
+      raise "Cannot execute against running container (#{name})"
+    end
   end
 
   def direct_container_command(command, args={})
@@ -333,35 +362,7 @@ class Lxc
     end
   end
   alias_method :knife_container, :direct_container_command
-=begin
-  # Simple helper to shell out
-  def run_command(cmd, args={})
-    retries = args[:allow_failure_retry].to_i
-    begin
-      shlout = Mixlib::ShellOut.new(cmd,
-        :logger => defined?(Chef) ? Chef::Log.logger : log,
-        :live_stream => args[:livestream] ? nil : STDOUT,
-        :timeout => args[:timeout] || 1200,
-        :environment => {'HOME' => detect_home}
-      )
-      shlout.run_command
-      shlout.error!
-      shlout
-    rescue Mixlib::ShellOut::ShellCommandFailed, CommandFailed, Mixlib::ShellOut::CommandTimeout
-      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])
-        true
-      else
-        raise
-      end
-    end
-  end
-=end
+
   def wait_for_state(desired_state, args={})
     args[:sleep_interval] ||= 1.0
     wait_total = 0.0
@@ -371,6 +372,34 @@ class Lxc
     end
   end
 
+  # command:: command string
+  # Write command to temporary script with networking support wrap
+  def tmp_execute_script(command, opts)
+    script_path = "tmp/#{SecureRandom.uuid}"
+    File.open(rootfs.join(script_path), 'w') do |file|
+      file.puts '#!/bin/sh'
+      unless(opts[:networking] == false)
+        file.write <<-EOS
+/etc/network/if-pre-up.d/bridge > /dev/null 2>&1
+ifdown eth0 > /dev/null 2>&1
+ifup eth0 > /dev/null 2>&1
+EOS
+      end
+      file.puts command
+      file.puts "RESULT=$?"
+      unless(opts[:networking] == false)
+        file.puts "ifdown eth0 > /dev/null 2>&1"
+      end
+      file.puts "exit $RESULT"
+    end
+    FileUtils.chmod(0755, rootfs.join(script_path))
+    begin
+      yield "/#{script_path}"
+    ensure
+      FileUtils.rm(rootfs.join(script_path))
+    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/storage/virtual_device.rb

@@ -1,17 +1,17 @@
 require 'elecksee/helpers/base'
 
 class Lxc
-  
+
   class VirtualDevice
 
     include Helpers
-    
+
     attr_reader :name
     attr_reader :tmp_dir
     attr_reader :size
     attr_reader :tmp_fs
     attr_reader :fs_type
-    
+
     def initialize(name, args={})
       @name = name
       @tmp_dir = args[:tmp_dir] || '/tmp/lxc/ephemerals'
@@ -23,7 +23,7 @@ class Lxc
     end
 
     def device_path
-      tmp_fs ? 'none' : File.join(tmp_dir, 'virt-imgs', name)
+      tmp_fs ? :none : File.join(tmp_dir, 'virt-imgs', name)
     end
 
     def mount_path
@@ -42,7 +42,7 @@ class Lxc
     def mounted?
       command("mount").stdout.include?(mount_path)
     end
-    
+
     def mount
       unless(mounted?)
         command("mount -t #{fs_type}#{mount_options} #{device_path} #{mount_path}", :sudo => true)
@@ -59,9 +59,11 @@ class Lxc
 
     def destroy
       unmount
-      File.delete(device_path) if File.file?(device_path)
-      FileUtils.rm_rf(device_path) if File.directory?(device_path)
-      FileUtils.rmdir(mount_path) if File.directory?(mount_path)
+      unless(device_path == :none)
+        File.delete(device_path) if File.file?(device_path)
+        FileUtils.rm_rf(device_path) if File.directory?(device_path)
+      end
+      FileUtils.rmdir(mount_path) if File.directory?(mount_path) unless mount_path == :none
     end
 
     private
@@ -69,9 +71,10 @@ class Lxc
     def mount_options
       ' -o loop' unless tmp_fs
     end
-    
+
     def make_directories!
       [device_path, mount_path].each do |path|
+        next if path == :none
         unless(File.directory?(path))
           FileUtils.mkdir_p(path)
         end

data/lib/elecksee/version.rb

@@ -1,6 +1,3 @@
 module Elecksee
-  class Version < Gem::Version
-  end
-
-  VERSION = Version.new('1.0.20')
+  VERSION = Gem::Version.new('1.0.22')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout