artifactory 2.8.2 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ef3bf846ba58ab200c737eb261bef55b26d42a6
-  data.tar.gz: a50a886a796ad877dae21183d7601d060371f2d6
+SHA256:
+  metadata.gz: b25bc5d80ff1f446765041dfa18c8124632de6d74c99757b968ee599afb687f5
+  data.tar.gz: 872377830c2c226593aa01dd98bcd9a9ed077a1fc987ac014056e976f64db7b6
 SHA512:
-  metadata.gz: bf1d7d48171793cbe944043a280d512194addd87d1b25c6f23239c6744e6ff3b5940714d29aa9a2a99ffaf4cfea7c95bfb2c2fe07faa65f8b387c7662bf1c966
-  data.tar.gz: 774c9fd405215ed6c14036cb9ea6b916edd1729d9899bcae48bcb755092062175b8b983369edeea4cf7229fc8bb79956704cd146a3fd56b5c37d1265c7b7e1e6
+  metadata.gz: 64e08e305ffadc57955be2aa5ec362e3c79dfb425af8180d3d9560db573cef1a4f5b0f0d1fd49f8e3e173cb4ce7ef8f58eec53290e5a170a98bfec9469f5919d
+  data.tar.gz: 82474417dff7e81ae2c1c26029d5c91c780c1275201ac1d2a96bfda419c3314cf0ceb577284fc1c059a4a8f4c474337c6565d64def6f1d4e60cee478390930b0

data/lib/artifactory.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 require "pathname"
-require "artifactory/version"
+require_relative "artifactory/version"
 
 module Artifactory
   autoload :Client,       "artifactory/client"
@@ -36,6 +36,7 @@ module Artifactory
     autoload :Base,             "artifactory/resources/base"
     autoload :Build,            "artifactory/resources/build"
     autoload :BuildComponent,   "artifactory/resources/build_component"
+    autoload :Certificate,      "artifactory/resources/certificate"
     autoload :Group,            "artifactory/resources/group"
     autoload :Layout,           "artifactory/resources/layout"
     autoload :LDAPSetting,      "artifactory/resources/ldap_setting"

data/lib/artifactory/client.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ module Artifactory
 
     proxy Resource::Artifact
     proxy Resource::Backup
+    proxy Resource::Certificate
     proxy Resource::Layout
     proxy Resource::LDAPSetting
     proxy Resource::MailServer
@@ -207,7 +208,7 @@ module Artifactory
       end
 
       # Setup PATCH/POST/PUT
-      if [:patch, :post, :put].include?(verb)
+      if %i{patch post put}.include?(verb)
         if data.respond_to?(:read)
           request.content_length = data.size
           request.body_stream = data
@@ -257,8 +258,16 @@ module Artifactory
 
         if block_given?
           http.request(request) do |response|
-            response.read_body do |chunk|
-              yield chunk
+            case response
+            when Net::HTTPRedirection
+              redirect = response["location"]
+              request(verb, redirect, data, headers, &block)
+            when Net::HTTPSuccess
+              response.read_body do |chunk|
+                yield chunk
+              end
+            else
+              error(response)
             end
           end
         else
@@ -266,7 +275,7 @@ module Artifactory
 
           case response
           when Net::HTTPRedirection
-            redirect = URI.parse(response["location"])
+            redirect = response["location"]
             request(verb, redirect, data, headers)
           when Net::HTTPSuccess
             success(response)
@@ -313,7 +322,7 @@ module Artifactory
     #
     def build_uri(verb, path, params = {})
       # Add any query string parameters
-      if [:delete, :get].include?(verb)
+      if %i{delete get}.include?(verb)
         path = [path, to_query_string(params)].compact.join("?")
       end
 
@@ -371,7 +380,7 @@ module Artifactory
       if (response.content_type || "").include?("json")
         JSON.parse(response.body || "{}")
       else
-        response.body
+        response.body || ""
       end
     end
 

data/lib/artifactory/collections/artifact.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/artifactory/collections/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/artifactory/collections/build.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright 2015-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/artifactory/configurable.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,20 +27,20 @@ module Artifactory
       # @return [Array<Symbol>]
       #
       def keys
-        @keys ||= [
-          :endpoint,
-          :username,
-          :password,
-          :api_key,
-          :proxy_address,
-          :proxy_password,
-          :proxy_port,
-          :proxy_username,
-          :ssl_pem_file,
-          :ssl_verify,
-          :user_agent,
-          :read_timeout,
-        ]
+        @keys ||= %i{
+          endpoint
+          username
+          password
+          api_key
+          proxy_address
+          proxy_password
+          proxy_port
+          proxy_username
+          ssl_pem_file
+          ssl_verify
+          user_agent
+          read_timeout
+        }
       end
     end
 

data/lib/artifactory/defaults.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "artifactory/version"
+require_relative "version"
 
 module Artifactory
   module Defaults

data/lib/artifactory/errors.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,14 +44,14 @@ module Artifactory
     # A general connection error with a more informative message
     class InvalidBuildType < ArtifactoryError
       def initialize(given_type)
-        super <<-EOH
-'#{given_type}' is not a valid build type.
+        super <<~EOH
+          '#{given_type}' is not a valid build type.
 
-Valid build types include:
+          Valid build types include:
 
-    #{Resource::Build::BUILD_TYPES.join("\n    ")}"
+              #{Resource::Build::BUILD_TYPES.join("\n    ")}"
 
-EOH
+        EOH
       end
     end
   end

data/lib/artifactory/resources/artifact.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -95,11 +95,10 @@ module Artifactory
       def gavc_search(options = {})
         client = extract_client!(options)
         options = Util.rename_keys(options,
-          :group      => :g,
-          :name       => :a,
-          :version    => :v,
-          :classifier => :c
-        )
+          group: :g,
+          name: :a,
+          version: :v,
+          classifier: :c)
         params = Util.slice(options, :g, :a, :v, :c, :repos)
         format_repos!(params)
 
@@ -291,16 +290,16 @@ module Artifactory
       def versions(options = {})
         client  = extract_client!(options)
         options = Util.rename_keys(options,
-          :group   => :g,
-          :name    => :a,
-          :version => :v
-        )
+          group: :g,
+          name: :a,
+          version: :v)
         params = Util.slice(options, :g, :a, :v, :repos)
         format_repos!(params)
 
         client.get("/api/search/versions", params)["results"]
       rescue Error::HTTPError => e
         raise unless e.code == 404
+
         []
       end
 
@@ -342,10 +341,9 @@ module Artifactory
       def latest_version(options = {})
         client = extract_client!(options)
         options = Util.rename_keys(options,
-          :group   => :g,
-          :name    => :a,
-          :version => :v
-        )
+          group: :g,
+          name: :a,
+          version: :v)
         params = Util.slice(options, :g, :a, :v, :repos, :remote)
         format_repos!(params)
 
@@ -356,6 +354,7 @@ module Artifactory
         client.get("/api/search/latestVersion", params)
       rescue Error::HTTPError => e
         raise unless e.code == 404
+
         nil
       end
 
@@ -493,7 +492,7 @@ module Artifactory
       target = File.expand_path(target)
 
       # Make the directory if it doesn't yet exist
-      FileUtils.mkdir_p(target) unless File.exists?(target)
+      FileUtils.mkdir_p(target) unless File.exist?(target)
 
       # Use the server artifact's filename if one wasn't given
       filename = options[:filename] || File.basename(download_uri)
@@ -555,6 +554,7 @@ module Artifactory
       response = client.put(endpoint, file, headers)
 
       return unless response.is_a?(Hash)
+
       self.class.from_hash(response)
     end
 
@@ -608,8 +608,7 @@ module Artifactory
     def upload_with_checksum(repo, remote_path, checksum, properties = {})
       upload(repo, remote_path, properties,
         "X-Checksum-Deploy" => true,
-        "X-Checksum-Sha1"   => checksum
-      )
+        "X-Checksum-Sha1"   => checksum)
     end
 
     #
@@ -626,8 +625,7 @@ module Artifactory
     #
     def upload_from_archive(repo, remote_path, properties = {})
       upload(repo, remote_path, properties,
-        "X-Explode-Archive" => true
-      )
+        "X-Explode-Archive" => true)
     end
 
     private

data/lib/artifactory/resources/backup.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ module Artifactory
         find_from_config("config/backups/backup/key[text()='#{key}']", config, options)
       rescue Error::HTTPError => e
         raise unless e.code == 404
+
         nil
       end
 
@@ -102,6 +103,7 @@ module Artifactory
       def find_from_config(xpath, config, options = {})
         name_node = REXML::XPath.match(config, xpath)
         return nil if name_node.empty?
+
         properties = Util.xml_to_hash(name_node[0].parent, "excludedRepositories", false)
         from_hash(properties, options)
       end

data/lib/artifactory/resources/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ module Artifactory
       # @return [true, false]
       #
       def has_attribute?(key)
-        attributes.has_key?(key.to_sym)
+        attributes.key?(key.to_sym)
       end
 
       #
@@ -156,6 +156,7 @@ module Artifactory
       def find_from_config(xpath, config, options = {})
         name_node = REXML::XPath.match(config, xpath)
         return nil if name_node.empty?
+
         properties = {}
         name_node[0].parent.each_element_with_text do |e|
           properties[e.name] = Util.to_type(e.text)
@@ -227,6 +228,7 @@ module Artifactory
       #
       def format_repos!(options)
         return options if options[:repos].nil? || options[:repos].empty?
+
         options[:repos] = Array(options[:repos]).compact.join(",")
         options
       end
@@ -241,7 +243,15 @@ module Artifactory
       #   the URL-safe version of the string
       #
       def url_safe(value)
-        URI.escape(URI.unescape(value.to_s))
+        uri_parser.escape(uri_parser.unescape(value.to_s))
+      end
+
+      #
+      # Generate a URI parser
+      #
+      # @return [URI::Parser]
+      def uri_parser
+        @uri_parser ||= URI::Parser.new
       end
     end
 
@@ -340,7 +350,7 @@ module Artifactory
       if properties.empty?
         nil
       else
-        ";#{properties.join(';')}"
+        ";#{properties.join(";")}"
       end
     end
 
@@ -351,8 +361,8 @@ module Artifactory
     #
     def to_query_string_parameters(hash = {})
       properties = hash.map do |k, v|
-        key   = URI.escape(k.to_s)
-        value = URI.escape(v.to_s)
+        key   = self.class.uri_parser.escape(k.to_s)
+        value = self.class.uri_parser.escape(v.to_s)
 
         "#{key}=#{value}"
       end
@@ -377,7 +387,7 @@ module Artifactory
         end
       end.compact
 
-      "#<#{short_classname} #{list.join(', ')}>"
+      "#<#{short_classname} #{list.join(", ")}>"
     end
 
     private

data/lib/artifactory/resources/build.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright 2015-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ module Artifactory
   class Resource::Build < Resource::Base
     BUILD_SCHEMA_VERSION = "1.0.1".freeze
     # valid build types as dictated by the Artifactory API
-    BUILD_TYPES = %w{ ANT IVY MAVEN GENERIC GRADLE }
+    BUILD_TYPES = %w{ ANT IVY MAVEN GENERIC GRADLE }.freeze
 
     class << self
       #
@@ -49,6 +49,7 @@ module Artifactory
         # builds. Whoever decided that was a good idea clearly doesn't
         # understand the point of REST interfaces...
         raise unless e.code == 404
+
         []
       end
 
@@ -78,6 +79,7 @@ module Artifactory
         from_hash(response["buildInfo"], client: client)
       rescue Error::HTTPError => e
         raise unless e.code == 404
+
         nil
       end
 
@@ -189,8 +191,7 @@ module Artifactory
 
       endpoint = "/api/build/promote/#{url_safe(name)}/#{url_safe(number)}"
       client.post(endpoint, JSON.fast_generate(request_body),
-        "Content-Type" => "application/json"
-      )
+        "Content-Type" => "application/json")
     end
 
     #
@@ -206,8 +207,7 @@ module Artifactory
       file.rewind
 
       client.put("/api/build", file,
-        "Content-Type" => "application/json"
-      )
+        "Content-Type" => "application/json")
       true
     ensure
       if file