sicily 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f6d06dfcf656ff02bef26a923b9684d5a28851e
-  data.tar.gz: 5ead2b24d7137cd9eafe16b7f43df83997ec4e0f
+  metadata.gz: 7094d97b1de208a0611c56df43b83fd88e4c8b13
+  data.tar.gz: f53c938f8af3acb212eeb532b673bb7deeec62e9
 SHA512:
-  metadata.gz: f1faa2887227d90898a5efa500d2933bd6e6915621d46db189e7038bb292bae273bc1956f306c17b6789dae943d3ef9dae925db41794efa140afec3693574bff
-  data.tar.gz: 8987884e10095901ddccf3ede93d061f97796d8fbe280304ede4afead9843e098972f90534eb43c4e07f202da32cf413f4fae8a082ec258b224b357f39d3d8bb
+  metadata.gz: caa5b53a90727e9df8300b7ad288dd865c58f6e82f0b0f664d550d400adbee72c4c1d101ded387f03c05887760325dda7e9ccee8381699a13851a3c031418731
+  data.tar.gz: 7c6dd99942a135234e7ba9392f30daca58c422cd2402d7a6d1b4aff42149b9fb40a396c5de54c92027a0fb56f980467c5ec8758f8a2809a54657f07bb7376426

data/.rubocop.yml

@@ -14,4 +14,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 4
 Style/GlobalVars:
-  AllowedVariables: ['$SICILY_LOG_TO_FILE']
+  AllowedVariables: ['$SICILY_LOG_TO_FILE', '$SICILY_LOAD_USER_CONFIGS']
+Lint/RescueException:
+  Exclude:
+    - 'lib/sicily/batch_processor.rb'

data/CHANGELOG.md

@@ -1,25 +1,28 @@
 # Changelog
 
+## 0.1.7
+* Fix a bug that getting wrong creation time of file.
+
 ## 0.1.6
 * It consumes already existing files on start-up.
 
 ## 0.1.5
-* It waits 10 seconds before taking actions in case when file is still changing
+* It waits 10 seconds before taking actions in case when file is still changing.
 
 ## 0.1.4
-* Add required ruby version
+* Add required ruby version.
 * It's now easy to add new generator.
 
 ## 0.1.3
 * It's now easy to create new task.
 
 ## 0.1.2
-* Add `rm`
+* Add `rm`.
 
 ## 0.1.1
-* Extract time and use it for evaluating dest path
+* Extract time and use it for evaluating dest path.
   * ex> `~/dest_folder/%Y/%m/%d`
-* Add `cp`
+* Add `cp`.
 
 ## 0.1.0
-Initial deployment
+Initial deployment.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sicily (0.1.6)
+    sicily (0.1.7)
       concurrent-ruby (~> 1.0.5)
       exifr (~> 1.3.3)
       fastimage (~> 2.1.1)

data/exe/sicily

@@ -5,18 +5,15 @@
 $SICILY_LOG_TO_FILE = (ENV['SICILY_LOG'] == 'file')
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), ['..', 'lib'])
 
-require 'sicily'
-
 command = ARGV[0]
 
+$SICILY_LOAD_USER_CONFIGS = (command == 'monitor')
+
+require 'sicily'
+
 case command
 when 'generate'
   require 'fileutils'
-  require 'sicily/generator'
-
-  Dir['./generator/*.rb'].each do |file|
-    require file
-  end
 
   FileUtils.rm_rf './config'
   FileUtils.mkdir_p './config'
@@ -40,23 +37,7 @@ when 'generate'
     puts messages_to_display.join('\n')
   end
 when 'monitor'
-  `echo test >> monitor.log`
-  necessary_config_files = ['rules.rb']
-  config_files_to_load = ['google_photo.rb', 'rules.rb']
-
-  necessary_config_files.each do |file|
-    next if File.exist? "./config/#{file}"
-
-    puts "./config/#{file} is missing!"
-    puts '  Type: `sicily generate`'
-    exit
-  end
-
-  config_files_to_load.each do |filename|
-    path = "./config/#{filename}"
-    load(path) if File.exist?(path)
-  end
-
+  load './config/rules.rb'
   sleep
 when 'start'
   command1 = 'whenever --load-file ./config/.schedule.rb --update-crontab'

data/generator/application.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Sicily
+  Sicily.register_generator do |generator|
+    generator.filename = '.application.rb'
+    generator.load_on_start = true
+    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.consume_on_start = true
+      end
+    CONTENT
+  end
+end

data/generator/google_photo.rb

