cangallo 0.0.1 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5714dca973ec1755fc348bbef4494c7e1da8c41
-  data.tar.gz: 4abacf5c9616cb358befa15117d1682b26236a1b
+  metadata.gz: 9b90c4e1c69b4114fbdc225c7d0af0b7d2ef6fdd
+  data.tar.gz: 0cd1c440f093931313e562a730a8fb51e48e718e
 SHA512:
-  metadata.gz: f817d57b34e4758aa33886d34ca0e9d744385a47c497ca33764ffcf988658f2172085ca2f25c3f778a09e8ee74b74844571b86d65e0b4bc4f7e5c1e17fa3eaf4
-  data.tar.gz: d2877b68c3ed720db1163dcb0c352a0d97fefcff866501d5f54375f223b1b57f02f08b5acafea0f59a907f16f447ac67d6bb623f6aaf427c2d7db62c05031b6a
+  metadata.gz: df8fbdcdfe22afed9e21af5200615213d58b7c77b93076dc3560f8d6a631afad502f34bbad7d45f48e0d5e2bb9923ed1f1ca98c477bfbe2eb1dc80efbb775abf
+  data.tar.gz: 3d36c90229f184f55bfaf6a0faa6c66e90d8d2e2916adaedb796def36475d2d517302dae72456e61a322c0739bb4c406a9e30b1cc9060404d71d5995e1c62c1e

data/lib/cangallo/libguestfs.rb

@@ -19,20 +19,54 @@ require 'json'
 require 'systemu'
 require 'tempfile'
 require 'fileutils'
+require 'shellwords'
+require 'rubygems'
 
 class Cangallo
 
   class LibGuestfs
     def self.virt_customize(image, commands, params = "")
-      cmd_file = Tempfile.new("canga")
+      version = self.version
 
-      cmd_file.puts(commands)
-      cmd_file.close
+      if !version
+        raise "Could not get virt-customize version"
+      end
 
-      #rc = system("virt-customize -v -x -a #{image} --commands-from-file #{cmd_file.path}")
-      rc = system("virt-customize -a #{image} #{params.join(" ")} " <<
-                  "--commands-from-file #{cmd_file.path}")
-      cmd_file.unlink
+      target_version = Gem::Version.new('1.30')
+      current_version = Gem::Version.new(version)
+      good_version = false
+
+      customize_command = nil
+
+      good_version = true if current_version >= target_version
+
+      if good_version
+        cmd_file = Tempfile.new("canga")
+
+        cmd_file.puts(commands)
+        cmd_file.close
+
+        customize_command = "virt-customize -a #{image} #{params.join(" ")} " <<
+                            "--commands-from-file #{cmd_file.path}"
+      else
+        cmd_params = commands.map do |line|
+          m = line.match(/^([^\s]+)\s+(.*)$/)
+          if m
+            "--" + m[1] + " " + Shellwords.escape(m[2].strip)
+          else
+            nil
+          end
+        end
+
+        cmd_params.compact!
+
+        customize_command = "virt-customize -a #{image} #{params.join(" ")} " <<
+                            "#{cmd_params.join(" ")}"
+      end
+
+      rc = system(customize_command)
+
+      cmd_file.unlink if good_version
 
       return rc
     end
@@ -42,5 +76,17 @@ class Cangallo
 
       return rc
     end
+
+    def self.version
+      str = `virt-customize --version`
+
+      m = str.match(/^virt-customize (.*)$/)
+
+      if m
+        m[1]
+      else
+        nil
+      end
+    end
   end
 end

data/lib/cangallo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangallo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Javier Fontan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor