imagesorter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5ce17c344a92e399f3654dfef66291a1ab44fe5
-  data.tar.gz: aefc58447eb3ae56149cd7a0190889446680dcd0
+  metadata.gz: 64e5b3c929c90c57ea0da7cab2671f5da16b7ce7
+  data.tar.gz: 2ccf08ee293fee96fae9db196bb484039b895da9
 SHA512:
-  metadata.gz: 5aab53b23f7146ac247d76ca4dd5a8095655363c1277d968522db98677d0a148a696d090c18573cb678c54e5a996549c00009b78bb50ee5d1415b92f933f0d20
-  data.tar.gz: cdd1a773adc3a435e68455818f5b59241979b4335d4ccc14a64818fe6e6fb82ee2879b49624ccae648541b08216bca371d844c97589de2e182bf50e47c79f8e6
+  metadata.gz: a456b17664abb93d4fd8838a1b044bc48748ef37b44f950438db762359b48f290293169e8ef815edd336381dc77cede7db61ae86e51b1542022cceb19ae4e31e
+  data.tar.gz: 9f6876751171848f87fe56bce6b8d491b28803025d67117d118fcea493d50b940c58702b9806e0796653dbc56db42442c88ef508b42bdcbcbf15dea1015f6fcc

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.4
 
 Metrics/LineLength:
   Max: 160

data/.rubocop_todo.yml

@@ -1,33 +1,21 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-08-09 21:58:47 +0300 using RuboCop version 0.49.1.
+# on 2019-11-02 20:56:11 +0200 using RuboCop version 0.76.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 3
 Metrics/AbcSize:
-  Max: 38
+  Max: 19
 
-# Offense count: 7
-# Configuration parameters: CountComments.
+# Offense count: 5
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 54
+  Max: 14
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 7
-
-# Offense count: 6
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/imagesorter/file_batch_processor.rb'
-    - 'lib/imagesorter/file_exif_categorizer.rb'
-    - 'lib/imagesorter/file_stat_categorizer.rb'
-    - 'lib/imagesorter/file_system_processor.rb'
-    - 'lib/imagesorter/gem.rb'
-    - 'lib/imagesorter/option_parser.rb'

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.1] - 2019-11-02
+### Fixed
+ - Added missing require for OptionParser
+### Added
+ - .cr2 extension as a default
+### Changed
+ - Drop support for deprecated Rubies, 2.4 required
+
 ## [1.0.0] - 2017-08-12
 ### Added
  - Initial release

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 require 'rspec/core/rake_task'

data/imagesorter.gemspec

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name              = 'imagesorter'
-  s.version           = File.read(File.expand_path('../version', __FILE__)).strip
+  s.version           = File.read(File.expand_path('version', __dir__)).strip
   s.description       = 'Command line tool for sorting photos and videos'
   s.summary           = 'Command line tool for sorting photos and videos'
   s.authors           = ['Joakim Antman']
@@ -19,16 +19,16 @@ Gem::Specification.new do |s|
   s.bindir            = 'exe'
   s.executables       = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.4'
 
   s.add_dependency 'exifr'
   s.add_dependency 'progressbar'
   s.add_dependency 'r18n-core'
 
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'simplecov'
 end

data/lib/imagesorter.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'ostruct'
 require 'r18n-core'
 require 'exifr/jpeg'
+require 'json'
 
 R18n.set('en')
 

data/lib/imagesorter/categorizers/file_exif_categorizer.rb

@@ -12,8 +12,9 @@ module Imagesorter
 
         time = exif.date_time
         return nil if time.nil?
+
         file.time = time
-      rescue
+      rescue StandardError
         nil
       end
     end

data/lib/imagesorter/categorizers/file_stat_categorizer.rb

@@ -10,6 +10,7 @@ module Imagesorter
       def process(file)
         time = file.file.send(@stat)
         return nil if time.nil?
+
         file.time = time
       end
     end

data/lib/imagesorter/cmd.rb

