artifactory-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7fb4a1236baecc54d9ab25da7b99660644dd021
-  data.tar.gz: 3e334fcd05595c34cb74568107545f5aa103923f
+  metadata.gz: 3382f6c152f0409dc4d73404f92fa97fbf18ca5d
+  data.tar.gz: 0255ee37ab9d9d5acd917c53e0ae16b1957af7d0
 SHA512:
-  metadata.gz: 2612da8023f66c6fba9efc1a85d322756bf378420a0bee1bcdd8efca5ddd969f9f58256c1c8a5e70389f2d8f061fa57f2d140c44b19a3bbb73a90a767f77c5b5
-  data.tar.gz: d47ed4e9cd064ca90f1061a010165a1085b15f8b37e1bc9bedf67a45353e00fde235ef99f99828d8398fb47ff9eab1ecde0056555b2c698d6ab447b29544a325
+  metadata.gz: e5de3ff8707ce655fa809074259c316b5f8e5069d64cb8740c1536e40579630a548d29ddce83c5423c0e5c06913fe38b173f46953d722f91a6dbdeb88afe9add
+  data.tar.gz: 21464871d23c541fcdb4db6c39d53d85f36464b4af746fd4d4d1fe14211e6891e38153aafdc34c733194c49004596551ebda32628e698cc1f189608d07792ca9

data/lib/artifactory/client.rb

@@ -210,7 +210,7 @@ module Artifactory
     # @return [Hash] Artifacts matching search criteria
     #
     def search_usage(repo_key:, not_used_since:, created_before: nil)
-      ret = {}
+      ret = []
 
       path = File.join("/search", "usage")
       params = []
@@ -219,18 +219,25 @@ module Artifactory
       params << "repos=#{repo_key.is_a?(Array) ? repo_key.join(',') : repo_key}"
 
       api_get([path, params.join('&')].join('?'))['results'].each do |result|
+        path = result['uri'].scan(/\/storage\/(.+?)(\/.*)/).flatten
+
+        file = {
+          "path" => path.join,
+          "repo_key" => path[0],
+          "name" => path[1]
+        }
+
         result.each do |k, v|
           case k
             when "lastDownloaded", "remoteLastDownloaded"
-              ret[result['uri']] = Time.parse(v)
-
-            when "uri"
-              next
+              file[k] = Time.parse(v)
 
             else
-              ret[result['uri']] = v
+              file[k] = v
           end
         end
+
+        ret << file
       end
 
       ret
@@ -241,11 +248,11 @@ module Artifactory
     # @param repo_key [String, Array<String>] Repository key(s)
     # @param from_date [Time] Return artifacts that have not been used since the given date
     # @param to_date [Time] Return artifacts that have been created before the given date
-    # @param fields [created, lastModified, lastDownloaded] Date fields that specify which fields the from_date and to_date values should be applied to
+    # @param date_fields [created, lastModified, lastDownloaded] Date fields that specify which fields the from_date and to_date values should be applied to
     # @return [Hash] Artifacts matching search criteria
     #
     def search_dates(repo_key:, from_date: nil, to_date: Time.now, date_fields:)
-      ret = {}
+      ret = []
 
       valid_date_fields = ["created", "lastModified", "lastDownloaded"]
 
@@ -260,20 +267,26 @@ module Artifactory
       params << "repos=#{repo_key.is_a?(Array) ? repo_key.join(',') : repo_key}"
       params << "dateFields=#{date_fields.join(',')}"
 
-      puts([path, params.join('&')].join('?'))
       api_get([path, params.join('&')].join('?'))['results'].each do |result|
+        path = result['uri'].scan(/\/storage\/(.+?)(\/.*)/).flatten
+
+        file = {
+          "path" => path.join,
+          "repo_key" => path[0],
+          "name" => path[1]
+        }
+
         result.each do |k, v|
           case k
             when *valid_date_fields
-              ret[result['uri']] = Time.parse(v)
-
-            when "uri"
-              next
+              file[k] = Time.parse(v)
 
             else
-              ret[result['uri']] = v
+              file[k] = v
           end
         end
+
+        ret << file
       end
 
       ret
@@ -287,7 +300,7 @@ module Artifactory
     # @return [Hash] Artifacts matching search criteria
     #
     def search_creation(repo_key:, from_date: nil, to_date: Time.now)
-      ret = {}
+      ret = []
 
       path = File.join("/search", "creation")
       params = []
@@ -296,18 +309,25 @@ module Artifactory
       params << "repos=#{repo_key.is_a?(Array) ? repo_key.join(',') : repo_key}"
 
       api_get([path, params.join('&')].join('?'))['results'].each do |result|
+        path = result['uri'].scan(/\/storage\/(.+?)(\/.*)/).flatten
+
+        file = {
+          "path" => path.join,
+          "repo_key" => path[0],
+          "name" => path[1]
+        }
+
         result.each do |k, v|
           case k
             when "created"
-              ret[result['uri']] = Time.parse(v)
-
-            when "uri"
-              next
+              file[k] = Time.parse(v)
 
             else
-              ret[result['uri']] = v
+              file[k] = v
           end
         end
+
+        ret << file
       end
 
       ret

data/lib/artifactory/version.rb

@@ -3,7 +3,7 @@
 #
 
 module Artifactory
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artifactory-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matteo Cerutti