elecksee 1.0.16 → 1.0.18

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.0.18
+* Use shellwords to properly break down commands
+* Force hash type as required
+* Return expected type on command failure
+* Remove custom `run_command` and use helper based method instead
+
 ## v1.0.16
 * Fix syntax bug in `Lxc::FileConfig` (thanks @mikerowehl)
 

data/lib/elecksee/helpers/base.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class Lxc
   class CommandFailed < StandardError
     attr_accessor :original, :result
@@ -65,7 +67,7 @@ class Lxc
       else
         raise ArgumentError.new("Unknown shellout helper provided: #{cmd_type}")
       end
-      CommandResult.new(result)
+      result == false ? false : CommandResult.new(result)
     end
 
     def child_process_command(cmd, args)
@@ -76,9 +78,7 @@ class Lxc
         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 = ChildProcess.build(*Shellwords.split(cmd))
         c_proc.environment.merge('HOME' => detect_home)
         c_proc.io.stdout = s_out
         c_proc.io.stderr = s_err

data/lib/elecksee/lxc.rb

@@ -333,7 +333,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
@@ -361,7 +361,7 @@ class Lxc
       end
     end
   end
-
+=end
   def wait_for_state(desired_state, args={})
     args[:sleep_interval] ||= 1.0
     wait_total = 0.0

data/lib/elecksee/lxc_file_config.rb

@@ -9,7 +9,7 @@ class Lxc
       def convert_to_hash(thing)
         unless(thing.is_a?(Hash))
           result = defined?(Mash) ? Mash.new : {}
-          thing.each do |k,v|
+          thing.to_hash.each do |k,v|
             result[k] = v.respond_to?(:keys) && v.respond_to?(:values) ? convert_to_hash(v) : v
           end
         end

data/lib/elecksee/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout