elecksee 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d89dd64aa0c3a0ef232692735c75c415d0a994
-  data.tar.gz: 9b769a6d71ff3efa3320004e31f7bc18453ae66b
+  metadata.gz: 5338c94533fdfa6461fca82ac7ae057eb78156e8
+  data.tar.gz: 1a456de0c3e90b671e861cb944b4a9573e0b7e80
 SHA512:
-  metadata.gz: 0eb4a7dc26256da9e8ea791721391cfb89fe0edd041831a798654e6385ea71290070f8a18f8b6ca442cf025ebfba758375d61293a10f49dc5e69e4a3a841e896
-  data.tar.gz: e22ebacc0cabf3108d3ab04365b01c683caf36162155530cf2bfeddcb12a190ff4e2e32b63bf788e767ef6bb8df24c5438385bb11f1193febe881ccbcebc5191
+  metadata.gz: d7dd9c7ae904a7c815fbc9fc8c216b64a2daf41c3f7eb651cbe5c3232d3b49ffb9999a3f92997292316f072c6eb077c211361a15b666cddb22ee71af03509126
+  data.tar.gz: f933cd9cad68730ec0dccb2f53bbe78477837bb087edd9d7c642de8a5106d6843e163ae2cbe606da533d4514a1cb456ae2444617a111d7dd6d5f569528390f66

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.2
+* Provide direct access to `Rye::Box`
+* Add alternate ephemeral init using bash wrapper for cleanup
+
 ## v1.1.0
 * Update all documentation to yardoc
 * Group classes into logical namespaces

data/lib/elecksee/ephemeral.rb

@@ -2,6 +2,7 @@ require 'elecksee'
 require 'securerandom'
 require 'fileutils'
 require 'tmpdir'
+require 'tempfile'
 require 'etc'
 
 class Lxc
@@ -117,23 +118,91 @@ class Lxc
     # @return [TrueClass]
     # @note use :fork to fork startup
     def start!(*args)
-      register_traps
       setup
       if(daemon)
         if(args.include?(:fork))
+          register_traps
           fork do
             start_action
           end
+        elsif(args.include?(:detach))
+          cmd = [sudo, shell_wrapper.path].compact.map(&:strip)
+          process = ChildProcess.build(*cmd)
+          process.detach = true
+          process.start
+          shell_wrapper.delete
         else
+          register_traps
           Process.daemon
           start_action
         end
       else
+        register_traps
         start_action
       end
       true
     end
 
+    # Bash based wrapper script to start ephemeral and clean up
+    # ephemeral resources on exit
+    #
+    # @return [Tempfile] wrapper script
+    def shell_wrapper
+      content = ['#!/bin/bash']
+      content << 'scrub()' << '{'
+      content << "umount #{ephemeral_overlay.target}"
+      ephemeral_binds.map do |bind|
+        unless(bind.device_path == :none)
+          if(File.file?(bind.device_path))
+            content << "rm #{bind.device_path}"
+          elsif(File.directory?(bind.device_path))
+            content << "rm -rf #{bind.device_path}"
+          end
+        end
+        unless(bind.mount_path == :none)
+          if(File.directory?(bind.mount_path))
+            content << "rmdir #{bind.mount_path}"
+          end
+        end
+      end
+      case ephemeral_device
+      when Storage::OverlayDirectory
+        if(File.directory?(ephemeral_device.overlay_path))
+          content << "rm -rf #{ephemeral_device.overlay_path}"
+        end
+      when Storage::VirtualDevice
+        if(ephemeral_device.mounted?)
+          content << "umount #{ephemeral_device.mount_path}"
+        end
+        unless(ephemeral_device.device_path == :none)
+          if(File.file?(ephemeral_device.device_path))
+            content << "rm #{ephemeral_device.device_path}"
+          elsif(File.directory?(ephemeral_device.device_path))
+            content << "rm -rf #{ephemeral_device.device_path}"
+          end
+        end
+        unless(ephemeral_device.mount_path == :none)
+          if(File.directory?(ephemeral_device.mount_path))
+            content << "rmdir #{ephemeral_device.mount_path}"
+          end
+        end
+      end
+      if(lxc.path.to_path.split('/').size > 1)
+        content << "rm -rf #{lxc.path.to_path}"
+      end
+      content << '}'
+      content << 'trap scrub SIGTERM SIGINT SIGQUIT'
+      content << "lxc-start -n #{lxc.name} -d"
+      content << 'sleep 1'
+      content << "lxc-wait -n #{lxc.name} -s STOPPED"
+      content << 'scrub'
+      tmp = Tempfile.new('elecksee')
+      tmp.chmod(0700)
+      tmp.puts content.join("\n")
+      tmp.close
+      tmp
+    end
+
     # Stop container and cleanup ephemeral items
     #
     # @return [TrueClass, FalseClass]

data/lib/elecksee/lxc.rb

@@ -456,6 +456,20 @@ class Lxc
     end
   end
 
+  # Provide connection to running container
+  #
+  # @return [Rye::Box]
+  def connection(args={})
+    Rye::Box.new(args.fetch(:ip, container_ip(3)),
+      :user => ssh_user,
+      :password => ssh_password,
+      :password_prompt => false,
+      :keys => [ssh_key],
+      :safe => false,
+      :paranoid => false
+    )
+  end
+
   # Execute command within running container
   #
   # @param command [String]
@@ -466,16 +480,7 @@ class Lxc
   # @return [CommandResult]
   def direct_container_command(command, args={})
     begin
-      box = Rye::Box.new(
-        args.fetch(:ip, container_ip(3)),
-        :user => ssh_user,
-        :password => ssh_password,
-        :password_prompt => false,
-        :keys => [ssh_key],
-        :safe => false,
-        :paranoid => false
-      )
-      result = box.execute command
+      result = connection(args).execute command
       CommandResult.new(result)
     rescue Rye::Err => e
       if(args[:raise_on_failure])
@@ -571,7 +576,5 @@ EOS
 
 end
 
-# Make default settings
-Lxc.shellout_helper = :mixlib_shellout
 Lxc.default_ssh_key = '/opt/hw-lxc-config/id_rsa'
 Lxc.default_ssh_user = 'root'

data/lib/elecksee/version.rb

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

data/lib/elecksee.rb

@@ -12,3 +12,6 @@ class Lxc
 end
 
 require 'elecksee/lxc'
+require 'childprocess'
+
+ChildProcess.posix_spawn = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess