elecksee 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5338c94533fdfa6461fca82ac7ae057eb78156e8
-  data.tar.gz: 1a456de0c3e90b671e861cb944b4a9573e0b7e80
+  metadata.gz: 21ad5852da8a7cc744f2373114236025f96250fd
+  data.tar.gz: f66e5479b7ca68ea91e64252fba2dd700c5744c6
 SHA512:
-  metadata.gz: d7dd9c7ae904a7c815fbc9fc8c216b64a2daf41c3f7eb651cbe5c3232d3b49ffb9999a3f92997292316f072c6eb077c211361a15b666cddb22ee71af03509126
-  data.tar.gz: f933cd9cad68730ec0dccb2f53bbe78477837bb087edd9d7c642de8a5106d6843e163ae2cbe606da533d4514a1cb456ae2444617a111d7dd6d5f569528390f66
+  metadata.gz: 25db309c2ec9f98d618b374ad4f1025837868f7baf66c3bbe34bfa0c59a939587125929229a3a32317f38e033d994bf848e97e5db3725ba44405e73ba20790d3
+  data.tar.gz: 9284d75a3e4fcb38b4e6023084e886eea5a1e9887515025e800c9d97d4ce433883eb093e3e54914bd9ef8d65b0320ffbf3863728f4ab41c1927f0fd7c69d0b4b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.4
+* Only stop container on cleanup if container is running
+* Add flag for selection of using ssh or attach to run commands
+
 ## v1.1.2
 * Provide direct access to `Rye::Box`
 * Add alternate ephemeral init using bash wrapper for cleanup

data/lib/elecksee/ephemeral.rb

@@ -207,7 +207,7 @@ class Lxc
     #
     # @return [TrueClass, FalseClass]
     def cleanup
-      lxc.stop
+      lxc.stop if lxc.running?
       @ephemeral_overlay.unmount
       @ephemeral_binds.map(&:destroy)
       @ephemeral_device.destroy

data/lib/elecksee/lxc.rb

@@ -53,6 +53,8 @@ class Lxc
     attr_accessor :default_ssh_password
     # @return [String, NilClass] default ssh user
     attr_accessor :default_ssh_user
+    # @return [Symbol] default command method
+    attr_accessor :container_command_via
 
     # @return [String] sudo command
     def sudo
@@ -479,18 +481,25 @@ class Lxc
   # @option args [TrueClass, FalseClass] :raise_on_failure
   # @return [CommandResult]
   def direct_container_command(command, args={})
-    begin
-      result = connection(args).execute command
-      CommandResult.new(result)
-    rescue Rye::Err => e
-      if(args[:raise_on_failure])
-        raise CommandFailed.new(
-          "Command failed: #{command}",
-          CommandResult.new(e)
-        )
-      else
-        false
+    if(args.fetch(:run_as, Lxc.container_command_via).to_sym == :ssh)
+      begin
+        result = connection(args).execute command
+        CommandResult.new(result)
+      rescue Rye::Err => e
+        if(args[:raise_on_failure])
+          raise CommandFailed.new(
+            "Command failed: #{command}",
+            CommandResult.new(e)
+          )
+        else
+          false
+        end
       end
+    else
+      command(
+        "lxc-attach -n #{name} #{command}",
+        args.merge(:sudo => true)
+      )
     end
   end
   alias_method :knife_container, :direct_container_command
@@ -576,5 +585,9 @@ EOS
 
 end
 
-Lxc.default_ssh_key = '/opt/hw-lxc-config/id_rsa'
+Lxc.default_ssh_key = [
+  File.join(Dir.home, '.ssh', 'lxc_container_rsa'),
+  '/opt/hw-lxc-config/id_rsa',
+].detect{|key| File.exists?(key) }
 Lxc.default_ssh_user = 'root'
+Lxc.container_command_via = :ssh

data/lib/elecksee/version.rb

@@ -1,4 +1,4 @@
 module Elecksee
   # Current library version
-  VERSION = Gem::Version.new('1.1.2')
+  VERSION = Gem::Version.new('1.1.4')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -88,4 +88,3 @@ signing_key:
 specification_version: 4
 summary: LXC helpers
 test_files: []
-has_rdoc: