mcrain 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25014588e4b0a4b53163edc9897c7d28c728bba7
-  data.tar.gz: e2c8625531480453ffd5a2c06472657523bf1fe1
+  metadata.gz: b5629c435f26df6400e933c493df85b13e5a09bd
+  data.tar.gz: 3d63157ba342d42c2021963af422061e072127b4
 SHA512:
-  metadata.gz: ff1342b68ede623290b779dd96c37682b2d53ac6630122a99c379304105a5fbdbad3f49bde301ee7ca5d3bd55bf1f30c218fb32d3ecace0cb074296d2705b72f
-  data.tar.gz: 77c4fa278139c172f6fbe30f89a37af6d2feb32b6cedd40368cf270ba0c021f3969b45ee8c38b0b9e7841733e60685204038285c2150b310e2cd3389e01c3f1b
+  metadata.gz: 39cfe426a5b1a9b22960e504d1459982c0212d5750250d97d3567ebf11d91785e4ff79b6ab4be37c277ac9150f8670a3fefd73a2d8a632a32c38e37ce483f550
+  data.tar.gz: c6ae5b7cd0e03408ad61f8300a1aafdbd27406e18b00b0e46d5e203b7fdf06411f24d081f5ca81b3312c3f0fce0503c42b5e6835d08281f97d0c1ba092cc7bab

data/lib/mcrain/boot2docker.rb

@@ -64,13 +64,17 @@ module Mcrain
     def download_files_from_vm(host, files)
       return if files.values.all?{|f| File.readable?(f)}
       files.values.each{|f| FileUtils.mkdir_p(File.dirname(f))}
-      Net::SCP.start(host, "docker", :password => "tcuser") do |scp|
+      scp_connect(host) do |scp|
         files.each do |src, dest|
           scp.download(src, dest)
         end
       end
     end
 
+    def scp_connect(host, &block)
+      Net::SCP.start(host, "docker", :password => "tcuser", &block)
+    end
+
     BOOT2DOCKER_DOCKER_HOME = '/home/docker'.freeze
 
     # return temporary dire for 2nd argument of Dir.mktmpdir
@@ -136,5 +140,30 @@ module Mcrain
       return r
     end
 
+    def cp_r(src, dest)
+      used? ? cp_r_remote(src, dest) : cp_r_local(src, dest)
+    end
+
+    def cp_r_remote(src, dest)
+      Dir.mktmpdir("for_tarball") do |dir|
+        tarball_name = "#{File.basename(src)}.tar.gz"
+        FileUtils.chdir(dir) do
+          FileUtils.cp_r(src, ".")
+          unless system("tar zcf #{tarball_name} #{File.basename(src)}")
+            raise "failed to create tarball of #{src} to #{dir}"
+          end
+        end
+        host = URI.parse(ENV["DOCKER_HOST"]).host
+        scp_connect(host) do |scp|
+          scp.upload!(File.join(dir, tarball_name), dest)
+          scp.session.exec!("cd #{dest} && tar zxf #{tarball_name}")
+        end
+      end
+    end
+
+    def cp_r_local(src, dest)
+      FileUtils.cp_r(src, dest)
+    end
+
   end
 end

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe