flickrage 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63154293a5393fb80da37c10f2bfac47cd7dea14
-  data.tar.gz: b82e875fcc2d07a4c91503c47c928ca89a666528
+  metadata.gz: e9ee1a397bd1661afccb8def2e52abca69b50eec
+  data.tar.gz: 763e29b08d260383ca77c1b6ed45c9884bc44dfb
 SHA512:
-  metadata.gz: 3316be1ff039166fabf82dc672f7648a1bb80db5472f72e8118cbc458e26a2f5b7eb65d892872fe07532147357c739057bbec8c043baee75b86bb97c74098af3
-  data.tar.gz: b064a54c72a8bcbc0e220a1a14e8c3936f4a3b01076b791f7d9ce1849ff505c5c2bbba71d643ebac052162064a64b3a674da795f5530dca9464afba262a4e697
+  metadata.gz: 59850dd2bd9e17027df0c114328830fe78f97f965077c71af40747864844f3b8ff308244f114a707af5cfc7c6506f68b112b7487046e344f4597cd6a90fb945d
+  data.tar.gz: c4208d19727f769550235a01c9f8f637a08785b39be5dad142d56011b8c99eeabb688a85e38da4eb746233e59d9aebf6ec78b0adf99b77f9550dcc1acfe05b20

data/lib/flickrage/cli.rb

@@ -147,7 +147,7 @@ module Flickrage
                   type: :string,
                   required: true,
                   aliases: %w(-o),
-                  banner: './some.png'
+                  banner: './some'
     def clean
       cleanup
     end
@@ -174,7 +174,7 @@ module Flickrage
       end
 
       def cleanup
-        return logger.debug('Output directory not exists, cleanup skipped') unless cleanup?
+        return logger.info('Output directory not exists, cleanup skipped') unless cleanup?
         FileUtils.rm_rf("#{options['output']}/.", secure: true)
       end
 
@@ -223,8 +223,7 @@ module Flickrage
         logger.debug 'Checking Flickr Key\'s.'
 
         return if Flickrage.api_keys?
-        logger.error Flickrage::NoKeysError.new('You must provide Flickr API credentials via --flickr-api-key, --flickr-shared-secret via options. or have it in the environment')
-        exit
+        raise Flickrage::NoKeysError, 'You must provide Flickr API credentials via --flickr-api-key, --flickr-shared-secret via options. or have it in the environment'
       end
     end
   end

data/lib/flickrage/service/downloader.rb

@@ -19,7 +19,7 @@ module Flickrage
 
       private
 
-      def download_file(uri, path, limit = 10)
+      def download_file(uri, path, limit = Flickrage.config.download_timeout)
         raise Flickrage::DownloadError, 'Redirect limit arrived' if limit.zero?
 
         Net::HTTP.start(uri.host, uri.port,

data/lib/flickrage/version.rb

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

data/lib/flickrage/worker/compose.rb

@@ -28,8 +28,7 @@ module Flickrage
       private
 
       def service
-        return @service unless @service.nil?
-        @service = Service::Composer.new(opts['file_name'],
+        @service ||= Service::Composer.new(opts['file_name'],
                                          Flickrage.config.width,
                                          Flickrage.config.height)
       end

data/lib/flickrage/worker/resize.rb

@@ -55,8 +55,7 @@ module Flickrage
       private
 
       def service
-        return @service unless @service.nil?
-        @service = Service::Resizer.new(Flickrage.config.width, Flickrage.config.height)
+        @service ||= Service::Resizer.new(Flickrage.config.width, Flickrage.config.height)
       end
 
       def init_crop_value(name)

data/lib/flickrage/worker/search.rb

@@ -4,8 +4,6 @@ module Flickrage
     class Search < Base
       include Flickrage::Helpers::Dict
 
-      SYSTEM_TIMEOUT = 20
-
       def call
         keywords = opts['keywords'] || %w()
 
@@ -53,7 +51,7 @@ module Flickrage
       end
 
       def timeout?
-        (Time.now.to_i - time) > SYSTEM_TIMEOUT
+        (Time.now.to_i - time) > Flickrage.config.search_timeout
       end
 
       def service

data/lib/flickrage.rb

@@ -31,6 +31,9 @@ module Flickrage
   setting :pool_size, 5
   setting :pool
 
+  setting :search_timeout, 30
+  setting :download_timeout, 10
+
   setting :grid, 2
   setting :max, 10
   setting :output

metadata

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