sicily 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 627871cf9d13982e121dc7eb192bbf7d58adfe97
-  data.tar.gz: 316a52b9f5cafdd37eb9a7ffdd04effdc27807d4
+  metadata.gz: 24bffd7625f941daf5ce70d26b13e2e125e357ae
+  data.tar.gz: 60915840c1a95a889b11fa1025846c1a83507b96
 SHA512:
-  metadata.gz: 1ad452ca08562748cf97ee25c353b1e8bb047523aac5ee0230bfa043f88e121d061e6007f4d7957842db87c096e42b3b101f9afbe64c3094bb28840bec1552ee
-  data.tar.gz: 95ad6d42958198863c9469b6a6811a604391484860c11c55a90551d653af6ba30be04164e204fb957f59bf420f1d9a7a2984b73084370b7b2dde5b7b99c69c5c
+  metadata.gz: 3628311381543b604a85d12c2e5ce1a824c9111c168d3512d37c01ee5c0270a19d45ccd438d88b983a15b264c15e45eaf2ca1d66dd960f4208a49b56610e7778
+  data.tar.gz: f8c1ef202d59a65ecc9063a507eb88f8b73f5ded2d359a832539086d7c18b48e707a2c609c894c57dc6d345ba38074c293fae8f718115b8a8abf50ab83f74630

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.3
+* It's now easy to create new task.
+
 ## 0.1.2
 * Add `rm`
 

data/Gemfile.lock

@@ -1,29 +1,36 @@
 PATH
   remote: .
   specs:
-    sicily (0.1.2)
+    sicily (0.1.3)
       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)
     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-inotify (0.9.10)

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/sicily.svg)](https://badge.fury.io/rb/sicily)
+
 # Sicily
 
 A rule-based photo organizer written in Ruby
@@ -51,6 +53,14 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Adding a New Task
+
+Refer to `lib/sicily/task/` and `spec/sicily/task/`.
+
+You create any task as you want.
+
+TaskLoader(`lib/sicily/task_loader.rb`) will load it automatically.
+
 ## TODO
 * error handling
 * logging

data/lib/sicily.rb

@@ -2,10 +2,13 @@ require "sicily/version"
 require "sicily/config"
 require "sicily/monitor"
 require "sicily/util/file_util"
+require "sicily/task_loader"
 
 module Sicily
   @monitored_paths = []
 
+  TaskLoader.new.load_all_tasks
+
   def self.on(path, &block)
     if self.can_monitor?(@monitored_paths, path)
       self.start_monitor!(path, &block)

data/lib/sicily/config.rb

@@ -1,20 +1,12 @@
-require "singleton"
-
 module Sicily
-  def self.configure_google(&block)
-    return if block.nil?
-    block.call GoogleCredential.instance
-  end
-
-  def self.config
-    Config.instance
+  class << self
+    attr_accessor :config
   end
 
   class Config
-    include Singleton
-    attr_accessor :forbid_new_file_in_subfolder,
-                  :notify_when_done,
-                  :num_thread_pool
+    attr_reader :forbid_new_file_in_subfolder,
+                :notify_when_done,
+                :num_thread_pool
 
     def initialize
       @forbid_new_file_in_subfolder = true
@@ -23,8 +15,5 @@ module Sicily
     end
   end
 
-  class GoogleCredential
-    include Singleton
-    attr_accessor :id, :pw
-  end
+  Sicily.config = Config.new
 end

data/lib/sicily/file_processor.rb

@@ -1,50 +1,7 @@
-require "sicily/task/resize_task"
-require "sicily/task/google_photo_task"
-require "sicily/task/file_task"
-require "sicily/util/file_util"
-
 module Sicily
   class FileProcessor
     def initialize(path)
       @path = path
     end
-
-    def fit_if_photo(width, height)
-      Task::ResizeTask.fit_if_photo @path, width, height
-    end
-
-    def google_photo
-      Task::GooglePhotoTask.upload @path
-    end
-
-    def mv(dest_path)
-      file_task_op :mv, dest_path
-    end
-
-    def cp(dest_path)
-      file_task_op :cp, dest_path
-    end
-
-    def rm
-      Task::FileTask.rm @path
-    end
-
-    private
-    def file_task_op(op, dest_path)
-      cannot_op = Sicily.config.forbid_new_file_in_subfolder &&
-          Util::FileUtil.is_related?(@path, dest_path)
-
-      if cannot_op
-        raise [
-                  "Cannot #{op} to child folder",
-                  "  src  : #{@path}",
-                  "  dest : #{dest_path}",
-              ].join("\n")
-        return
-      end
-
-      final_dest_path = Util::FileUtil.eval_dest_path(@path, dest_path)
-      Task::FileTask.public_send op, @path, final_dest_path
-    end
   end
 end

data/lib/sicily/task/dummy_task.rb

@@ -0,0 +1,10 @@
+module Sicily
+  module Task
+    module DummyTask
+      def dummy
+        puts "This does nothing"
+        @path
+      end
+    end
+  end
+end

data/lib/sicily/task/file_task.rb

@@ -3,26 +3,41 @@ require "sicily/config"
 
 module Sicily
   module Task
-    class FileTask
-      def self.mv(path_src, path_dest)
-        file_op :mv, path_src, path_dest
-      end
+    class Base
+      def self.prepare_dest_path(path_src, path_dest)
+        cannot_op = Sicily.config.forbid_new_file_in_subfolder &&
+            Util::FileUtil.is_related?(path_src, path_dest)
+
+        if cannot_op
+          raise [
+                    "Cannot do file operation to child folder",
+                    "  src  : #{path_src}",
+                    "  dest : #{path_dest}",
+                ].join("\n")
+          return
+        end
+
+        final_dest_path = Util::FileUtil.eval_dest_path(path_src, path_dest)
+        final_dest_path = File.expand_path final_dest_path
+        FileUtils.mkdir_p final_dest_path
 
-      def self.cp(path_src, path_dest)
-        file_op :cp, path_src, path_dest
+        final_dest_path
       end
+    end
 
-      def self.rm(path)
-        FileUtils.rm path
+    module FileTask
+      def mv(path_dest)
+        path_dest = Base.prepare_dest_path(@path, path_dest)
+        FileUtils.mv @path, path_dest
       end
 
-      private
-      def self.file_op(op, path_src, path_dest)
-        path_src = File.expand_path path_src
-        path_dest = File.expand_path path_dest
+      def cp(path_dest)
+        path_dest = Base.prepare_dest_path(@path, path_dest)
+        FileUtils.cp @path, path_dest
+      end
 
-        FileUtils.mkdir_p path_dest
-        FileUtils.public_send op, path_src, path_dest
+      def rm
+        FileUtils.rm @path
       end
     end
   end

data/lib/sicily/task/google_photo_task.rb

@@ -1,16 +1,31 @@
 require "sicily/config"
 
 module Sicily
+  class << self
+    attr_accessor :config_google
+  end
+
+  class GoogleCredential
+    attr_accessor :id, :pw
+  end
+
+  Sicily.config_google = GoogleCredential.new
+
+  def self.configure_google(&block)
+    return if block.nil?
+    block.call Sicily.config_google
+  end
+
   module Task
-    class GooglePhotoTask
-      def self.upload(path)
-        id = GoogleCredential.instance.id
-        pw = GoogleCredential.instance.pw
+    module GooglePhotoTask
+      def google_photo
+        id = Sicily.config_google.id
+        pw = Sicily.config_google.pw
 
         if id.to_s.empty? or pw.to_s.empty?
           raise "no google credential"
         else
-          cmd = "upload-gphotos \"#{path}\" -u #{id} -p #{pw}"
+          cmd = "upload-gphotos \"#{@path}\" -u #{id} -p #{pw}"
           `#{cmd}`
         end
       end

data/lib/sicily/task/resize_task.rb

@@ -1,14 +1,27 @@
-require "mini_magick"
+require "sicily/util/image_util"
+require "fastimage_resize"
 
 module Sicily
   module Task
-    class ResizeTask
-      def self.fit_if_photo(path, width, height)
-        image = MiniMagick::Image.new(path)
-        if image.valid?
-          image.resize "#{width}x#{height}>"
+    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)
+        size = Util::ImageUtil.get_size(@path)
+        image_width = size[0]
+        image_height = size[1]
+
+        dest_size = SizeCalculator.size_to_fit container_width, container_height, image_width, image_height
+        FastImage.resize(@path, dest_size[0], dest_size[1], :outfile => @path)
+      end
+    end
   end
 end

