itchy 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5cddf33b94091a5668066bfd1c185ffd25e287
-  data.tar.gz: 18c28ce3ee803506b115d361933df4b0ee76597a
+  metadata.gz: 33732680739a9df7269d7b6da2617791ad106fe8
+  data.tar.gz: b3ec978d0f1bd1dd036474cffe4fa91d0c90782f
 SHA512:
-  metadata.gz: 12590cb87e2e4ee7332081a536f1d7b693147411727045cc32777fdf7027e5dfba70c390cbf300444b10068a0a967beb84eec98e94ede083f50138ed8c9c44c0
-  data.tar.gz: 60e737dae10ad1a2b38aae0ada2dacc1a3b810070f172015eff4f7bc2723869d209845942a58c5871ddc87e7aea704b64da4ba505e7d718b3ed4f81ae4ef2267
+  metadata.gz: 8dcacca6d9448fbde79357291c2d58fa01f31ff00e9ac5745110ae8bd9bc62795838a9eb60b06c66bccffaa7f6acd22205c13e0abbc52681a27a13a8e24ba9f8
+  data.tar.gz: 95ff929be64811219debf0676cbf9fb39977c2d77a5b6f871bd831fa6b5b4be1da233d990c9a8d6b648abe2fd9a350b5f2162b371f5fed489306fe1f1548258b

data/bin/itchy

@@ -31,6 +31,7 @@ class ItchyRunnable < Thor
 
   AVAILABLE_LOG_LEVELS   = %w(debug info warn error fatal unknown).freeze
   AVAILABLE_AUTH_METHODS = %w(none basic).freeze
+  ERROR_EXIT_CODE = 1
 
   shared_option_log_to = [:log_to, { type: :string, default: Itchy::Settings.log_to,
                                      aliases: '-l', desc: 'Logging output, file path or stderr/stdout' }]
@@ -91,8 +92,12 @@ class ItchyRunnable < Thor
 
     Itchy::Log.info "[#{self.class.name}] Processing started"
     Itchy::Log.debug "[#{self.class.name}] With options: #{opts.inspect}"
+    begin
+      Itchy::EventProcesser.new(Itchy::VmcatcherConfiguration.new(ENV), opts).process!
+    rescue RuntimeError
+      exit ERROR_EXIT_CODE
+    end
 
-    Itchy::EventProcesser.new(Itchy::VmcatcherConfiguration.new(ENV), opts).process!
   end
 
   private
@@ -137,6 +142,12 @@ class ItchyRunnable < Thor
     logger.level = opts.log_level
     logger
   end
+
+  # Overrides thors method for exiting
+  def exit_on_failure?
+    true
+  end
+
 end
 
 ItchyRunnable.start

data/config/itchy.yml

@@ -3,7 +3,7 @@ defaults: &defaults
   metadata_dir: /var/spool/onevmcatcher
   template_dir:
   output_dir:
-  descriptor_dir: /tmp/vmcatcher/descriptors
+  descriptor_dir: /vmcatcher/descriptors
   log_to: stderr
   log_level: error
   ca_path: /etc/grid-security/certificates

data/lib/itchy/errors/event_handle_error.rb

@@ -0,0 +1,4 @@
+module Itchy::Errors
+  # Covers errors related to specific event handling.
+  class EventHandleError < Itchy::Errors::EventProcessingError; end
+end

data/lib/itchy/errors/{file_inspecting_error.rb → file_inspect_error.rb}

@@ -1,4 +1,4 @@
 module Itchy::Errors
   # Covers errors with shellout inspecting files and archives
-  class FileInspectingError < Itchy::Errors::ImageTransformingErrors; end
+  class FileInspectError < Itchy::Errors::ImageTransformationError; end
 end

data/lib/itchy/errors/{format_converting_error.rb → format_conversion_error.rb}

@@ -1,4 +1,4 @@
 module Itchy::Errors
   # Covers errors related to image format converting.
-  class FormatConvertingError < Itchy::Errors::ImageTransformingError; end
+  class FormatConversionError < Itchy::Errors::ImageTransformationError; end
 end

data/lib/itchy/errors/{image_transforming_error.rb → image_transformation_error.rb}

