itchy 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86f74cac38fa3647f1d1ce4d7f17da7815bc0a4
-  data.tar.gz: 077114a2fe79de9d59713054d3c35ddf51dea59d
+  metadata.gz: fdda0b2aa4e9eb5cc2ea91f70fac7563a84549dd
+  data.tar.gz: a0af4183e2155fc184c60dec6dbbf6bfb845d703
 SHA512:
-  metadata.gz: 5a4f026036966cbdaf0bbc703985edd37ac3aced1bf6796edbefdf87b641922788a3e2a30117794be4ce59868cb48e9c0e0be444698c32e75aec672f3b5da2fb
-  data.tar.gz: d8debf3428818e35bff502852ca50ce4a7123f7d8f90b3727d6dc38934c5734e50cc9fe773c04e491397b70ee15f8379cedf6f4d4de602232fe3b5b61704751d
+  metadata.gz: 7443a124bc70d22664b774c31ebc5e2da9b773b136c0b8a335365478f5813cb27224f152a0272dc1a098a79717cbdb0c99802ec20f4cf370b80176dfc3bd2d07
+  data.tar.gz: c3c4bc6f42d601077ca9f91390ae9ec77e335fa0819f407bb28e969cb345b021d3318958b1fd02871304ced73a833c7394c429abb51be3d75a8414c4f20fd93a

data/bin/itchy

@@ -47,12 +47,25 @@ class ItchyRunnable < Thor
   end
 
   desc 'archive', 'Handle an incoming vmcatcher event and store it for further processing'
-  method_option :metadata_dir, type: :string, default: Itchy::Settings.metadata_dir,
-                               aliases: '-m', desc: 'Path to a metadata directory for storing events, must be writable'
-  method_option :log_to, type: :string, default: Itchy::Settings.log_to.archive_log, aliasses: '-l',
-                                desc: 'Logging output, file path or stderr/stdout'
-  method_option :file_permissions, type: :string, default: Itchy::Settings['permissions']['file'],
-                    aliases: '-p', desc: 'Sets permissions for all created files'
+  
+  method_option :metadata_dir,
+                type: :string,
+                default: Itchy::Settings.metadata_dir,
+                aliases: '-m',
+                desc: 'Path to a metadata directory for storing events, must be writable'
+  
+  method_option :log_to,
+                type: :string,
+                default: Itchy::Settings.log_to.archive_log,
+                aliasses: '-l',
+                desc: 'Logging output, file path or stderr/stdout'
+  
+  method_option :file_permissions,
+                type: :string,
+                default: Itchy::Settings['permissions']['file'],
+                aliases: '-p',
+                desc: 'Sets permissions for all created files'
+  
   method_option *shared_option_log_level
   method_option *shared_option_debug
 
@@ -71,18 +84,56 @@ class ItchyRunnable < Thor
   end
 
   desc 'process', 'Process stored events'
-  method_option :metadata_dir, type: :string, default: Itchy::Settings.metadata_dir,
-                               aliases: '-m', desc: 'Path to a metadata directory for stored events'
-  method_option :required_format, type: :string, default: Itchy::Settings.output_image_format,
-                                  aliases: '-f', desc: 'Required output format of converted images'
-  method_option :output_dir, type: :string, default: Itchy::Settings.output_dir,
-                             aliases: '-o', desc: 'Path to a directory where processed events descriptors will be stored'
-  method_option :descriptor_dir, type: :string, default: Itchy::Settings.descriptor_dir,
-                                 aliases: '-e', desc: 'Path to a directory where appliance descriptors will be stored'
-  method_option :file_permissions, type: :string, default: Itchy::Settings['permissions']['file'],
-                                aliases: '-p', desc: 'Sets permissions for all created files'
-  method_option :log_to, type: :string, default: Itchy::Settings.log_to.process_log, aliases: '-l',
-                                desc: 'Logging output, file path or stderr/stdout'
+  
+  method_option :metadata_dir,
+                type: :string,
+                default: Itchy::Settings.metadata_dir,
+                aliases: '-m',
+                desc: 'Path to a metadata directory for stored events'
+  
+  method_option :required_format,
+                type: :string,
+                default: Itchy::Settings.output_image_format,
+                aliases: '-f',
+                desc: 'Required output format of converted images'
+  
+  method_option :output_dir,
+                type: :string,
+                default: Itchy::Settings.output_dir,
+                aliases: '-o',
+                desc: 'Path to a directory where processed events descriptors will be stored'
+  
+  method_option :temp_image_dir,
+                type: :string,
+                default: Itchy::Settings.temp_image_dir,
+                aliases: '-t',
+                desc: 'Path to a directory where images will be temporary stored while being processed'
+  
+  method_option :descriptor_dir,
+                type: :string,
+                default: Itchy::Settings.descriptor_dir,
+                aliases: '-e',
+                desc: 'Path to a directory where appliance descriptors will be stored'
+  
+  method_option :file_permissions,
+                type: :string,
+                default: Itchy::Settings['permissions']['file'],
+                aliases: '-p',
+                desc: 'Sets permissions for all created files'
+  
+  method_option :log_to,
+                type: :string,
+                default: Itchy::Settings.log_to.process_log,
+                aliases: '-l',
+                desc: 'Logging output, file path or stderr/stdout'
+  
+  
+  method_option :qemu_img_binary,
+                type: :string,
+                default: Itchy::Settings['qemu_img_binary'],
+                aliases: '-q',
+                desc: 'Path to qemu-img command binary, if not used, ITCHY will look for it in PATH'
+
   method_option *shared_option_log_level
   method_option *shared_option_debug
 

