artifactory-cleaner 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b485350297e6f2c8eb614e7bfe52e1b62304eb48ec55e5a90609ddb7a7b15a48
-  data.tar.gz: 839c67c19afe1c5b5924a0313b55d421ea584737211731a52bf30a61449e4335
+  metadata.gz: 651c4273cd326a97138339f39293a026ce2803f78c64ddde62efed509e664402
+  data.tar.gz: d197cf8c783f274eeed318d793cc0568a7a348c7f6badf4c8eb66c5aaa7d783f
 SHA512:
-  metadata.gz: 5b237cc83e3f164a2b4bf4dfe49d6875070c8def2aed11dc293f4a8da4dde1c2eb114dbadd705454f297a0cee09a7e8a73903db77b3625fb8bc442fe90b3d9d7
-  data.tar.gz: ac6d4da3caffa2d0a9e92015586bfc0f189c6aaadd7826bfc1b30252a33b220742328dca381616857b233956d7c588e34aa2c2042d139fc73756f295559034d8
+  metadata.gz: 65103fc134d051f65782980c236676f6d03dcc0bbf87461892671162ad07582ea782aadd4433d482dd4c475f8f52607998253506bf1795b298710e78fa32bf49
+  data.tar.gz: 7f7f3aef50dd02503c975c7fbd85fded4a851a352156e8f94aa842a3268f409100cd53a36e9401064ee41309eb1242192193eecec9983921e12ae6ef19ec25eb

data/.rspec_status

@@ -1,39 +1,39 @@
 example_id                                   | status | run_time        |
 -------------------------------------------- | ------ | --------------- |
-./spec/artifactory/cleaner_spec.rb[1:1]      | passed | 0.00062 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:1]    | passed | 0.00075 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:2]    | passed | 0.00009 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:3]    | passed | 0.00007 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:4]    | passed | 0.00011 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:5]    | passed | 0.00007 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:6]    | passed | 0.00035 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:7:1]  | passed | 0.00042 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:7:2]  | passed | 0.00083 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:7:3]  | passed | 0.00019 seconds |
+./spec/artifactory/cleaner_spec.rb[1:1]      | passed | 0.00158 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:1]    | passed | 0.00164 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:2]    | passed | 0.00011 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:3]    | passed | 0.00077 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:4]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:5]    | passed | 0.00011 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:6]    | passed | 0.00179 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:7:1]  | passed | 0.00028 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:7:2]  | passed | 0.00309 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:7:3]  | passed | 0.00071 seconds |
 ./spec/artifactory/cleaner_spec.rb[1:2:7:4]  | passed | 0.00006 seconds |
-./spec/artifactory/cleaner_spec.rb[1:2:7:5]  | passed | 0.00007 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:1]    | passed | 0.00011 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:2]    | passed | 0.00008 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:3]    | passed | 0.00008 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:4]    | passed | 0.00011 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:5]    | passed | 0.00007 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:6]    | passed | 0.00186 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:7]    | passed | 0.00017 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:8]    | passed | 0.00007 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:9]    | passed | 0.00052 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:10:1] | passed | 0.00331 seconds |
-./spec/artifactory/cleaner_spec.rb[1:3:11:1] | passed | 0.01888 seconds |
-./spec/artifactory/cleaner_spec.rb[1:4:1]    | passed | 0.0001 seconds  |
-./spec/artifactory/cleaner_spec.rb[1:5:1]    | passed | 0.00009 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:2]    | passed | 0.00012 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:3]    | passed | 0.00006 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:4]    | passed | 0.00009 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:5]    | passed | 0.00012 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:6]    | passed | 0.00006 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:7:1]  | passed | 0.00006 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:7:2]  | passed | 0.00012 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:7:3]  | passed | 0.00021 seconds |
+./spec/artifactory/cleaner_spec.rb[1:2:7:5]  | passed | 0.00009 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:1]    | passed | 0.00081 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:2]    | passed | 0.00011 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:3]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:4]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:5]    | passed | 0.00056 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:6]    | passed | 0.00585 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:7]    | passed | 0.00024 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:8]    | passed | 0.00014 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:9]    | passed | 0.00058 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:10:1] | passed | 0.00205 seconds |
+./spec/artifactory/cleaner_spec.rb[1:3:11:1] | passed | 0.00278 seconds |
+./spec/artifactory/cleaner_spec.rb[1:4:1]    | passed | 0.00009 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:1]    | passed | 0.00012 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:2]    | passed | 0.00006 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:3]    | passed | 0.00012 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:4]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:5]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:6]    | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:7:1]  | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:7:2]  | passed | 0.00013 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:7:3]  | passed | 0.00009 seconds |
 ./spec/artifactory/cleaner_spec.rb[1:5:7:4]  | passed | 0.00023 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:7:5]  | passed | 0.00011 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:7:5]  | passed | 0.00012 seconds |
 ./spec/artifactory/cleaner_spec.rb[1:5:7:6]  | passed | 0.00008 seconds |
