ike-artifactory 0.0.1pre2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54d885ec980d2c49686b6f3395adbf7ab854b433823bd0a4fdf903e9887db8b
-  data.tar.gz: e4af791e8b3751311af406bd43d29589de074b7bb2284f81195631782af8dd6e
+  metadata.gz: a820f721d21028a9d6e4d848c616a57688933f42278c3627ae8235feaacebe9a
+  data.tar.gz: 14e3cc59825373d278aeec0a3abbd9d531128c69c3ec437e3a5f279e4f2b7a04
 SHA512:
-  metadata.gz: 4fdd3f97640d59e1bd33f1c66d0b16a6fdf94c7c3f76ff7c4b8ae0e8a7190fe7608498f5023f2e89220aa4a955653154e43219949e3cca14ba566ff456297a61
-  data.tar.gz: 383af6127fec80f4974c3ba60baafcabe6ceea00a2f514ef588325ff27f85e51b9341ef334b71d86b32d9f6dd0e8909f01ae06521058663a1bb82206a105ab72
+  metadata.gz: 7be6653e88945813562d1e4245738f49adafc1e8db2a379fffafea1cc3bab0398f7d25b227084409762b1fae6c6755c460a831847b1dd459db2b1fa8f4ee41b6
+  data.tar.gz: 257097d4b827de943bb3acaf4a29c6a08aaf19b1084a03f3036754bfdceeebd5c3f4e4bacf4cb310a7b9e8451388dedc6a80abcbb982a8512ded45fdd0a615b7

data/bin/cleaner.rb

@@ -5,13 +5,20 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'ike_artifactory'
 
 actually_delete = false
-if ARGV[0] == '--actually-delete'
-  ARGV.shift
-  actually_delete = true
+delete_empty_path = false
+while ARGV[0] =~ /^--/ do
+  arg = ARGV.shift
+  if arg == '--actually-delete'
+    actually_delete = true
+  end
+  
+  if arg == '--delete-empty-path'
+    delete_empty_path = true
+  end
 end
 
 unless [7,8].include?(ARGV.count)
-  STDERR.puts "Usage: $0 [--actually-delete] artifactory_url repo_key username password application_list image_exclude_list days_to_keep [most_recent_images_to_keep]"
+  STDERR.puts "Usage: $0 [--actually-delete] [--delete-empty-path] artifactory_url repo_key username password application_list image_exclude_list days_to_keep [most_recent_images_to_keep]"
   exit 1
 end
 
@@ -52,6 +59,7 @@ apps.each do |app|
   puts "Cleaning #{app}"
   cleaner = IKE::Artifactory::DockerCleaner.new(
     actually_delete: actually_delete,
+    delete_empty_path: delete_empty_path,
     repo_host: artifactory_url,
     repo_key: repo_key,
     folder: app,

data/lib/ike_artifactory/client.rb

@@ -79,7 +79,13 @@ module IKE
       def fetch(path, method: :get, prefix: nil)
         retval = nil # Work around Object#stub stomping on return values
 
-        prefix ||= "#{server}/artifactory/api/storage/#{repo_key}"
+        prefix ||=
+          case method
+          when :delete
+            "#{server}/artifactory/#{repo_key}"
+          else
+            "#{server}/artifactory/api/storage/#{repo_key}"
+          end
 
         RestClient::Request.execute(
           :method => method,

data/lib/ike_artifactory/docker_cleaner.rb

@@ -15,10 +15,11 @@ module IKE
       attr_reader :most_recent_images  # is not tested
       attr_reader :logger  # is not tested. Used for testing
       attr_reader :actually_delete
+      attr_reader :delete_empty_path
 
       def initialize(repo_host:, repo_key:, folder:, days_old:,
                      tags_to_exclude:, user:, password:, most_recent_images:,
-                     log_level: ::Logger::INFO, actually_delete: false)
+                     log_level: ::Logger::INFO, actually_delete: false, delete_empty_path: false)
 
         @repo_host = repo_host
         @repo_key = repo_key
@@ -27,7 +28,8 @@ module IKE
         @tags_to_exclude = tags_to_exclude || []
         @most_recent_images = most_recent_images
 
-        @actually_delete = actually_delete
+        @actually_delete   = actually_delete
+        @delete_empty_path = delete_empty_path
 
         @client = IKE::Artifactory::Client.new(
           :server => repo_host,
@@ -75,6 +77,14 @@ module IKE
           end
           deleted_images.append(tag)
         end
+        if delete_empty_path && deleted_images.length() == tags.length()
+          logger.info "#{logger_prefix}: removing empty path #{folder}"
+          if actually_delete
+            client.delete_object "#{folder}"
+          else
+            logger.info("#{logger_prefix}: Not actually deleting #{folder} because actually_delete is falsy")
+          end
+        end
         deleted_images
       end
     end

data/lib/ike_artifactory/version.rb

@@ -1,5 +1,5 @@
 module IKE
   module Artifactory
-    VERSION = "0.0.1pre2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ike-artifactory
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Marden
 - Jack Newton
 - Vicente Ramos Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,7 +91,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,12 +102,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provides an object-oriented interface to Artifactory API.
 test_files: []