renamr 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6265009239848244a1e2c0afb669182e1b191e85950c7ea72a00981a8d8025
-  data.tar.gz: b07631f073ae76b937a53a8de4f5c48ac7f7fe23b99dccb58416d9b51ecf17f5
+  metadata.gz: a7d2f86576404f3c74e428b0a69264e22dbd67675e0255aaad242286919bc178
+  data.tar.gz: c530689b44dfd307776c98f2e4d7674f2d29ec454373e6886bc3863e47137f13
 SHA512:
-  metadata.gz: 3579712ddb5dc5478741d87619d5d19123fdddca384b27cb0447795f9a22601a6ff8a8b6766459fc1be08c75fa700bf7363145ec5162d9ceea65ba7fecae5b7a
-  data.tar.gz: '086c3f7f2bce22ffe8b6aface8863102f35485eb0f501eaa0578f5c75365207bdbaec8b0fa24967ff9e4c40c3467ff1c25bc5c645ca0bc4bf69cda3285de7e60'
+  metadata.gz: cac26d37fc0d75e4442495f9621c2ef177fdf818bdd9d763e3ff5c4db535d5da0e9b18a22a5cf1665e50dafafefa552b1e3e55d3dc9b58933d90db810362ffe8
+  data.tar.gz: 5ca1f6f01a3326a3641f9c56f71559432996473e440756d2316f97850e072b080c541d17cf6bfdee9057c3611b19a90b1d5f06e3740c06a714565e393e324ceb

data/Gemfile

@@ -6,8 +6,10 @@
 source 'https://rubygems.org'
 ruby '~>2.6'
 
+gem 'date', '2.0.0'
 gem 'fileutils', '1.4.1'
 gem 'i18n', '1.8.3'
+gem 'minitest', '5.11.3'
 gem 'pidfile', '0.3.0'
 gem 'rake', '13.0.1'
 gem 'rubocop', '0.76.0'

data/README.md

@@ -19,12 +19,12 @@ Version](https://badge.fury.io/rb/renamr.svg)](https://badge.fury.io/rb/renamr)
 * [License](#license)
 
 ## About
-Hi, I'm [David Rabkin](https://www.rabkin.co.il). I created this tool to
+Hi, I'm [David Rabkin](http://davi.drabk.in). I created this tool to
 orginize multiple files.
 
 ## Installation
 The tool is designed to work on macOS, GNU/Linux, Windows, Unix-like OS. It is
-packaged as a Gem and require Ruby version 2.4 or later.  See «[Installing
+packaged as a Gem and require Ruby version 2.6 or later.  See «[Installing
 Ruby](https://www.ruby-lang.org/en/documentation/installation/)» if you don't
 have the proper version on your platform.
 
@@ -61,5 +61,5 @@ It renames all files in `source` by default pattern: 26 English letters,
 10 numbers, minus for spaces and other symbols.
 
 ## License
-Renamr is copyright [David Rabkin](http://www.rabkin.co.il/) and
+Renamr is copyright [David Rabkin](http://davi.drabk.in) and
 available under a [2-Claus BSD license](https://github.com/rdavid/renamr/blob/master/LICENSE).

data/Rakefile

@@ -6,5 +6,7 @@
 task default: %w[test]
 
 task :test do
-  # ruby 'test/unittest.rb'
+  ruby 'test/test_char.rb'
+  ruby 'test/test_date.rb'
+  ruby 'test/test_trim.rb'
 end

data/lib/renamr/date.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# vi:ts=2 sw=2 tw=79 et lbr wrap
+# Copyright 2020-present David Rabkin
+
+require 'date'
+require_relative 'action'
+
+module Renamr
+  # Replaces any valid date, e.g. 2020-11-02 or 02-11-2020 with 20201102.
+  class DateAction < Action
+    REG = /(\d+)-(\d+)-(\d+)/.freeze
+    PAT = ['%m-%d-%Y', '%d-%m-%Y', '%Y-%m-%d', '%Y-%d-%m'].freeze
+
+    def validate(dat)
+      return nil if dat < Date.new(1900, 1, 1)
+
+      return nil if dat > Date.new(2099, 1, 1)
+
+      dat
+    end
+
+    def date(sub)
+      PAT.each do |pat|
+        begin
+          return Date.strptime(sub, pat)
+        rescue ArgumentError
+          # Nothing to do.
+        end
+      end
+    end
+
+    def do(src)
+      sub = src[REG]
+      return src if sub.nil?
+
+      dat = date(sub)
+      return src if dat.nil?
+
+      dat = validate(dat)
+      return src if dat.nil?
+
+      src.sub!(REG, dat.strftime('%Y%m%d'))
+    end
+  end
+end

data/lib/renamr/factory.rb

@@ -6,6 +6,7 @@
 require_relative 'ascii_validator'
 require_relative 'auto_localization'
 require_relative 'char'
+require_relative 'date'
 require_relative 'downcase'
 require_relative 'existence'
 require_relative 'manual_localization'
@@ -28,7 +29,7 @@ module Renamr
       @cfg = cfg
     end
 
-    def produce(dir) # rubocop:disable MethodLength, AbcSize
+    def produce(dir) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       if @cfg.lim?
         [
           OmitAction.new(LIMIT),
@@ -49,7 +50,8 @@ module Renamr
           ASCIIValidatorAction.new,
           TrimAction.new,
           TruncateAction.new(LIMIT),
-          ExistenceAction.new(dir, LIMIT)
+          DateAction.new,
+          ExistenceAction.new(dir, LIMIT) # Should be the last.
         ].compact
       end
     end

data/lib/renamr/version.rb

@@ -4,5 +4,5 @@
 # Copyright 2018-present David Rabkin
 
 module Renamr
-  VERSION = '1.0.3'
+  VERSION = '1.0.6'
 end

data/renamr.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |s|
   s.executables = ['renamr']
   s.extra_rdoc_files = ['LICENSE.txt', 'README.md']
   s.require_paths = ['lib']
+  s.add_runtime_dependency 'date', '2.0.0'
   s.add_runtime_dependency 'fileutils', '1.4.1'
   s.add_runtime_dependency 'i18n', '1.8.3'
   s.add_runtime_dependency 'pidfile', '0.3.0'
   s.add_runtime_dependency 'terminal-table', '1.8.0'
+  s.add_development_dependency 'minitest', '6.11.3'
   s.add_development_dependency 'rake', '13.0.1'
   s.add_development_dependency 'rubocop', '0.85.1'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: renamr
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - David Rabkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: date
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +132,6 @@ extra_rdoc_files:
 - README.md
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -116,6 +143,7 @@ files:
 - lib/renamr/auto_localization.rb
 - lib/renamr/char.rb
 - lib/renamr/configurator.rb
+- lib/renamr/date.rb
 - lib/renamr/downcase.rb
 - lib/renamr/existence.rb
 - lib/renamr/factory.rb

data/Gemfile.lock

@@ -1,43 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    concurrent-ruby (1.1.6)
-    fileutils (1.4.1)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    pidfile (0.3.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fileutils (= 1.4.1)
-  i18n (= 1.8.3)
-  pidfile (= 0.3.0)
-  rake (= 13.0.1)
-  rubocop (= 0.76.0)
-  terminal-table (= 1.8.0)
-
-RUBY VERSION
-   ruby 2.6.3p62
-
-BUNDLED WITH
-   2.1.4