@@ -1,4 +1,4 @@
 module Itchy::Errors
   # Covers errors during transforming images (converting. copying..)
-  class ImageTransformingError < Itchy::Errors::EventProcessingError; end
+  class ImageTransformationError < Itchy::Errors::EventProcessingError; end
 end

data/lib/itchy/errors/{working_with_files_error.rb → prepare_env_error.rb}

@@ -1,4 +1,4 @@
 module Itchy::Errors
   #Covers errors with unpacking, copying, creating dirs.
-  class WorkingWithFilesError < Itchy::Errors::ImageTransformingError; end
+  class PrepareEnvError < Itchy::Errors::ImageTransformationError; end
 end

data/lib/itchy/errors.rb

@@ -1,5 +1,7 @@
 # Wrapper for all available errors.
 module Itchy::Errors; end
 
+require File.join(File.dirname(__FILE__), 'errors', 'event_processing_error')
+require File.join(File.dirname(__FILE__), 'errors', 'image_transformation_error')
 # Load all available errors
 Dir.glob(File.join(File.dirname(__FILE__), 'errors', '*.rb')) { |error_file| require error_file.chomp('.rb') }

data/lib/itchy/event_handlers/available_postfix_event_handler.rb

@@ -9,9 +9,15 @@ module Itchy::EventHandlers
       super
       Itchy::Log.info "[#{self.class.name}] Handling updated image " \
                              "for #{vmcatcher_event.dc_identifier.inspect}"
-      save_descriptor(create_descriptor(vmcatcher_event), event_name)
-      image_transformer_instance = Itchy::ImageTransformer.new(@options)
-      image_transformer_instance.transform!(vmcatcher_event, vmcatcher_configuration)
+      begin
+        image_transformer_instance = Itchy::ImageTransformer.new(@options)
+        new_file_name = image_transformer_instance.transform!(vmcatcher_event, vmcatcher_configuration)
+        save_descriptor(create_descriptor(vmcatcher_event, new_file_name), event_name)
+      rescue Itchy::Errors::PrepareEnvError, ArgumentError, Itchy::Errors::ImageTransformationError  => ex
+        Itchy::Log.error "[#{self.class.name}] Problem with handling event #{event_name}" \
+          "Event handling failed with #{ex.message}"
+        fail Itchy::Errors::EventHandleError, ex
+      end
     end
 
     private
@@ -20,12 +26,12 @@ module Itchy::EventHandlers
     #
     # @param metadata [Itchy::VmcatcherEvent] vmcatcher event to get metadata from
     # @return [String] json form of created descriptor
-    def create_descriptor(metadata)
+    def create_descriptor(metadata, file_name)
       os = ::Cloud::Appliance::Descriptor::Os.new(distribution: metadata.sl_osversion,
                                                   version: metadata.sl_osversion)
       disk = ::Cloud::Appliance::Descriptor::Disk.new(type: :os,
                                                       format: @options.required_format,
-                                                      path: "#{@options.output_dir}/#{metadata.dc_identifier}")
+                                                      path: "#{@options.output_dir}/#{file_name}")
 
       appliance = ::Cloud::Appliance::Descriptor::Appliance.new action: :registration
       appliance.title = metadata.dc_title

data/lib/itchy/event_handlers/base_event_handler.rb

@@ -57,17 +57,18 @@ module Itchy::EventHandlers
             end
     end
 
-    # Save created descriptor to descriptor directory. Every descriptor
-    # is stored in its own directory.
+    # Save created descriptor to descriptor directory.
     #
     # @param descriptor [String] json form of appliance descriptor
     # @param name [String] name of appliance descriptor (event name)
     def save_descriptor(descriptor, name)
-      name.slice! @options.metadata_dir
-      dir_name = name
-      dir_name.slice! '.json'
-      ::FileUtils.mkdir_p "#{@options.descriptor_dir}/#{dir_name}"
-      File.open("#{@options.descriptor_dir}#{dir_name}/#{name}.json", 'w') { |f| f.write(descriptor) }
+      begin
+        File.open("#{@options.descriptor_dir}/#{File.basename(name)}", 'w') { |f| f.write(descriptor) }
+      rescue SystemCallError => ex
+        Itchy::Log.fatal "[#{self.class.name}] Failed to save a descriptor #{File.basename(name)}. " \
+          "Attempt failed with error #{ex.message}"
+          fail Itchy::Errors::PrepareEnvError, ex
+      end
     end
 
     protected