@@ -3,9 +3,8 @@
 module Sicily
   Sicily.register_generator do |generator|
     generator.filename = 'google_photo.rb'
+    generator.load_on_start = true
     generator.content = <<~CONTENT
-      # frozen_string_literal: true
-
       Sicily.configure_google do |config|
         config.id = 'your id'
         config.pw = 'your pw'

data/generator/rules.rb

@@ -4,8 +4,6 @@ module Sicily
   Sicily.register_generator do |generator|
     generator.filename = 'rules.rb'
     generator.content = <<~CONTENT
-      # frozen_string_literal: true
-
       Sicily.on '~/your_folder' do
         fit_if_photo 2000, 2000
         google_photo

data/lib/sicily.rb

@@ -4,54 +4,15 @@ require 'sicily/version'
 require 'sicily/logger'
 require 'sicily/config'
 require 'sicily/monitor'
+require 'sicily/monitor_wrapper'
+require 'sicily/generator'
 require 'sicily/util/file_util'
 require 'sicily/task_loader'
 require 'sicily/error/monitor_error'
 
 module Sicily
-  TaskLoader.new.load_all_tasks
-
-  class MonitorWrapper
-    @monitored_paths = []
-
-    def self.on(path, &user_rule_block)
-      if can_monitor?(@monitored_paths, path)
-        store_path_and_start_monitor(path, &user_rule_block)
-      else
-        Sicily.logger.error "Monitor Failed. Path duplicated : #{path}"
-      end
-    end
-
-    def self.store_path_and_start_monitor(path, &user_rule_block)
-      store_monitored_path(path)
-      start_monitor!(path, &user_rule_block)
-    end
-
-    def self.start_monitor!(path, &user_rule_block)
-      Monitor.new.on(path, &user_rule_block)
-    rescue MonitorError => e
-      Sicily.logger.error e.message
-    end
-
-    def self.store_monitored_path(path)
-      @monitored_paths << File.expand_path(path)
-    end
-
-    def self.can_monitor?(prev_paths, new_path)
-      prev_paths.each do |prev_path|
-        return false if somehow_related?(prev_path, new_path)
-      end
-
-      true
-    end
-
-    def self.somehow_related?(path1, path2)
-      parent_child_relationship = Util::FileUtil.related?(path1, path2)
-      child_parent_relationship = Util::FileUtil.related?(path2, path1)
-
-      parent_child_relationship || child_parent_relationship
-    end
-  end
+  Sicily.load_all_tasks
+  Sicily.load_all_configs
 
   def self.on(path, &user_rule_block)
     MonitorWrapper.on path, &user_rule_block

data/lib/sicily/batch_processor.rb

@@ -48,8 +48,8 @@ module Sicily
       file_processor = FileProcessor.new(file)
       file_processor.instance_eval(&user_rule_block)
       file_processor.info 'Done'
-    rescue RuntimeError => e
-      Sicily.logger.error e.message
+    rescue Exception => e
+      Sicily.logger.error e.inspect
     end
 
     def notify_done

data/lib/sicily/config.rb

@@ -6,18 +6,34 @@ module Sicily
   end
 
   class Config
-    attr_reader :forbid_new_file_in_subfolder,
-                :num_thread_pool,
-                :delay_on_file_monitoring,
-                :consume_on_start
+    attr_accessor :forbid_new_file_in_subfolder,
+                  :num_thread_pool,
+                  :delay_on_file_monitoring,
+                  :consume_on_start
 
     def initialize
       @forbid_new_file_in_subfolder = true
-      @num_thread_pool = 50
+      @num_thread_pool = 10
       @delay_on_file_monitoring = 10
       @consume_on_start = true
     end
   end
 
   Sicily.config = Config.new
+
+  def self.configure(&block)
+    block.call Sicily.config if block_given?
+  end
+
+  def self.load_all_configs
+    return unless $SICILY_LOAD_USER_CONFIGS
+
+    Sicily.logger.debug "#{Sicily.generators.size} generators found."
+    Sicily.generators.each do |generator|
+      path = File.expand_path "#{File.dirname(__FILE__)}/../../config/#{generator.filename}"
+      next unless generator.load_on_start
+      Sicily.logger.debug "ConfigLoader : #{path}"
+      load path
+    end
+  end
 end

data/lib/sicily/generator.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 module Sicily
-  class Generator
-    attr_accessor :filename, :content, :post_generate_message
-  end
-
   class << self
     attr_accessor :generators
   end
+
   Sicily.generators = []
 
+  class Generator
+    attr_accessor :filename, :content, :post_generate_message, :load_on_start
+  end
+
   def self.register_generator(&block)
     return unless block_given?
 
@@ -17,4 +18,14 @@ module Sicily
     block.call generator
     Sicily.generators << generator
   end
+
+  def self.load_generators
+    Dir["#{File.dirname(__FILE__)}/../../generator/*.rb"].each do |file|
+      file = File.expand_path file
+      Sicily.logger.debug "Load generator : #{file}"
+      require file
+    end
+  end
+
+  load_generators
 end

data/lib/sicily/monitor.rb

@@ -8,8 +8,8 @@ require 'sicily/error/monitor_error'
 module Sicily
   class Monitor
     def on(path, &user_rule_block)
-      consume_all(path, &user_rule_block)
       attach_monitor(path, &user_rule_block)
+      consume_all(path, &user_rule_block)
     end
 
     private

data/lib/sicily/monitor_wrapper.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Sicily
+  class MonitorWrapper
+    @monitored_paths = []
+
+    def self.on(path, &user_rule_block)
+      if can_monitor?(@monitored_paths, path)
+        store_path_and_start_monitor(path, &user_rule_block)
+      else
+        Sicily.logger.error "Monitor Failed. Path duplicated : #{path}"
+      end
+    end
+
+    def self.store_path_and_start_monitor(path, &user_rule_block)
+      store_monitored_path(path)
+      start_monitor!(path, &user_rule_block)
+    end
+
+    def self.start_monitor!(path, &user_rule_block)
+      Monitor.new.on(path, &user_rule_block)
+    rescue MonitorError => e
+      Sicily.logger.error e.inspect
+    end
+
+    def self.store_monitored_path(path)
+      @monitored_paths << File.expand_path(path)
+    end
+
+    def self.can_monitor?(prev_paths, new_path)
+      prev_paths.each do |prev_path|
+        return false if somehow_related?(prev_path, new_path)
+      end
+
+      true
+    end
+
+    def self.somehow_related?(path1, path2)
+      parent_child_relationship = Util::FileUtil.related?(path1, path2)
+      child_parent_relationship = Util::FileUtil.related?(path2, path1)
+
+      parent_child_relationship || child_parent_relationship
+    end
+  end
+end

data/lib/sicily/task/file_task.rb

@@ -37,12 +37,14 @@ module Sicily
       def mv(path_dest)
         info "mv to #{path_dest}"
         path_dest = Base.prepare_dest_path(@path, path_dest)
+        info "      #{path_dest}"
         FileUtils.mv @path, path_dest
       end
 
       def cp(path_dest)
         info "cp to #{path_dest}"
         path_dest = Base.prepare_dest_path(@path, path_dest)
+        info "      #{path_dest}"
         FileUtils.cp @path, path_dest
       end
 

data/lib/sicily/task_loader.rb

@@ -37,4 +37,8 @@ module Sicily
       str.split('_').map(&:capitalize).join
     end
   end
+
+  def self.load_all_tasks
+    TaskLoader.new.load_all_tasks
+  end
 end

data/lib/sicily/util/file_util.rb

@@ -19,12 +19,18 @@ module Sicily
       end
 
       def self.extract_time(path)
-        if %w[.jpg .jpeg].include? File.extname(path).downcase
-          time_from_exif = ExifUtil.extract_time_from_jpeg(path)
-          return time_from_exif unless time_from_exif.nil?
-        end
+        exif_time = jpeg?(path) && ExifUtil.extract_time_from_jpeg(path)
+        exif_time || extract_time_from_file_stat(path)
+      end
+
+      def self.jpeg?(path)
+        %w[.jpg .jpeg].include? File.extname(path).downcase
+      end
 
-        File.ctime(path)
+      def self.extract_time_from_file_stat(path)
+        File.birthtime(path)
+      rescue NotImplementedError
+        File.mtime(path)
       end
     end
   end

data/lib/sicily/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sicily
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Paul Eunjae Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -187,6 +187,7 @@ files:
 - bin/console
 - bin/setup
 - exe/sicily
+- generator/application.rb
 - generator/god.rb
 - generator/google_photo.rb
 - generator/rules.rb
@@ -199,6 +200,7 @@ files:
 - lib/sicily/generator.rb
 - lib/sicily/logger.rb
 - lib/sicily/monitor.rb
+- lib/sicily/monitor_wrapper.rb
 - lib/sicily/task/dummy_task.rb
 - lib/sicily/task/file_task.rb
 - lib/sicily/task/google_photo_task.rb