flickrage 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf60b6c67ea4268d0d646cdd9b6b475744c49af2
-  data.tar.gz: 9e529fabe4ab52ace9e86add2d03a6b238c85b6f
+  metadata.gz: 79e1e5010a8973cdb15ce3cb3aa4aed0c57b2f55
+  data.tar.gz: d91a251a0c0ba6ec7953e28366a5fa38c49fcfe3
 SHA512:
-  metadata.gz: 161e305af9402fef2d2af2c0dc24349d014b47087db640da2d79511f66a68b624db902b2f5be22010fc3582cb73fc2e171243977b6a724b15d2aed3b3592dbc9
-  data.tar.gz: e5436fba5048ff0ad7ae1c0ea6bdb73f1e0a053930a864557045c2a6a0b7d1b3cc46091f90dd0c8d2156ce4ef303f0e70fb92144d10d12b3fb4af11e851e58bd
+  metadata.gz: 69b1337687d72f9e5e3ba06d0fa56741986ab0d12e8a4758786b59f7037712aa1a028f75020f5e65023afe0629ce0ec6e2643d056fdb18c30c5d9071cd3962f5
+  data.tar.gz: 85b9cd46ccf7b32c33468fb4486c888c46bd414d5bd766871396fd7d01eb54da859c3a7fc435eb3412b0aeac6c8d43980acc4f482649e767d77bc1675497cb93

data/lib/flickrage/cli.rb

@@ -135,8 +135,8 @@ module Flickrage
       init_flickraw
 
       pipeline.run
-    rescue Flickrage::NoKeysError, Flickrage::SearchError, Flickrage::DownloadError,
-           Flickrage::NumberError, Flickrage::PathError => e
+    rescue Flickrage::NoKeysError, Flickrage::SearchError, Flickrage::DownloadError, Flickrage::CollageError,
+           Flickrage::ResizeError, Flickrage::NumberError, Flickrage::PathError => e
       error_simple(e)
     rescue => e
       error_with_backtrace(e)
@@ -160,12 +160,12 @@ module Flickrage
     no_commands do
       def error_simple(e)
         logger.error e.message
-        raise e
+        raise e if Flickrage.config.verbose
       end
 
       def error_with_backtrace(e)
         logger.error e.message
-        backtrace(e) if options.include? 'trace'
+        backtrace(e) if Flickrage.config.verbose
         raise e
       end
 
@@ -174,11 +174,14 @@ module Flickrage
       end
 
       def cleanup
-        return unless options['output']
-        return unless Dir.exist?(options['output'])
+        return logger.debug('Output directory not exists, cleanup skipped') unless cleanup?
         FileUtils.rm_rf("#{options['output']}/.", secure: true)
       end
 
+      def cleanup?
+        options['output'] && Dir.exist?(options['output'])
+      end
+
       def setup_config
         Flickrage.configure do |config|
           config.logger       = ::Logger.new(options['log']) if options['log']

data/lib/flickrage/pipeline.rb

@@ -32,7 +32,7 @@ module Flickrage
 
       speaker.add_padding
 
-      raise CollageError, 'Try again later...' unless valid_list?(list)
+      raise Flickrage::CollageError, 'Try again later...' unless valid_list?(list)
 
       logger.warn("Congrats! You can find composed collage at #{list.collage_path}")
 

data/lib/flickrage/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Flickrage
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/flickrage/worker/base.rb

@@ -37,7 +37,12 @@ module Flickrage
       def increment_error_counter(error, value)
         @opts[:ask_error_counter] += 1
 
-        raise error, value if opts[:ask_error_counter] > MAX_ASK_ERRORS
+        return unless opts[:ask_error_counter] >= MAX_ASK_ERRORS
+        return yield if block_given?
+        raise error, value
+      rescue SystemCallError => e
+        logger.error(e.message)
+        raise error, value
       end
 
       def reset_error_counter

data/lib/flickrage/worker/download.rb

@@ -58,17 +58,21 @@ module Flickrage
       def init_output
         return if validate_output
 
-        output = speaker.ask('Please enter the path of the output directory:',
+        output = speaker.ask('Please enter existing path of the output directory:',
                              path: true)
 
-        unless valid_output?(output)
-          increment_error_counter(Flickrage::PathError, output)
-          return init_output
-        end
+        if valid_output?(output)
+          reset_error_counter
 
-        reset_error_counter
+          Flickrage.config.output = output
+        end
 
-        Flickrage.config.output = output
+        increment_error_counter(Flickrage::PathError, output) do
+          raise Flickrage::PathError, output unless speaker.yes?("Do you want create path, #{output}?")
+          FileUtils.mkdir_p(output)
+          Flickrage.config.output = output
+        end
+        init_output
       end
 
       def validate_output

data/lib/flickrage.rb

@@ -31,7 +31,7 @@ module Flickrage
   setting :pool_size, 5
   setting :pool
 
-  setting :grid, 5
+  setting :grid, 2
   setting :max, 10
   setting :output
 
@@ -172,7 +172,7 @@ module Flickrage
     end
   end
 
-  # Here is something with imagemagick?
+  # Something wrong with the process?
   #
   class CollageError < BaseError
     def initialize(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alexander Merkulov