data/lib/itchy/event_handlers/expire_postfix_event_handler.rb

@@ -9,7 +9,13 @@ module Itchy::EventHandlers
       super
       Itchy::Log.info "[#{self.class.name}] Handling expired image " \
                              "for #{vmcatcher_event.dc_identifier.inspect}"
-      save_descriptor(create_descriptor(vmcatcher_event), event_name)
+      begin
+        save_descriptor(create_descriptor(vmcatcher_event), event_name)
+      rescue Itchy::Errors::PrepareEnvError => ex
+        Itchy::Log.error "[#{self.cass.name}] Problem with handling event #{event_name}" \
+          "Event handling failed with #{ex.message}"
+        fail Itchy::Errors::EventHandleError, ex
+      end
     end
 
     private

data/lib/itchy/event_processer.rb

@@ -23,20 +23,19 @@ module Itchy
 
       archived_events do |event, event_file|
         begin
-          
           begin
             event_handler = Itchy::EventHandlers.const_get("#{event.type}EventHandler")
             event_handler = event_handler.new(vmc_configuration, options)
             event_handler.handle!(event, event_file)
-          rescue => ex
-            Itchy::Log.error "[#{self.class.name}] Due to error #{ex.message} event #{event_file}" \
-              "was not processed!!! Continuing with next stored event."
-            next
+          rescue Itchy::Errors::EventHandleError => ex
+            Itchy::Log.error "[#{self.class.name}] Due to error '#{ex.message}' event '#{event_file}'" \
+              " was not processed!!! Aborting."
+              fail RuntimeError, "Unprocessed event"
           end
 
           begin
             clean_event!(event, event_file)
-          rescue => ex
+          rescue SystemCallError => ex
             Itchy::Log.error "[#{self.class.name}] Event #{event_file} was processed, but not cleaned!!!"
           end
 
@@ -72,7 +71,7 @@ module Itchy
     def read_event(json)
       Itchy::VmcatcherEvent.new(::File.read(json))
     rescue => ex
-      Itchy::Log.error '[]Failed to load event!!!'
+      Itchy::Log.error 'Failed to load event!!!'
       return ex
     end
 
@@ -82,11 +81,12 @@ module Itchy
     # @param event_file [String] path to file containing event info
     def clean_event!(_event, event_file)
       Itchy::Log.info "[#{self.class.name}] Cleaning up"
+      Itchy::Log.debug "[#{self.class.name}] Deleting file #{event_file}"
 
       begin
         ::FileUtils.rm_f event_file
-      rescue => ex
-        Itchy::Log.fatal 'Failed to clean up event!!!'
+      rescue SystemCallError => ex
+        Itchy::Log.error 'Failed to clean up event!!!'
         return ex
       end
     end

data/lib/itchy/format_converter.rb

@@ -28,7 +28,8 @@ module Itchy
                              "original format: #{file_format} to " \
                              "required format: #{required_format}."
 
-      convert_cmd = Mixlib::ShellOut.new("qemu-img convert -f #{file_format} -O #{required_format} #{@unpacking_dir}/#{@metadata.dc_identifier} #{output_dir}/#{@metadata.dc_identifier}")
+      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}")
       convert_cmd.run_command
       begin
         convert_cmd.error!
@@ -36,8 +37,9 @@ module Itchy
              Mixlib::Shellout::InvalidCommandOption => ex
         Itchy::Log.fatal "[#{self.class.name}] Converting of image failed with " \
           "error messages #{convert_cmd.stderr}."
-        fail Itchy::Errors::FormatConvertingError, ex
+        fail Itchy::Errors::FormatConversionError, ex
       end
+      new_file_name
     end
   end
 end

data/lib/itchy/image_transformer.rb

@@ -43,15 +43,16 @@ module Itchy
           unpacking_dir = copy_unpacked!(metadata, vmcatcher_configuration)
         end
         if file_format == @options.required_format
-          copy_same_format(unpacking_dir, metadata)
+          new_file_name = copy_same_format(unpacking_dir, metadata)
         else
           converter = Itchy::FormatConverter.new(unpacking_dir, metadata, vmcatcher_configuration)
