sicily 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b5be431300e6ce68436d6126064a6187563139
-  data.tar.gz: fa017687e400cf32704eb3bbc4476e7315165b2f
+  metadata.gz: 4a629cc27f49bb182ca951daf71ea7ee3d2331d5
+  data.tar.gz: 234f34293f5ed0c91de1faf3edf057fb7fc2aaca
 SHA512:
-  metadata.gz: e8b827f0e3f9aa7278a596185cd8bbf30d62af0ea02c9e6937befc6a23a6a27d4d5ad6b65fcc1e19ce89bfde7bf8428b4fc5eea834c3396393ae159f945abbdd
-  data.tar.gz: 5a41679daa4924a591c7c66160f2aae3d26744423b880f2cd0eceb9b8094a14c697598ae72d5dd4a1bd50b39048351572dde148d6eb5131c5e0fa2eb083de548
+  metadata.gz: 6d2374a89542c67d991116e4cba6cffb3328d94f091e68fbacc023c7a6901e299090761d3e7d75b89723fc0a363471f9e3daf9832d1be87c90871294ec551441
+  data.tar.gz: 51f67a612250656c27aeaf0b1a744c5201aa759ebd6e586ee99df6bcf0de7a740057c6730fdbe30a70fb6b33a2e6659e6270360c9699744d4037a6d8302f65d4

data/.rubocop.yml

@@ -0,0 +1,17 @@
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 100
+Metrics/BlockLength:
+  Exclude:
+    - 'sicily.gemspec'
+    - "**/*_spec.rb"
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"
+Metrics/MethodLength:
+  Max: 5
+Metrics/ParameterLists:
+  Max: 4
+Style/GlobalVars:
+  AllowedVariables: ['$SICILY_LOG_TO_FILE']

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.3.1

data/Gemfile

@@ -1,6 +1,8 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in sicily.gemspec
 gemspec

data/Gemfile.lock

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

data/README.md

@@ -34,24 +34,29 @@ Go to your project path, and then execute:
 
 ### Modify the generated files
 
-./config/google_photo.rb
+`./config/google_photo.rb`
 
     Sicily.configure_google do |config|
       config.id = "your id"
       config.pw = "your pw"
     end
 
-./config/rules.rb
+`./config/rules.rb`
 
-    Sicily.on "~/your_folder" do
+    Sicily.on '~/your_folder' do
       fit_if_photo 2000, 2000
       google_photo
-      mv "~/your_another_folder/%Y/%m/%d"
+      mv '~/your_another_folder/%Y/%m/%d'
     end
     
-    Sicily.on "~/your_folder2" do
+    Sicily.on '~/your_folder2' do
       fit_if_photo 1000, 1000
-      cp "~/your_another_folder/%Y/%m/%d"
+      cp '~/your_another_folder/%Y/%m/%d'
+    end
+    
+    Sicily.on '~/your_folder3' do
+      google_photo
+      rm
     end
 
 ### Start & Stop

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,14 +1,16 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "sicily"
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'sicily'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/exe/sicily

@@ -1,84 +1,84 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+# frozen_string_literal: true
 
-require "sicily"
+$SICILY_LOG_TO_FILE = (ENV['SICILY_LOG'] == 'file')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), ['..', 'lib'])
 
+require 'sicily'
 
 command = ARGV[0]
 
 case command
-  when "generate"
-    require "fileutils"
-    require "sicily/generator"
+when 'generate'
+  require 'fileutils'
+  require 'sicily/generator'
 
-    Dir["./generator/*.rb"].each {|file|
-      require file
-    }
+  Dir['./generator/*.rb'].each do |file|
+    require file
+  end
 
-    FileUtils.rm_rf "./config"
-    FileUtils.mkdir_p "./config"
+  FileUtils.rm_rf './config'
+  FileUtils.mkdir_p './config'
 
-    Sicily.generators.each do |generator|
-      File.write("./config/#{generator.filename}", generator.content)
-    end
-
-    files_to_edit = Sicily.generators.map { |t| t.filename }.select { |t| not t.start_with?(".") }
-    messages_to_display = Sicily.generators.map { |t| t.post_generate_message }.select { |t| not t.to_s.empty? }
+  Sicily.generators.each do |generator|
+    File.write("./config/#{generator.filename}", generator.content)
+  end
 
-    if files_to_edit.size > 0
-      puts "Try edit the following files:"
-      files_to_edit.each do |file|
-        puts "  ./config/#{file}"
-      end
-    end
+  files_to_edit = Sicily.generators.map(&:filename).reject { |t| t.start_with?('.') }
+  messages_to_display = Sicily.generators.map(&:post_generate_message).reject { |t| t.to_s.empty? }
 
-    if messages_to_display.size > 0
-      puts ""
-      puts messages_to_display.join("\n")
+  unless files_to_edit.empty?
+    puts 'Try edit the following files:'
+    files_to_edit.each do |file|
+      puts "  ./config/#{file}"
     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 { |file|
-      unless File.exists? "./config/#{file}"
-        puts "./config/#{file} is missing!"
-        puts "  Type: `sicily generate`"
-        exit
-      end
-    }
-
-    config_files_to_load.each { |filename|
-      path = "./config/#{filename}"
-      load(path) if File.exists?(path)
-    }
-
-    sleep
-  when "start"
-    command1 = "whenever --load-file ./config/.schedule.rb --update-crontab"
-    `#{command1}`
-
-    god_file = File.expand_path("./config/.sicily.god")
-    command2 = "god -c #{god_file}"
-    `#{command2}`
-  when "stop"
-    `god stop sicily`
-    `whenever --load-file ./config/.schedule.rb --clear-crontab`
-  else
-    banner = <<-EOF
-Usage:
-  Generating config files:
-    sicily generate
-  Start monitoring in this terminal session:
-    sicily monitor
-  Start monitoring forever:
-    sicily start
-  Stop monitoring forever:
-    sicily stop
-  EOF
-    puts banner
+  end
+
+  unless messages_to_display.empty?
+    puts ''
+    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
+
+  sleep
+when 'start'
+  command1 = 'whenever --load-file ./config/.schedule.rb --update-crontab'
+  `#{command1}`
+
+  god_file = File.expand_path('./config/.sicily.god')
+  command2 = "god -c #{god_file}"
+  `#{command2}`
+when 'stop'
+  `god stop sicily`
+  `whenever --load-file ./config/.schedule.rb --clear-crontab`
+else
+  banner = <<~BANNER
+    Usage:
+      Generating config files:
+        sicily generate
+      Start monitoring in this terminal session:
+        sicily monitor
+      Start monitoring forever:
+        sicily start
+      Stop monitoring forever:
+        sicily stop
+  BANNER
+  puts banner
 end
-
-

data/generator/god.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module Sicily
   Sicily.register_generator do |generator|
-    generator.filename = ".sicily.god"
-    generator.content = <<-EOF
-God.watch do |w|
-  w.name = "sicily"
-  w.start = "sicily monitor"
-  w.dir = File.expand_path("\#{File.dirname(__FILE__)}/..")
-  w.keepalive
-end
-    EOF
+    generator.filename = '.sicily.god'
+    generator.content = <<~CONTENT
+      God.watch do |w|
+        w.name = 'sicily'
+        w.start = 'SICILY_LOG=file sicily monitor'
+        w.dir = File.expand_path("\#{File.dirname(__FILE__)}/..")
+        w.keepalive
+      end
+    CONTENT
   end
-end
+end

data/generator/google_photo.rb

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 module Sicily
   Sicily.register_generator do |generator|