data/config/itchy.yml

@@ -3,6 +3,7 @@ defaults: &defaults
   metadata_dir: /var/spool/itchy/metadata
   output_dir: /var/spool/itchy/output
   descriptor_dir: /var/spool/itchy/descriptors
+  temp_image_dir: /var/spool/itchy/temp
   log_to:
     archive_log: /var/log/itchy/archive.log
     process_log: /var/log/itchy/process.log
@@ -11,7 +12,7 @@ defaults: &defaults
   permissions:
     file: '0664'
   output_image_format: qcow2
-  qemu_img_binary: /usr/bin/qemu-img
+  #qemu_img_binary: # When used, ITCHY will use this binary to run qemu-img command (converting images)
 
 ###############################################
 #######  DO NOT EDIT AFTER THIS POINT  ########

data/lib/itchy/format_converter.rb

@@ -1,12 +1,15 @@
 module Itchy
   # Converting different image formats
   class FormatConverter
+
+
     # Creates and converter instance for converting image to requried format
     #
     # @param unpacking_dir [String] path to directory where image is stored
     # @param metadata [VmcatcherEvent] metadata of event corresponding to image
     # @param vmcatcher_configuration [VmcatcherConfiguration] vmcatcher configuration
     def initialize(unpacking_dir, metadata, vmcatcher_configuration)
+      
       unless vmcatcher_configuration.is_a?(Itchy::VmcatcherConfiguration)
         fail ArgumentError, '\'vmcatcher_configuration\' must be an instance of ' \
                             'Itchy::VmcatcherConfiguration!'
@@ -22,14 +25,15 @@ module Itchy
     # @param file_format [String] actual format of the image
     # @param required_format [String] required format
     # @param output_dir [String] path to a directory where converted image should be stored
-    def convert!(file_format, required_format, output_dir)
+    def convert!(file_format, required_format, output_dir, qemu_img_binary)
       Itchy::Log.info "[#{self.class.name}] Converting image " \
                              "#{@metadata.dc_identifier.inspect} from " \
                              "original format: #{file_format} to " \
                              "required format: #{required_format}."
 
       new_file_name = "#{::Time.now.to_i}_#{@metadata.dc_identifier}"
-      convert_cmd = Mixlib::ShellOut.new("qemu-img convert -f #{file_format} -O #{required_format} #{@unpacking_dir}/#{@metadata.dc_identifier} #{output_dir}/#{new_file_name}")
+      qemu_command = qemu_img_binary || Itchy::BASIC_QEMU_COMMAND
+      convert_cmd = Mixlib::ShellOut.new("#{qemu_command} convert -f #{file_format} -O #{required_format} #{@unpacking_dir}/#{@metadata.dc_identifier} #{output_dir}/#{new_file_name}")
       convert_cmd.run_command
       begin
         convert_cmd.error!

data/lib/itchy/image_transformer.rb

@@ -46,7 +46,7 @@ module Itchy
           new_file_name = copy_same_format(unpacking_dir, metadata)
         else
           converter = Itchy::FormatConverter.new(unpacking_dir, metadata, vmcatcher_configuration)
-          new_file_name = converter.convert!(file_format, @options.required_format, @options.output_dir)
+          new_file_name = converter.convert!(file_format, @options.required_format, @options.output_dir, @options.qemu_img_binary)
         end
         remove_dir(unpacking_dir)
       rescue Itchy::Errors::FileInspectError, Itchy::Errors::FormatConversionError,
@@ -64,7 +64,10 @@ module Itchy
     # @param unpacking_dir [String] name and path of the checked file
     # @return [String] image format
     def format(file)
-      image_format_tester = Mixlib::ShellOut.new("qemu-img info #{file}")
+
+      qemu_command = @options.qemu_img_binary || Itchy::BASIC_QEMU_COMMAND
+
+      image_format_tester = Mixlib::ShellOut.new("#{qemu_command} info #{file}")
       image_format_tester.run_command
       begin
         image_format_tester.error!
@@ -119,7 +122,7 @@ module Itchy
       dir = Dir.new directory
       counter = 0
       files = dir['*']
-      files each do |file|
+      files.each do |file|
         file_format = format("#{directory}/#{file}")
         if KNOWN_IMAGE_FORMATS.include? file_format
           counter += 1
@@ -202,7 +205,7 @@ module Itchy
     # @param vmcatcher_configuration [Itchy::VmcatcherConfiguration] current VMC configuration
     # @return [String] path to the newly created image directory
     def prepare_image_temp_dir(metadata, vmcatcher_configuration)
-      temp_dir = "#{vmcatcher_configuration.cache_dir_cache}/temp/#{metadata.dc_identifier}"
+      temp_dir = "#{@options.temp_image_dir}/#{metadata.dc_identifier}"
 
       begin
         ::FileUtils.mkdir_p temp_dir

data/lib/itchy/version.rb

@@ -1,3 +1,3 @@
 module Itchy
-  VERSION = '0.2.5' unless defined?(::Itchy::VERSION)
+  VERSION = '0.2.7' unless defined?(::Itchy::VERSION)
 end

data/lib/itchy.rb

@@ -9,7 +9,9 @@ require 'hashie/mash'
 require 'cloud-appliance-descriptor'
 
 # Wraps all internals of the handler.
-module Itchy; end
+module Itchy
+  BASIC_QEMU_COMMAND = 'qemu-img'
+end
 
 require 'itchy/version'
 require 'itchy/settings'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itchy
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Lubomir Kosaristan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula