sicily 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7094d97b1de208a0611c56df43b83fd88e4c8b13
-  data.tar.gz: f53c938f8af3acb212eeb532b673bb7deeec62e9
+  metadata.gz: 70bb2d43669b0807d55b8c644f3b95b715b1d9bb
+  data.tar.gz: a921436bfcbf10a7db3f6fd8afdff8a8f5b8c34d
 SHA512:
-  metadata.gz: caa5b53a90727e9df8300b7ad288dd865c58f6e82f0b0f664d550d400adbee72c4c1d101ded387f03c05887760325dda7e9ccee8381699a13851a3c031418731
-  data.tar.gz: 7c6dd99942a135234e7ba9392f30daca58c422cd2402d7a6d1b4aff42149b9fb40a396c5de54c92027a0fb56f980467c5ec8758f8a2809a54657f07bb7376426
+  metadata.gz: b8ef718a271e3aa4e9d9e3270d26b480c2138ccfdca8c5c032ff6c9e1f4849e5f1a83d53dc48b0fa9ae323c7839e0c9b8cd63221600a77af1a4d5a5acc4931c9
+  data.tar.gz: 3ca60539bd1cd84dae1b8e1af101b2bd124faa0d054da572602115a467ed60ad92580f993d916e92376cb577de67f8951bdad4fa5b7168320370e9cb3f22ce1a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.8
+* Fix a bug that cannot resize image when rotation info at exif is not normal.
+
 ## 0.1.7
 * Fix a bug that getting wrong creation time of file.
 

data/Gemfile.lock

@@ -1,38 +1,33 @@
 PATH
   remote: .
   specs:
-    sicily (0.1.7)
+    sicily (0.1.8)
       concurrent-ruby (~> 1.0.5)
       exifr (~> 1.3.3)
       fastimage (~> 2.1.1)
-      fastimage_resize (~> 2.0.3)
       god (~> 0.13.7)
       listen (~> 3.1.5)
