expire 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2818cf2a154487c32c4019de8278bc16866d1ca333eba0df45b5abf65859696
-  data.tar.gz: fc10fcc4ef4e17800fdda73b4293fd071a1725d9140604e89967299dfca122e5
+  metadata.gz: 2d4ddc1687a8426af756b2f05b58b00593a913c9456ffc4dcae598b5d584dd09
+  data.tar.gz: d7411d8f08e1ee04e555b80185cafd8ae8201f05ae728a870dc5aab2a6093601
 SHA512:
-  metadata.gz: 0b34e9c57c67bc0ca624b8f8050af4e861b681806804f582e813c0850c153f0078cd60e9f17efafce086433ed0b78ce6f9068e152478db3a3bc926225cef24d3
-  data.tar.gz: f6af0819e14453eee1f54623c59d9e10fc549307e0f4b357234c9163cc827bee6a27f7888cf7a879bc60588e65fa269c4d84112fe8699c4b5c8bf6376bdeb7d7
+  metadata.gz: 357a3b63616fcb927df32c30fb6b6bdec735466558577aca56281b85220f68f9f21b07594d86b5e960e9dd533d177095368b64d428d50a93d2e27a3567229409
+  data.tar.gz: cabf11400e9be4d03a9291095e21b31cc7859c3edf86f92bee0b378b1414ab33740f7022ba880c32decd8c34963ecf7c5edd972596d31bcf4aa8b355f0ea60a7

data/Gemfile.lock

@@ -1,145 +1,133 @@
 PATH
   remote: .
   specs:
-    expire (0.2.0)
-      activesupport (~> 6.1)
+    expire (0.2.1)
+      activesupport (~> 7.0)
       pastel (~> 0.8)
-      thor (~> 1.1)
+      thor (~> 1.2)
       zeitwerk (~> 2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.2.1)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aruba (1.0.4)