-          converter.convert!(file_format, @options.required_format, @options.output_dir)
+          new_file_name = converter.convert!(file_format, @options.required_format, @options.output_dir)
         end
-      rescue Itchy::Errors::FileInspectingError, Itchy::Errors::FormatConvertingError,
-             Itchy::Errors::WorkingWithFilesError => ex
-        fail Itchy::Errors::ImageTransformingError, ex
+      rescue Itchy::Errors::FileInspectError, Itchy::Errors::FormatConversionError,
+             Itchy::Errors::PrepareEnvError => ex
+        fail Itchy::Errors::ImageTransformationError, ex
       end
+      new_file_name
     end
 
     private
@@ -66,15 +67,16 @@ module Itchy
       image_format_tester.run_command
       begin
         image_format_tester.error!
-      rescue => ex
+      rescue Mixlib::ShellOut::ShellCommandFailed, Mixlib::ShellOut::CommandTimeout,
+             Mixlib::ShellOut::InvalidCommandOption => ex
         Itchy::Log.error "[#{self.class.name}] Checking file format for" \
                                 "#{file} failed!"
-        fail Itchy::Errors::FileInspectingError, ex
+        fail Itchy::Errors::FileInspectError, ex
       end
       file_format = image_format_tester.stdout.scan(FORMAT_PATTERN)[0].flatten.first
       unless KNOWN_IMAGE_FORMATS.include? file_format
         Itchy::Log.error "Image format #{file_format} is unknown and not supported!"
-        fail Itchy::Errors::FileInspectingError
+        fail Itchy::Errors::FileInspectError
       end
       file_format
     end
@@ -96,9 +98,10 @@ module Itchy
       tar_cmd.run_command
       begin
         tar_cmd.error!
-      rescue => ex
+      rescue Mixlib::ShellOut::ShellCommandFailed, Mixlib::ShellOut::CommandTimeout,
+             Mixlib::ShellOut::InvalidCommandOption => ex
         Itchy::Log.error "Unpacking of archive failed with #{tar_cmd.stderr}"
-        fail Itchy::Errors::WorkingWithFilesError, ex
+        fail Itchy::Errors::PrepareEnvError, ex
       end
 
       unpacking_dir
@@ -121,7 +124,7 @@ module Itchy
           counter += 1
           # unsupported ova content (more than one disk)
           return nil if counter > 1
-          File.new("#{directory}/#{file}", 'r').rename(file, "#{metadata.dc_identifier}.#{file_format}")
+          File.new("#{directory}/#{file}", 'r').rename(file, "#{metadata.dc_identifier}")
         end
       end
       return nil if counter == 0
@@ -129,25 +132,28 @@ module Itchy
       file_format
     end
 
-    #
+    # Method moves image files to output directory
     #
     # @param directory [String] name of directory where image is saved
     # @param metadata [Itchy::VmcatcherEvent] event metadata
     def copy_same_format(directory, metadata)
       Itchy::Log.info "[#{self.class.name}] Image #{metadata.dc_identifier.inspect} " \
-        'is already in the required format. Copying it to output directory.'
+        'is already in the required format. Moving it to output directory.'
 
+      new_file_name = "#{::Time.now.to_i}_#{metadata.dc_identifier}"
       begin
-        ::FileUtils.ln_sf("#{directory}/#{metadata.dc_identifier}", @options.output_dir)
-      rescue => ex
-        Itchy::Log.fatal "[#{self.class.name}] Failed to create a link (copy) " \
+        ::FileUtils.mv("#{directory}/#{metadata.dc_identifier}",
+                          "#{@options.output_dir}/#{new_file_name}")
+      rescue SystemCallError => ex
+        Itchy::Log.fatal "[#{self.class.name}] Failed to move a file " \
           "for #{metadata.dc_identifier.inspect}: " \
           "#{ex.message}"
-        fail Itchy::Errors::WorkingWithFilesError, ex
+        fail Itchy::Errors::PrepareEnvError, ex
       end
+      new_file_name
     end
 
-    #
+    # Method for copying image file from vmCatcher cache to processing places
     #
     # @param metadata [Itchy::VmcatcherEvent] event metadata
     # @param vmcatcher_configuration [Itchy::VmcatcherConfiguration] current VMC configuration