@@ -27,26 +27,18 @@ module Imagesorter
     rescue Interrupt
       puts 'FAIL: INTERRUPTED'
       exit 1
-    rescue => e
+    rescue StandardError => e
       puts e
+      puts e.backtrace
       exit 2
     end
 
     private
 
     def setup_logger
+      Imagesorter.logger = Logger.new(@options.logfile) if @options.logfile
 
-      if @options.logfile
-        Imagesorter.logger = Logger.new(@options.logfile)
-      end
-
-      if @options.verbose == true
-        Imagesorter.logger.level = Logger::DEBUG
-      elsif @options.silent == true && !@options.logfile
-        Imagesorter.logger.level = Logger::FATAL
-      else
-        Imagesorter.logger.level = Logger::INFO
-      end
+      Imagesorter.logger.level = resolve_log_level
 
       Imagesorter.logger.formatter = proc do |severity, datetime, _progname, msg|
         date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
@@ -58,6 +50,14 @@ module Imagesorter
       end
     end
 
+    def resolve_log_level
+      return Logger::DEBUG if @options.verbose == true
+
+      return Logger::FATAL if @options.silent == true && !@options.logfile
+
+      Logger::INFO
+    end
+
     def setup_locale
       R18n.locale(@options.locale)
       R18n.set(@options.locale)
@@ -65,18 +65,16 @@ module Imagesorter
 
     def batch_options
       options = {
-        source:     @options.source,
-        recursive:  @options.recursive,
+        source: @options.source,
+        recursive: @options.recursive,
         extensions: @options.extensions,
-        processor:  Imagesorter::FileSystemProcessor.new(destination:     @options.dest,
+        processor: Imagesorter::FileSystemProcessor.new(destination: @options.dest,
                                                         destination_fmt: @options.destination_format,
-                                                        copy_mode:       @options.copy_mode,
-                                                        test:            @options.test)
+                                                        copy_mode: @options.copy_mode,
+                                                        test: @options.test)
       }
 
-      if progressbar_enabled?
-        options[:progress_proc] = proc { |progress_options| progress(progress_options) }
-      end
+      options[:progress_proc] = proc { |progress_options| progress(progress_options) } if progressbar_enabled?
 
       options
     end
@@ -88,7 +86,7 @@ module Imagesorter
     end
 
     def finalize
-      @progressbar.finish if @progressbar
+      @progressbar&.finish
     end
 
     def progressbar_enabled?

data/lib/imagesorter/file_batch_processor.rb

@@ -54,6 +54,7 @@ module Imagesorter
 
     def collect_file_from_dir(dir, file)
       return if file =~ /^\.\.?$/
+
       full_path = File.join(dir, file)
 
       if File.directory?(full_path)
@@ -80,12 +81,11 @@ module Imagesorter
         queue_categorizing(file)
       end
     end
-    require 'json'
+
     def queue_categorizing(file)
       queue_job do
         file.process!(@categorizer)
-
-        Imagesorter.logger.debug "#{file.file.path} metadata: #{JSON.pretty_generate(file.to_h)}"
+        # Imagesorter.logger.debug "#{file.file.path} metadata: #{JSON.pretty_generate(file.to_h)}"
 
         increment(@categorizer.step_name)
         queue_proceesing(file)
@@ -94,6 +94,7 @@ module Imagesorter
 
     def queue_proceesing(file)
       return if @processor.nil?
+
       queue_job do
         file.process!(@processor)
         increment(@processor.step_name)
@@ -102,6 +103,7 @@ module Imagesorter
 
     def increment(step)
       return if @progress_proc.nil?
+
       @progress_proc.call(step: step.ljust(14, ' '),
                           total_steps: @total_steps)
     end

data/lib/imagesorter/file_system_processor.rb

@@ -23,39 +23,17 @@ module Imagesorter
     def process(file)
       source = file.file.path
 
-      destination_params = {
-        full_name: File.basename(source),
-        name:      File.basename(source, '.*'),
-        extension: File.extname(source).delete('.')
-      }
-
-      dest = begin
-        File.join(@destination, format(l(file.time, @destination_fmt), file.to_h.merge(destination_params)))
-      rescue KeyError => e
-        Imagesorter.logger.warn e.message
-
-        key = /^key<(.*)> not found$/.match(e.message)[1]
-
-        unless key.nil?
-          destination_params[key.to_sym] = ''
-          retry
-        else
-          raise
-        end
-      end
-
-      return if dest.nil?
-
-      dest = handle_duplicate(source, dest)
+      dest = handle_duplicate(source, format_destination(file, full_name: File.basename(source),
+                                                               name: File.basename(source, '.*'),
+                                                               extension: File.extname(source).delete('.')))
 
       return if dest.nil?
 
-      dest_dir = File.dirname(dest)
-
       Imagesorter.logger.info "#{step_name} #{source} to #{dest}"
 
       return if @test
 
+      dest_dir = File.dirname(dest)
       FileUtils.mkdir_p(dest_dir) unless File.directory?(dest_dir)
 
       if @copy_mode == :move
@@ -65,7 +43,21 @@ module Imagesorter
       end
     end
 
+    def format_destination(file, destination_params)
+      File.join(@destination, format(l(file.time, @destination_fmt), file.to_h.merge(destination_params)))
+    rescue KeyError => e
+      Imagesorter.logger.warn e.message
+
+      key = /^key<(.*)> not found$/.match(e.message)[1]
+
+      raise if key.nil?
+
+      destination_params[key.to_sym] = ''
+      retry
+    end
+
     def handle_duplicate(source, dest)
+      return nil if dest.nil?
       return dest unless File.exist?(dest)
 
       return nil if FileUtils.identical?(source, dest) # skip if identical
@@ -74,7 +66,7 @@ module Imagesorter
       extname  = File.extname(dest)
       dirname  = File.dirname(dest)
 
-      sequence = 1 # TODO, Figure out current sequence number
+      sequence = 1
 
       handle_duplicate(source, File.join(dirname, "#{basename}_#{sequence}#{extname}"))
     end

data/lib/imagesorter/gem.rb

@@ -14,7 +14,7 @@ module Imagesorter
   # Gem related helpers
   module Gem
     def self.root
-      @root ||= File.expand_path('../../..', __FILE__)
+      @root ||= File.expand_path('../..', __dir__)
     end
 
     def self.version

data/lib/imagesorter/option_parser.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
+require 'optparse'
+
 module Imagesorter
   module OptionParser
     DEFAULT_OPTIONS = {
-      silent:    false,
-      test:      false,
+      silent: false,
+      test: false,
       recursive: false,
       copy_mode: :copy,
-      threads:   1,
-      locale:    'en-us',
-      extensions: %w[JPG JPEG MP4 MOV],
+      threads: 1,
+      locale: 'en-us',
+      extensions: %w[JPG JPEG MP4 MOV PNG CR2],
       destination_format: '%Y/%m/%d/%{full_name}' # rubocop:disable Style/FormatStringToken
     }.freeze
 
-    def self.parse(argv)
+    def self.parse(argv) # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize
       options = OpenStruct.new(DEFAULT_OPTIONS)
 
       # rubocop:disable Metrics/BlockLength
@@ -81,6 +83,7 @@ module Imagesorter
           exit
         end
       end
+      # rubocop:enable Metrics/BlockLength
 
       parser.parse!(argv)
 
@@ -97,6 +100,7 @@ module Imagesorter
       mandatory = %i[source dest]
       missing = mandatory.select { |param| options[param].nil? }
       return if missing.empty?
+
       raise ::OptionParser::MissingArgument, missing.join(', ')
     end
   end

data/version

@@ -1 +1 @@
-1.0.0
+1.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagesorter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joakim Antman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Command line tool for sorting photos and videos