-./spec/artifactory/cleaner_spec.rb[1:5:7:7]  | passed | 0.00007 seconds |
+./spec/artifactory/cleaner_spec.rb[1:5:7:7]  | passed | 0.00008 seconds |

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Artifactory Cleaner CHANGELOG
 =============================
 This file describes the changes made in each release of `artifactory-cleaner`
 
+## v1.0.4 (May 29, 2020)
+
+ - Fix bug with accepting YAML filter files on the CLI
+
 ## v1.0.3 (May 15, 2020)
 
  - Fix thread deadlocks which occured if exceptions were raised in the discovery worker threads

data/Gemfile

@@ -4,9 +4,12 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
 
 group :development do
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
 end
+group :test do
+  gem "rspec", "~> 3.0"
+  gem "rspec_junit_formatter", ">= 0.4.1"
+end

data/lib/artifactory/cleaner/cli.rb

@@ -55,9 +55,9 @@ module Artifactory
         super
         @config = {}
         begin
-          load_conf_file options.conf_file if options.conf_file
+          load_conf_file options[:conf_file] if options[:conf_file]
         rescue => ex
-          STDERR.puts "Unable to load config from #{options.conf_file}: #{ex}"
+          STDERR.puts "Unable to load config from #{options[:conf_file]}: #{ex}"
           exit Sysexits::EX_DATAERR
         end
         @artifactory_config = {
@@ -111,8 +111,8 @@ module Artifactory
       # Analyze usage and report where space is used
       def usage_report
         begin
-          from = Time.parse(options.from)
-          to = Time.parse(options.to)
+          from = Time.parse(options[:from])
+          to = Time.parse(options[:to])
         rescue => ex
           STDERR.puts "Unable to parse time format. Please use: YYYY-MM-DD HH:II:SS"
           STDERR.puts ex
@@ -120,12 +120,12 @@ module Artifactory
         end
 
         begin
-          STDERR.puts "[DEBUG] controller.bucketize_artifacts from #{from} to #{to} repos #{options.repos}" if options.verbose?
+          STDERR.puts "[DEBUG] controller.bucketize_artifacts from #{from} to #{to} repos #{options[:repos]}" if options.verbose?
           buckets = @controller.bucketize_artifacts(
               from: from,
               to: to,
-              repos: options.repos,
-              threads: options.threads,
+              repos: options[:repos],
+              threads: options[:threads],
           )
 
           @controller.bucketized_artifact_report(buckets).each { |l| STDERR.puts l }
@@ -192,7 +192,7 @@ module Artifactory
             }
         }
 
-        @controller.with_discovered_artifacts(from: dates[:from], to: dates[:to], repos: options.repos, threads: options.threads) do |artifact|
+        @controller.with_discovered_artifacts(from: dates[:from], to: dates[:to], repos: options[:repos], threads: options[:threads]) do |artifact|
           if artifact_meets_criteria(artifact, dates, filter)
             if options.dry_run?
               STDERR.puts "Would archive #{artifact} to #{archive_to}"
@@ -252,8 +252,8 @@ module Artifactory
             }
         }
 
-        STDERR.puts "[DEBUG] controller.bucketize_artifacts from #{dates[:from]} to #{dates[:to]} repos #{options.repos}" if options.verbose?
-        @controller.with_discovered_artifacts(from: dates[:from], to: dates[:to], repos: options.repos, threads: options.threads) do |artifact|
+        STDERR.puts "[DEBUG] controller.bucketize_artifacts from #{dates[:from]} to #{dates[:to]} repos #{options[:repos]}" if options.verbose?
+        @controller.with_discovered_artifacts(from: dates[:from], to: dates[:to], repos: options[:repos], threads: options[:threads]) do |artifact|
           if artifact_meets_criteria(artifact, dates, filter)
             if archive_to
               if options.dry_run?
@@ -307,10 +307,10 @@ module Artifactory
       # return Ruby Time objects formed from CLI switches `--to`, `--from`, `--ctreated-before` etc
       def parse_date_options
         dates = {}
-        dates[:from] = Time.parse(options.from) if options.from
-        dates[:created_before] = Time.parse(options.created_before) if options.created_before
-        dates[:modified_before] = Time.parse(options.modified_before) if options.modified_before
-        dates[:last_used_before] = Time.parse(options.last_used_before) if options.last_used_before
+        dates[:from] = Time.parse(options[:from]) if options[:from]
+        dates[:created_before] = Time.parse(options[:created_before]) if options[:created_before]
+        dates[:modified_before] = Time.parse(options[:modified_before]) if options[:modified_before]
+        dates[:last_used_before] = Time.parse(options[:last_used_before]) if options[:last_used_before]
         dates[:to] = [dates[:created_before], dates[:modified_before], dates[:downloaded_before], dates[:last_used_before]].compact.sort.first
 
         if dates[:to].nil?
@@ -324,7 +324,7 @@ module Artifactory
       ##
       # Parse and validate value for the `--archive-to` CLI switch, ensuring it points to a valid, writable directory
       def parse_archive_option
-        archive_to = options.archive_to
+        archive_to = options[:archive_to]
         if archive_to
           unless File.directory? archive_to
             STDERR.puts "#{archive_to} is not a directory. `--archive-to` expects a valid, existing directory under which to store archived artifacts"
@@ -343,12 +343,12 @@ module Artifactory
       # Load Artifactory::Cleaner::ArtifactFilter objects from a YAML file
       def load_artifact_filter
         filter = ArtifactFilter.new
-        if options.filter
-          unless File.exist? options.filter and File.readable? options.filter
-            STDERR.puts "Unable to read specified filter file #{options.filter}"
+        if options[:filter]
+          unless File.exist? options[:filter] and File.readable? options[:filter]
+            STDERR.puts "Unable to read specified filter file #{options[:filter]}"
             exit Sysexits::EX_USAGE
           end
-          rules = YAML.load_file options.filter
+          rules = YAML.load_file options[:filter]
           rules.each {|rule| filter << rule}
         end
         filter
@@ -376,10 +376,10 @@ module Artifactory
       def get_repo_cols(repo_kinds)
         if options.details?
           selected_cols =
-              if options.output.nil?
+              if options[:output].nil?
                 Artifactory::Cleaner::CLI.default_repo_table_cols
               else
-                options.output.split(',').map &:to_sym
+                options[:output].split(',').map &:to_sym
               end
           @repo_table_cols.select do |col|
             (col.only.nil? or repo_kinds.include? col.only) and (selected_cols.include? col.method)
@@ -392,7 +392,7 @@ module Artifactory
       ##
       # CLI helper method for printing details of discovered repositories to a terminal
       def print_repo_list(repo_info_table, include_cols)
-        if options.no_headers || !options.details
+        if options[:no_headers] || !options[:details]
           repo_info_table.each {|row| puts row.join("\t")}
         else
           headers = include_cols.map &:heading

data/lib/artifactory/cleaner/version.rb

@@ -2,6 +2,6 @@ module Artifactory
   module Cleaner
     ##
     # Version number of the Artifactory::Cleaner gem
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory-cleaner
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Josh Gitlin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber