mcrain 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd68563f4ea83a5418e1106ae7e2b3985ad32868
-  data.tar.gz: cb86a43b457ced1368d035f5135a431879bd55b1
+  metadata.gz: 7bd711b63ae1247796cdf3fb78912bf578bda379
+  data.tar.gz: f90930125af42815cc142baba7367e1a5e4c17f4
 SHA512:
-  metadata.gz: caa302081b7135330540a07f646251b42819185b57ca13fe5e12dbeb9baab46da72f0d7a8ad6550200148fbc7c32f2946fefe24112f6a3598753e20eabb9d251
-  data.tar.gz: a08e8f63163bb78283bda59e4c1a8d92b560890a005790dc53dc03ece3aca99a5310d7d578b35f498ed786cd82933b7dbf0b12206f9c298c7d2bfbd2fe87c644
+  metadata.gz: e36b0733ad2234c39c73a96bf11ffb4583e26b32c0ce8a93e8245084f6c81da8f745425437b7e7588ce1e3f2efb9c76f3506ba8435022535971a20f57915f0da
+  data.tar.gz: 6bb92a22b6e45df11ce6c4a10d4d56d98ee049e79df2a2c63249a10f47f768bbdc7ae209f5487f4e058100a832c55a81a9650f02467f2e33b3de14f9a80d87fa

data/lib/mcrain/base.rb

@@ -82,7 +82,7 @@ module Mcrain
       rescue => e
         container.kill!
       end
-      container.remove
+      container.remove unless ENV['MCRAIN_KEEP_CONTAINERS'] =~ /true|yes|on|1/i
     end
 
   end

data/lib/mcrain/boot2docker.rb

@@ -3,8 +3,10 @@ require 'mcrain'
 require 'uri'
 require 'fileutils'
 require 'rbconfig'
+require 'tmpdir'
 
 require 'net/scp'
+require 'net/ssh'
 require 'docker'
 
 module Mcrain
@@ -31,7 +33,7 @@ module Mcrain
     end
 
     def setup_docker_options
-      if RbConfig::CONFIG["host_os"] =~ /darwin/
+      if used?
         require 'docker'
         uri = URI.parse(ENV["DOCKER_HOST"])
         Excon.defaults[:ssl_verify_peer] = false
@@ -69,5 +71,70 @@ module Mcrain
       end
     end
 
+    BOOT2DOCKER_DOCKER_HOME = '/home/docker'.freeze
+
+    # return temporary dire for 2nd argument of Dir.mktmpdir
+    def tmpdir
+      used? ? File.join(BOOT2DOCKER_DOCKER_HOME, 'tmp', Dir.tmpdir) : Dir.tmpdir
+    end
+
+    def ssh_to_vm(&block)
+      host = used? ? URI.parse(ENV["DOCKER_HOST"]).host : "localhost"
+      Mcrain.logger.debug("connection STARTING to #{host} by SSH")
+      r = Net::SSH.start(host, "docker", :password => "tcuser", &block)
+      Mcrain.logger.debug("connection SUCCESS  to #{host} by SSH")
+      return r
+    end
+
+    def mktmpdir(&block)
+      used? ? mktmpdir_ssh(&block) : mktmpdir_local(&block)
+    end
+
+    def mktmpdir_ssh(&block)
+      ssh_to_vm do |ssh|
+        return mktmpdir_remote(ssh, &block)
+      end
+    end
+
+    def mktmpdir_remote(ssh, &block)
+      Dir.mktmpdir do |orig_dir|
+        dir = File.join(BOOT2DOCKER_DOCKER_HOME, 'tmp', orig_dir)
+        cmd1 = "mkdir -p #{dir}"
+        Mcrain.logger.debug(cmd1)
+        ssh.exec! cmd1
+        if block_given?
+          begin
+            yield(dir)
+          ensure
+            begin
+              cmd2 = "rm -rf #{dir}"
+              Mcrain.logger.debug(cmd2)
+              ssh.exec! cmd2
+            rescue => e
+              Mcrain.logger.warn("[#{e.class}] #{e.message}")
+            end
+          end
+        end
+        return dir
+      end
+    end
+
+    def mktmpdir_local(*args)
+      r = Dir.mktmpdir(*args)
+      if block_given?
+        begin
+          yield(r)
+        ensure
+          Mcrain.logger.debug("removing #{r}")
+          begin
+            FileUtils.remove_entry_secure(r, true)
+          rescue => e
+            Mcrain.logger.warn("[#{e.class}] #{e.message}")
+          end
+        end
+      end
+      return r
+    end
+
   end
 end

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - akm