artifactory 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89a0d205ba82632c1f9b538a50b84f69b67ac0f
-  data.tar.gz: 1484191f4caf8502ca9ec7519d97c67fe5cc51f7
+  metadata.gz: eb987fd18b2034340daf17e7f5d6d06b7289966f
+  data.tar.gz: 5315895f5ab0badfee1351eecfd7d80a701d509c
 SHA512:
-  metadata.gz: 9d374065d88be5dc94f46fa9c4cf90694e8eb270ef1c92c6036a1e7941274735ca89e9ecc326d3d2d25d4a9170dd89217b0d6ee39cb2b616810817d756734249
-  data.tar.gz: dbe9986454583e5977d555d466a9163a535ae1a623b1d7916f258c1016315db1c32e09355f8e48303793a2c3189a3c9f5044b168217ecac6ca02d031aecbd042
+  metadata.gz: 56040d7854457cbd0d86712e1ad7e096e539409012ea8e904fe4eda9b8d18ee7f4ad4d31f5f45ec12636c7f8f9c734b40fcbf9e45555d50660b9689db801f993
+  data.tar.gz: 93bdb1b294a58cb73d6bfbcb118090828b25e1dd7ee0cf5e92a00850b6850f16bdf22248a900a62a6338e03b5e3425da78500b047a60157b61d1b106d4fa2402

data/CHANGELOG.md

@@ -3,6 +3,13 @@ Artifactory Client CHANGELOG
 This file is used to document the changes between releases of the Artifactory
 Ruby client.
 
+v2.2.1 (12-16-2014)
+-------------------
+- provide data to post in `Artifact#copy_or_move`
+- pass correct variable to redirect request in `Client#request`
+- use CGI escape to encode data values
+- when checksums are available, upload using the checksum headers.
+
 v2.2.0 (11-20-2014)
 -------------------
 - Add artifact usage search

data/lib/artifactory/client.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+require 'cgi'
 require 'json'
 require 'net/http'
 require 'uri'
@@ -247,7 +248,7 @@ module Artifactory
         case response
         when Net::HTTPRedirection
           redirect = URI.parse(response['location'])
-          request(verb, redirect, params, headers)
+          request(verb, redirect, data, headers)
         when Net::HTTPSuccess
           success(response)
         else
@@ -331,7 +332,7 @@ module Artifactory
     #
     def to_query_string(hash)
       hash.map do |key, value|
-        "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
+        "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
       end.join('&')[/.+/]
     end
 

data/lib/artifactory/resources/artifact.rb

@@ -534,20 +534,18 @@ module Artifactory
       matrix   = to_matrix_properties(properties)
       endpoint = File.join("#{url_safe(repo)}#{matrix}", remote_path)
 
-      response = client.put(endpoint, file, headers)
+      # Include checksums in headers if given.
+      headers['X-Checksum-Md5'] = md5   if md5
+      headers['X-Checksum-Sha1'] = sha1 if sha1
 
-      # Upload checksums if they were given
-      upload_checksum(repo, remote_path, :md5,  md5)  if md5
-      upload_checksum(repo, remote_path, :sha1, sha1) if sha1
+      response = client.put(endpoint, file, headers)
 
       self.class.from_hash(response)
     end
 
     #
     # Upload the checksum for this artifact. **The artifact must already be
-    # uploaded or Artifactory will throw an exception!**. This is both a public
-    # and private API. It is automatically called in {upload} if the SHA
-    # values are set. You may also call it manually.
+    # uploaded or Artifactory will throw an exception!**.
     #
     # @example Set an artifact's md5
     #   artifact = Artifact.new(local_path: '/local/path/to/file.deb')
@@ -678,7 +676,7 @@ module Artifactory
 
       endpoint = File.join('/api', action.to_s, relative_path) + '?' + params.join('&')
 
-      client.post(endpoint)
+      client.post(endpoint, {})
     end
   end
 end

data/lib/artifactory/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Artifactory
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/spec/unit/client_spec.rb

@@ -91,5 +91,17 @@ module Artifactory
         end
       end
     end
+
+    describe '#to_query_string' do
+      it 'converts spaces to "+" characters' do
+        params = {user: 'Seth Chisamore'}
+        expect(subject.to_query_string(params)).to eq('user=Seth+Chisamore')
+      end
+
+      it 'converts "+" to "%2B"' do
+        params = {version: '12.0.0-alpha.1+20140826080510.git.50.f5ff271'}
+        expect(subject.to_query_string(params)).to eq('version=12.0.0-alpha.1%2B20140826080510.git.50.f5ff271')
+      end
+    end
   end
 end

data/spec/unit/resources/artifact_spec.rb

@@ -52,6 +52,24 @@ module Artifactory
         end
       end
 
+      context 'when the md5 is available' do
+        subject { described_class.new(client: client, local_path: local_path, checksums: { 'md5' => 'ABCDEF123456' } ) }
+
+        it 'PUTs the file with the checksum headers set' do
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, { 'X-Checksum-Md5' => 'ABCDEF123456' } )
+          subject.upload('libs-release-local', '/remote/path')
+        end
+      end
+
+      context 'when the sha1 is available' do
+        subject { described_class.new(client: client, local_path: local_path, checksums: { 'sha1' => 'SHA1' } ) }
+
+        it 'PUTs the file with the checksum headers set' do
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, { 'X-Checksum-Sha1' => 'SHA1' } )
+          subject.upload('libs-release-local', '/remote/path')
+        end
+      end
+
       context 'when matrix properties are given' do
         it 'converts the hash into matrix properties' do
           expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth/remote/path', file, {})
@@ -498,12 +516,12 @@ module Artifactory
       end
 
       it 'sends POST to the client with parsed params' do
-        expect(client).to receive(:post).with('/api/move/foo/bar/artifact.deb?to=/to/path')
+        expect(client).to receive(:post).with('/api/move/foo/bar/artifact.deb?to=/to/path', {})
         subject.copy_or_move(:move, '/to/path')
       end
 
       it 'adds the correct parameters to the request' do
-        expect(client).to receive(:post).with('/api/move/foo/bar/artifact.deb?to=/to/path&failFast=1&dry=1')
+        expect(client).to receive(:post).with('/api/move/foo/bar/artifact.deb?to=/to/path&failFast=1&dry=1', {})
         subject.copy_or_move(:move, '/to/path', fail_fast: true, dry_run: true)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Artifactory is a simple, lightweight Ruby client for interacting with the