data/lib/sicily/task_loader.rb

@@ -0,0 +1,20 @@
+module Sicily
+  class TaskLoader
+    def load_all_tasks
+      Dir["#{File.dirname(__FILE__)}/task/*.rb"].each {|file|
+        require file
+
+        module_name = camelize(File.basename(file, ".*"))
+        maybe_module = Task.const_get(module_name)
+        if maybe_module.class.name == "Module"
+          FileProcessor.send(:include, maybe_module)
+        end
+      }
+    end
+
+    private
+    def camelize(str)
+      str.split('_').map {|w| w.capitalize}.join
+    end
+  end
+end

data/lib/sicily/util/image_util.rb

@@ -0,0 +1,12 @@
+require "fastimage"
+
+module Sicily
+  module Util
+    class ImageUtil
+      def self.get_size(path)
+        size = FastImage.size(path)
+        [size[0], size[1]]
+      end
+    end
+  end
+end

data/lib/sicily/version.rb

@@ -1,3 +1,3 @@
 module Sicily
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/sicily.gemspec

@@ -14,11 +14,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/eunjae-lee/sicily"
   spec.license       = "MIT"
 
+  spec.metadata = {
+      'changelog_uri' => "https://github.com/eunjae-lee/sicily/blob/master/CHANGELOG.md"
+  }
+
   spec.post_install_message = %q{
 
   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
 
 }
 
@@ -29,13 +35,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mini_magick", "~> 4.8.0"
   spec.add_dependency "listen", "~> 3.1.5"
   spec.add_dependency "god", "~> 0.13.7"
   spec.add_dependency "whenever", "~> 0.10.0"
   spec.add_dependency "terminal-notifier", "~> 2.0.0"
   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_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sicily
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: fastimage_resize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -176,24 +190,30 @@ files:
 - lib/sicily/config.rb
 - lib/sicily/file_processor.rb
 - lib/sicily/monitor.rb
+- lib/sicily/task/dummy_task.rb
 - lib/sicily/task/file_task.rb
 - lib/sicily/task/google_photo_task.rb
 - lib/sicily/task/resize_task.rb
+- lib/sicily/task_loader.rb
 - lib/sicily/util/exif_util.rb
 - lib/sicily/util/file_util.rb
+- lib/sicily/util/image_util.rb
 - lib/sicily/util/notification_util.rb
 - lib/sicily/version.rb
 - sicily.gemspec
 homepage: https://github.com/eunjae-lee/sicily
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/eunjae-lee/sicily/blob/master/CHANGELOG.md
 post_install_message: |2+
 
 
     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
 
 rdoc_options: []
 require_paths:
@@ -210,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A rule-based photo organizer written in Ruby