-    generator.filename = "google_photo.rb"
-    generator.content = <<-EOF
-Sicily.configure_google do |config|
-  config.id = "your id"
-  config.pw = "your pw"
-end
-    EOF
-    generator.post_generate_message = <<-EOF
-To upload to Google Photos,
-  turn on "Allowing less secure apps to access your account"
-  : https://support.google.com/accounts/answer/6010255
-  *USE AT YOUR OWN RISK*
-    EOF
+    generator.filename = 'google_photo.rb'
+    generator.content = <<~CONTENT
+      # frozen_string_literal: true
+
+      Sicily.configure_google do |config|
+        config.id = 'your id'
+        config.pw = 'your pw'
+      end
+    CONTENT
+    generator.post_generate_message = <<~MESSAGE
+      To upload to Google Photos,
+        turn on "Allowing less secure apps to access your account"
+        : https://support.google.com/accounts/answer/6010255
+        *USE AT YOUR OWN RISK*
+    MESSAGE
   end
-end
+end

data/generator/rules.rb

@@ -1,17 +1,26 @@
+# frozen_string_literal: true
+
 module Sicily
   Sicily.register_generator do |generator|
-    generator.filename = "rules.rb"
-    generator.content = <<-EOF
-Sicily.on "~/your_folder" do
-  fit_if_photo 2000, 2000
-  google_photo
-  mv "~/your_another_folder/%Y/%m/%d"
-end
+    generator.filename = 'rules.rb'
+    generator.content = <<~CONTENT
+      # frozen_string_literal: true
 
-Sicily.on "~/your_folder2" do
-  fit_if_photo 1000, 1000
-  cp "~/your_another_folder/%Y/%m/%d"
-end
-    EOF
+      Sicily.on '~/your_folder' do
+        fit_if_photo 2000, 2000
+        google_photo
+        mv '~/your_another_folder/%Y/%m/%d'
+      end
+
+      Sicily.on '~/your_folder2' do
+        fit_if_photo 1000, 1000
+        cp '~/your_another_folder/%Y/%m/%d'
+      end
+
+      Sicily.on '~/your_folder3' do
+        google_photo
+        rm
+      end
+    CONTENT
   end
-end
+end

data/generator/schedule.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Sicily
   Sicily.register_generator do |generator|
-    generator.filename = ".schedule.rb"
-    generator.content = <<-EOF
-every :hour do
-	god_file = File.expand_path("\#{File.dirname(__FILE__)}/.sicily.god")
-  command "god -c \#{god_file}"
-end
-    EOF
+    generator.filename = '.schedule.rb'
+    generator.content = <<~CONTENT
+      every :hour do
+        god_file = File.expand_path("\#{File.dirname(__FILE__)}/.sicily.god")
+        command "god -c \#{god_file}"
+      end
+    CONTENT
   end
-end
+end

data/lib/sicily.rb

@@ -1,33 +1,59 @@
-require "sicily/version"
-require "sicily/config"
-require "sicily/monitor"
-require "sicily/util/file_util"
-require "sicily/task_loader"
+# frozen_string_literal: true
 
-module Sicily
-  @monitored_paths = []
+require 'sicily/version'
+require 'sicily/logger'
+require 'sicily/config'
+require 'sicily/monitor'
+require 'sicily/util/file_util'
+require 'sicily/task_loader'
+require 'sicily/error/monitor_error'
 
+module Sicily
   TaskLoader.new.load_all_tasks
 
-  def self.on(path, &block)
-    if self.can_monitor?(@monitored_paths, path)
-      self.start_monitor!(path, &block)
-    else
-      puts "cannot monitor : #{path}"
+  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
-  end
 
-  def self.start_monitor!(path, &block)
-    @monitored_paths << File.expand_path(path)
-    Monitor.new.on(path, &block)
-  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.can_monitor?(prev_paths, new_path)
-    prev_paths.each do |prev_path|
-      return false if Util::FileUtil.is_related?(prev_path, new_path) ||
-          Util::FileUtil.is_related?(new_path, prev_path)
+    def self.store_monitored_path(path)
+      @monitored_paths << File.expand_path(path)
     end
 
-    true
+    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
+
+  def self.on(path, &user_rule_block)
+    MonitorWrapper.on path, &user_rule_block
   end
 end