+    aruba (2.1.0)
+      bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 9.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.3)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.8)
-    contracts (0.16.0)
-    cucumber (5.3.0)
+    childprocess (4.1.0)
+    concurrent-ruby (1.2.0)
+    contracts (0.17)
+    cucumber (8.0.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      cucumber-wire (~> 4.0, >= 4.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.4)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.2.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    ffi (1.14.2)
-    i18n (1.8.9)
+      cucumber-ci-environment (~> 9.0, >= 9.0.4)
+      cucumber-core (~> 11.0, >= 11.0.0)
+      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-html-formatter (~> 19.1, >= 19.1.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      diff-lcs (~> 1.5, >= 1.5.0)
+      mime-types (~> 3.4, >= 3.4.1)
+      multi_test (~> 1.1, >= 1.1.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-ci-environment (9.1.0)
+    cucumber-core (11.0.0)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-cucumber-expressions (15.2.0)
+    cucumber-gherkin (23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-html-formatter (19.2.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-messages (18.0.0)
+    cucumber-tag-expressions (4.1.0)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    ffi (1.15.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     kwalify (0.7.2)
-    middleware (0.1.0)
-    minitest (5.14.3)
-    multi_test (0.1.2)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    minitest (5.17.0)
+    multi_test (1.1.0)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    psych (3.3.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    reek (6.0.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    reek (6.1.2)
       kwalify (~> 0.7.0)
-      parser (~> 3.0.0)
-      psych (~> 3.1)
+      parser (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.10.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.40.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-rspec (2.2.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.16.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.4)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.1.0)
-    thread_safe (0.3.6)
+    thor (1.2.1)
     tty-color (0.6.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.3.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 1.0)
-  bundler (~> 2.1)
+  aruba (~> 2.1)
+  bundler (~> 2.3)
   byebug (~> 11.1)
-  cucumber (~> 5.3)
+  cucumber (~> 8.0)
   expire!
   rake (~> 13.0)
   reek (~> 6.0)
@@ -149,4 +137,4 @@ DEPENDENCIES
   simplecov (~> 0.21)
 
 BUNDLED WITH
-   2.2.3
+   2.3.26

data/README.md

@@ -68,7 +68,7 @@ The `purge` command is used to calculate and delete expired backups.
 It is invoked as follows:
 
 ``` shell
-expire path/to/backups <rules>
+expire purge path/to/backups <rules>
 ```
 
 This would delete, according to the rules, all expired backups under `path/to/backups`.
@@ -81,7 +81,7 @@ The `--simulate` option is suitable for this purpose.
 To check the expire-rules you can call `expire purge` with the `--simulate` option:
 
 ``` shell
-expire path/to/backups <rules> --simulate
+expire purge path/to/backups <rules> --simulate
 ```
 
 When `purge` is called this way it will calculate the expired backups
@@ -427,8 +427,6 @@ Some **invalid** filenames:
 2021011911134501 # 16 digits are too much
 ```
 
-Date detection via ctime or mtime is planned for a future release.
-
 ## Newest
 
 The `newest` command shows the newest backup:

data/expire.gemspec

@@ -36,15 +36,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '~> 6.1'
+  spec.add_dependency 'activesupport', '~> 7.0'
   spec.add_dependency 'pastel', '~> 0.8'
-  spec.add_dependency 'thor', '~> 1.1'
+  spec.add_dependency 'thor', '~> 1.2'
   spec.add_dependency 'zeitwerk', "~> 2.4"
 
-  spec.add_development_dependency 'aruba', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'aruba', '~> 2.1'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'byebug', '~> 11.1'
-  spec.add_development_dependency 'cucumber', '~> 5.3'
+  spec.add_development_dependency 'cucumber', '~> 8.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'reek', '~> 6.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/expire/backup.rb

@@ -5,8 +5,8 @@ module Expire
   class Backup < Delegator
     include Comparable
 
-    def initialize(datetime:, pathname:)
-      @datetime = datetime
+    def initialize(time:, pathname:)
+      @time     = time
       @pathname = pathname
 
       # @reasons_to_keep is a Set so a reason can added multiple times
@@ -14,8 +14,8 @@ module Expire
       @reasons_to_keep = Set.new
     end
 
-    attr_reader :datetime, :pathname, :reasons_to_keep
-    alias __getobj__ datetime
+    attr_reader :time, :pathname, :reasons_to_keep
+    alias __getobj__ time
 
     def same_hour?(other)
       return false unless same_day?(other)
@@ -52,17 +52,21 @@ module Expire
     # The <=> method seems not to be delegated so we need to implement it
     # Note that this Class includes the Comparable module
     def <=>(other)
-      datetime <=> other.datetime
+      time <=> other.time
     end
 
     def add_reason_to_keep(reason)
       reasons_to_keep << reason
     end
 
-    # def datetime
-    #   backup.datetime
+    # def time
+    #   backup.time
     # end
 
+    def cweek
+      time&.strftime('%V').to_i
+    end
+
     def expired?
       reasons_to_keep.empty?
     end
@@ -70,5 +74,9 @@ module Expire
     def keep?
       reasons_to_keep.any?
     end
+
+    def to_s
+      time.strftime('%Y-%m-%dT%H:%M')
+    end
   end
 end

data/lib/expire/backup_from_path_service.rb

@@ -3,26 +3,23 @@
 module Expire
   # Take a path and return an instance of Expire::Backup
   class BackupFromPathService
-    def self.call(path:, by: :path)
-      new(path: path, by: by).call
+    def self.call(path:)
+      new(path: path).call
     end
 
-    def initialize(path:, by: :path)
-      @by       = by
+    def initialize(path:)
       @pathname = Pathname.new(path)
-
-      raise ArgumentError, "by: must be :ctime, :mtime or :path, not #{by}" unless %i[ctime mtime path].include?(by)
     end
 
     attr_reader :by, :pathname
 
     def call
-      Backup.new(datetime: datetime, pathname: pathname)
+      Backup.new(time: time, pathname: pathname)
     end
 
     private
 
-    def datetime
+    def time
       digits = extract_digits
 
       year   = digits[0..3].to_i
@@ -31,13 +28,16 @@ module Expire
       hour   = digits[8..9].to_i
       minute = digits[10..11].to_i
 
-      datetime_for(year, month, day, hour, minute)
+      time_for(year, month, day, hour, minute)
     end
 
-    def datetime_for(year, month, day, hour, minute)
-      DateTime.new(year, month, day, hour, minute)
+    def time_for(year, month, day, hour, minute)
+      Date.new(year, month, day)
+      Time.new(year, month, day, hour, minute)
     rescue Date::Error
-      raise InvalidPathError, "can't construct date and time from #{pathname}" 
+      raise InvalidPathError, "can't construct date and time from #{pathname}"
+    rescue ArgumentError
+      raise InvalidPathError, "can't construct date and time from #{pathname}"
     end
 
     def extract_digits

data/lib/expire/backup_list.rb

@@ -46,8 +46,8 @@ module Expire
       backups.min
     end
 
-    def not_older_than(reference_datetime)
-      sort.select { |backup| backup.datetime >= reference_datetime }
+    def not_older_than(reference_time)
+      sort.select { |backup| backup.time >= reference_time }
     end
 
     def expired

data/lib/expire/cli.rb

@@ -90,6 +90,7 @@ module Expire
         Expire::Commands::Newest.new(path, options).execute
       end
     end
+
     # Play with test-data
     class Playground < Thor
       desc 'create PATH', 'play with test-data'

data/lib/expire/from_now_keep_adjective_for_rule_base.rb

@@ -20,9 +20,9 @@ module Expire
 
     attr_reader :unit
 
-    def apply(backups, reference_datetime)
-      minimal_datetime = reference_datetime - amount.send(unit)
-      kept = backups.one_per(spacing).not_older_than(minimal_datetime)
+    def apply(backups, reference_time)
+      minimal_time = reference_time - amount.send(unit)
+      kept = backups.one_per(spacing).not_older_than(minimal_time)
 
       kept.each { |backup| backup.add_reason_to_keep(reason_to_keep) }
     end

data/lib/expire/from_now_keep_most_recent_for_rule.rb

@@ -21,9 +21,9 @@ module Expire
 
     attr_reader :unit
 
-    def apply(backups, datetime_now)
-      reference_datetime = datetime_now - amount.send(unit)
-      kept = backups.not_older_than(reference_datetime)
+    def apply(backups, time_now)
+      reference_time = time_now - amount.send(unit)
+      kept = backups.not_older_than(reference_time)
 
       kept.each do |backup|
         backup.add_reason_to_keep(reason_to_keep)

data/lib/expire/from_range_value.rb

@@ -11,7 +11,7 @@ module Expire
     (\s+|\.)
     (hour|day|week|month|year)s?
     \z
-    /x.freeze
+    /x
 
     def from_value(string, **args)
       # return new(args.merge({ amount: 0, unit: nil })) if string.none?

data/lib/expire/keep_most_recent_for_rule.rb

@@ -16,8 +16,8 @@ module Expire
     end
 
     def apply(backups, _)
-      reference_datetime = backups.newest
-      super(backups, reference_datetime)
+      reference_time = backups.newest
+      super(backups, reference_time)
     end
 
     def rank

data/lib/expire/playground.rb

@@ -33,7 +33,7 @@ module Expire
     def create
       raise_if_backups_dir_exists
 
-      oldest_backup = DateTime.now
+      oldest_backup = Time.now
 
       STEP_WIDTHS.each do |adjective, noun|
         options[adjective.to_sym].times do
@@ -45,8 +45,8 @@ module Expire
 
     private
 
-    def mkbackup(datetime)
-      backup_name = datetime.to_s.sub(/:\d\d[+-]\d\d:\d\d\z/, '')
+    def mkbackup(time)
+      backup_name = time.strftime('%Y-%m-%dT%H:%M')
       FileUtils.mkdir_p("#{backups_dir}/#{backup_name}")
     end
 

data/lib/expire/purge_service.rb

@@ -25,7 +25,7 @@ module Expire
     private
 
     def annotated_backup_list
-      @annotated_backup_list ||= rules.apply(backup_list, DateTime.now)
+      @annotated_backup_list ||= rules.apply(backup_list, Time.now)
     end
 
     def backup_list

data/lib/expire/rules.rb

@@ -35,8 +35,8 @@ module Expire
       rules.any?
     end
 
-    def apply(backups, reference_datetime)
-      rules.sort.each { |rule| rule.apply(backups, reference_datetime) }
+    def apply(backups, reference_time)
+      rules.sort.each { |rule| rule.apply(backups, reference_time) }
 
       backups
     end

data/lib/expire/version.rb

@@ -3,7 +3,7 @@
 module Expire
   MAJOR = 0
   MINOR = 2
-  TINY  = 0
+  TINY  = 1
 
   VERSION = [MAJOR, MINOR, TINY].compact * '.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expire
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thomas Regnet
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,8 +206,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-description:
-email:
+description: 
+email: 
 executables:
 - expire
 extensions: []
@@ -299,7 +299,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/thomasregnet/expire
   source_code_uri: https://github.com/thomasregnet/expire
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -314,8 +314,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: Calculate expired backups.
 test_files: []