cangallo 0.0.2.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b90c4e1c69b4114fbdc225c7d0af0b7d2ef6fdd
-  data.tar.gz: 0cd1c440f093931313e562a730a8fb51e48e718e
+  metadata.gz: c21b6ff98e9fcbbf383de70f0f06f9863e45a84b
+  data.tar.gz: c383ca0b87759da70f78a982f52b899c3b22e0a8
 SHA512:
-  metadata.gz: df8fbdcdfe22afed9e21af5200615213d58b7c77b93076dc3560f8d6a631afad502f34bbad7d45f48e0d5e2bb9923ed1f1ca98c477bfbe2eb1dc80efbb775abf
-  data.tar.gz: 3d36c90229f184f55bfaf6a0faa6c66e90d8d2e2916adaedb796def36475d2d517302dae72456e61a322c0739bb4c406a9e30b1cc9060404d71d5995e1c62c1e
+  metadata.gz: a58a2b3f477cf582c334b6920a3dc4b22991f901a111fa78818862830f83296e15510b113457fc2502e237fdc30511234fe50478a554ff5f2fe2d6c80c8df87e
+  data.tar.gz: 0c4ad7d347a66d809cf748d76f0392e1db07f92ed49438e0a23b04fb1ab6ae6d3f645b7136e7cd4830bc3cd97abee5f5185f5474bd8af4395ea0d346236c4da9

data/lib/cangallo/libguestfs.rb

@@ -25,6 +25,8 @@ require 'rubygems'
 class Cangallo
 
   class LibGuestfs
+    CUSTOMIZE_CMD = /^([^\s]+)\s+(.*)$/
+
     def self.virt_customize(image, commands, params = "")
       version = self.version
 
@@ -50,14 +52,28 @@ class Cangallo
                             "--commands-from-file #{cmd_file.path}"
       else
         cmd_params = commands.map do |line|
-          m = line.match(/^([^\s]+)\s+(.*)$/)
+          m = line.match(CUSTOMIZE_CMD)
           if m
-            "--" + m[1] + " " + Shellwords.escape(m[2].strip)
+            command = m[1]
+            parms = m[2].strip
+
+            if command == 'copy-in'
+              command = 'upload'
+              parms, new_command = copy_in(parms)
+
+              [
+                "--" + command + " " + Shellwords.escape(parms),
+                "--run-command " + Shellwords.escape(new_command)
+              ]
+            else
+              "--" + command + " " + Shellwords.escape(parms)
+            end
           else
             nil
           end
         end
 
+        cmd_params.flatten!
         cmd_params.compact!
 
         customize_command = "virt-customize -a #{image} #{params.join(" ")} " <<
@@ -88,5 +104,36 @@ class Cangallo
         nil
       end
     end
+
+    def self.copy_in(str)
+      local, remote = str.split(':')
+
+      raise "Source '#{local}' does not exist" if !File.exist?(local)
+
+      upload_local = local
+      upload_remote = remote
+      run_command = nil
+
+      if File.directory?(local)
+        upload_local_tmp = Tempfile.new("canga")
+        upload_local_tmp.close
+
+        upload_local = upload_local_tmp.path
+        upload_remote = "/tmp/#{File.basename(upload_local)}"
+
+
+        local_parent_dir = File.dirname(local)
+        local_name = File.basename(local)
+        rc = system("tar czf #{upload_local} -C #{local_parent_dir} #{local_name}")
+
+        raise "Error creating tar archive for '#{local_name}'" if !rc
+
+        run_command = "tar xf #{upload_remote} -C #{remote}"
+      end
+
+      upload_param = "#{upload_local}:#{upload_remote}"
+
+      return upload_param, run_command
+    end
   end
 end

data/lib/cangallo/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Cangallo
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangallo
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Javier Fontan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -54,7 +54,7 @@ files:
 - lib/cangallo/qcow2.rb
 - lib/cangallo/repo.rb
 - lib/cangallo/version.rb
-homepage: http://canga.io
+homepage: https://canga.io
 licenses:
 - Apache-2.0
 metadata: {}