@@ -157,15 +163,15 @@ module Itchy
                              "for #{metadata.dc_identifier.inspect}"
       unpacking_dir = prepare_image_temp_dir(metadata, vmcatcher_configuration).flatten.first
       begin
-        ::FileUtils.ln_sf(
+        ::FileUtils.cp(
           orig_image_file(metadata, vmcatcher_configuration),
           unpacking_dir
         )
-      rescue => ex
-        Itchy::Log.fatal "[#{self.class.name}] Failed to create a link (copy) " \
+      rescue SystemCallError => ex
+        Itchy::Log.fatal "[#{self.class.name}] Failed to create a copy " \
                                 "for #{metadata.dc_identifier.inspect}: " \
                                 "#{ex.message}"
-        fail Itchy::Errors::WorkingWithFilesError, ex
+        fail Itchy::Errors::PrepareEnvError, ex
       end
 
       unpacking_dir
@@ -190,11 +196,11 @@ module Itchy
 
       begin
         ::FileUtils.mkdir_p temp_dir
-      rescue => ex
+      rescue SystemCallError => ex
         Itchy::Log.fatal "[#{self.class.name}] Failed to create a directory " \
                                 "for #{metadata.dc_identifier.inspect}: " \
                                 "#{ex.message}"
-        fail Itchy::Errors::WorkingWithFilesError, ex
+        fail Itchy::Errors::PrepareEnvError, ex
       end
     end
 
@@ -207,10 +213,11 @@ module Itchy
       image_format_tester.run_command
       begin
         image_format_tester.error!
-      rescue
+      rescue Mixlib::ShellOut::ShellCommandFailed, Mixlib::ShellOut::CommandTimeout,
+             Mixlib::ShellOut::InvalidCommandOption => ex
         Itchy::Log.error "[#{self.class.name}] Checking file format for" \
           "#{file} failed with #{image_format_tester.stderr}"
-        fail Itchy::Errors::FileInspectingError, ex
+        fail Itchy::Errors::FileInspectError, ex
                                 
       end
       temp = image_format_tester.stdout

data/lib/itchy/metadata_archiver.rb

@@ -36,7 +36,7 @@ module Itchy
       begin
         event_handler = Itchy::EventHandlers.const_get("#{vmc_event.type}EventHandler")
       rescue NameError => ex
-        raise Itchy::Errors::UnknownEventError,
+        fail Itchy::Errors::UnknownEventError,
               "Unknown event type #{vmc_event.type.inspect} detected: #{ex.message}"
       end
 

data/lib/itchy/version.rb

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

data/lib/itchy/vmcatcher_event.rb

@@ -51,7 +51,6 @@ module Itchy
         self.class.send :define_method, method_id do
           temp = VMCATCHER_ATTR_PREFIX + method_id.to_s.upcase
 
-          Itchy::Log.debug "[#{method_id}] METHOD MISSING CALL "
           attributes[temp]
         end
         send(method_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itchy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lubomir Kosaristan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -312,14 +312,15 @@ files:
 - lib/itchy/errors.rb
 - lib/itchy/errors/abstract_env_error.rb
 - lib/itchy/errors/env_lookup_error.rb
+- lib/itchy/errors/event_handle_error.rb
 - lib/itchy/errors/event_processing_error.rb
-- lib/itchy/errors/file_inspecting_error.rb
-- lib/itchy/errors/format_converting_error.rb
-- lib/itchy/errors/image_transforming_error.rb
+- lib/itchy/errors/file_inspect_error.rb
+- lib/itchy/errors/format_conversion_error.rb
+- lib/itchy/errors/image_transformation_error.rb
 - lib/itchy/errors/not_found_error.rb
 - lib/itchy/errors/not_implemented_error.rb
+- lib/itchy/errors/prepare_env_error.rb
 - lib/itchy/errors/unknown_event_error.rb
-- lib/itchy/errors/working_with_files_error.rb
 - lib/itchy/errors/wrong_state_error.rb
 - lib/itchy/event_handlers.rb
 - lib/itchy/event_handlers/available_postfix_event_handler.rb
@@ -372,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Event handler for vmcatcher