+      mini_magick (~> 4.8.0)
       terminal-notifier (~> 2.0.0)
       whenever (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RubyInline (3.12.4)
-      ZenTest (~> 4.3)
-    ZenTest (4.11.1)
     chronic (0.10.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     exifr (1.3.3)
     fastimage (2.1.1)
-    fastimage_resize (2.0.3)
-      RubyInline (>= 3.8.2)
-      fastimage (>= 1.2.9)
-    ffi (1.9.21)
+    ffi (1.9.23)
     god (0.13.7)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    mini_magick (4.8.0)
     rake (10.5.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rspec (3.7.0)

data/README.md

@@ -21,9 +21,15 @@ Or install it yourself as:
 
     $ gem install sicily
 
-And install a node package as:
+### Install dependencies
+
+Install a node package as:
 
     $ npm install -g upload-gphotos
+    
+Install ImageMagick
+
+    $ brew install imagemagick
 
 ## Usage
 

data/lib/sicily.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'sicily/version'
+require 'sicily/path_helper'
 require 'sicily/logger'
 require 'sicily/config'
 require 'sicily/monitor'

data/lib/sicily/config.rb

@@ -30,7 +30,7 @@ module Sicily
 
     Sicily.logger.debug "#{Sicily.generators.size} generators found."
     Sicily.generators.each do |generator|
-      path = File.expand_path "#{File.dirname(__FILE__)}/../../config/#{generator.filename}"
+      path = File.expand_path "#{Sicily.user_config_path}/#{generator.filename}"
       next unless generator.load_on_start
       Sicily.logger.debug "ConfigLoader : #{path}"
       load path

data/lib/sicily/generator.rb

@@ -20,9 +20,8 @@ module Sicily
   end
 
   def self.load_generators
-    Dir["#{File.dirname(__FILE__)}/../../generator/*.rb"].each do |file|
+    Dir["#{Sicily.lib_path}/sicily/generator/*.rb"].each do |file|
       file = File.expand_path file
-      Sicily.logger.debug "Load generator : #{file}"
       require file
     end
   end

data/{generator → lib/sicily/generator}/application.rb

@@ -7,8 +7,8 @@ module Sicily
     generator.content = <<~CONTENT
       Sicily.configure do |config|
         config.forbid_new_file_in_subfolder = true
-        config.num_thread_pool = 10
-        config.delay_on_file_monitoring = 10
+        config.num_thread_pool = 1
+        config.delay_on_file_monitoring = 30
         config.consume_on_start = true
       end
     CONTENT

data/lib/sicily/logger.rb

@@ -40,7 +40,7 @@ module Sicily
 
     def create_logger
       @logger = if $SICILY_LOG_TO_FILE
-                  Logger.new File.join(File.dirname(__FILE__), '../../monitor.log')
+                  Logger.new File.join(Dir.pwd, './monitor.log')
                 else
                   Logger.new STDOUT
                 end

data/lib/sicily/path_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sicily
+  def self.user_config_path
+    "#{Dir.pwd}/config"
+  end
+
+  def self.lib_path
+    File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  end
+end

data/lib/sicily/task/resize_task.rb

@@ -1,26 +1,16 @@
 # frozen_string_literal: true
 
 require 'sicily/util/image_util'
-require 'fastimage_resize'
+require 'mini_magick'
 
 module Sicily
   module Task
-    class SizeCalculator
-      def self.size_to_fit(container_width, container_height, image_width, image_height)
-        if container_width * image_height > container_height * image_width
-          [(image_width * container_height / image_height).to_i, container_height]
-        else
-          [container_width, (image_height * container_width / image_width).to_i]
-        end
-      end
-    end
-
     module ResizeTask
       def fit_if_photo(container_width, container_height)
         info "fit_if_photo to #{container_width}x#{container_height}"
-        size = Util::ImageUtil.get_size(@path)
-        dest_size = SizeCalculator.size_to_fit container_width, container_height, size[0], size[1]
-        FastImage.resize(@path, dest_size[0], dest_size[1], outfile: @path)
+        MiniMagick::Image.new(@path) do |image|
+          image.resize "#{container_width}x#{container_height}>"
+        end
       end
     end
   end

data/lib/sicily/task_loader.rb

@@ -30,7 +30,7 @@ module Sicily
     end
 
     def list_all_files
-      Dir["#{File.dirname(__FILE__)}/task/*.rb"]
+      Dir["#{Sicily.lib_path}/sicily/task/*.rb"]
     end
 
     def camelize(str)

data/lib/sicily/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sicily
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/sicily.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
     To finish installation, please execute the following:
       $ npm install -g upload-gphotos
 
-    And Libgd is required for this gem. Please install it like the following:
-      $ brew install gd
+    And ImageMagick is required for this gem. Please install it like the following:
+      $ brew install imagemagick
   MESSAGE
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby', '~> 1.0.5'
   spec.add_dependency 'exifr', '~> 1.3.3'
   spec.add_dependency 'fastimage', '~> 2.1.1'
-  spec.add_dependency 'fastimage_resize', '~> 2.0.3'
+  spec.add_dependency 'mini_magick', '~> 4.8.0'
   spec.add_dependency 'god', '~> 0.13.7'
   spec.add_dependency 'listen', '~> 3.1.5'
   spec.add_dependency 'terminal-notifier', '~> 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sicily
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Paul Eunjae Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: fastimage_resize
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: god
   requirement: !ruby/object:Gem::Requirement
@@ -187,20 +187,21 @@ files:
 - bin/console
 - bin/setup
 - exe/sicily
-- generator/application.rb
-- generator/god.rb
-- generator/google_photo.rb
-- generator/rules.rb
-- generator/schedule.rb
 - lib/sicily.rb
 - lib/sicily/batch_processor.rb
 - lib/sicily/config.rb
 - lib/sicily/error/monitor_error.rb
 - lib/sicily/file_processor.rb
 - lib/sicily/generator.rb
+- lib/sicily/generator/application.rb
+- lib/sicily/generator/god.rb
+- lib/sicily/generator/google_photo.rb
+- lib/sicily/generator/rules.rb
+- lib/sicily/generator/schedule.rb
 - lib/sicily/logger.rb
 - lib/sicily/monitor.rb
 - lib/sicily/monitor_wrapper.rb
+- lib/sicily/path_helper.rb
 - lib/sicily/task/dummy_task.rb
 - lib/sicily/task/file_task.rb
 - lib/sicily/task/google_photo_task.rb
@@ -221,8 +222,8 @@ post_install_message: |
   To finish installation, please execute the following:
     $ npm install -g upload-gphotos
 
-  And Libgd is required for this gem. Please install it like the following:
-    $ brew install gd
+  And ImageMagick is required for this gem. Please install it like the following:
+    $ brew install imagemagick
 rdoc_options: []
 require_paths:
 - lib