artifactory 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debdaf9656756bf1f7068230636025e40b3a0aec
-  data.tar.gz: b6a4d23d52134bae4a126386b4afa2abe7159df8
+  metadata.gz: 807a2f1639d5c32dff15a9cc23d7d129396d9847
+  data.tar.gz: 063be4bd80cb37f69f04492bf9cdcda5c92fb565
 SHA512:
-  metadata.gz: 677aa4dc20927179229f4fa6733a74565a928aedbb3d6300f698f485ee769848b618e0de60080595c52f93ba1a359df3e49ec18abe590a4fedef65afa6e830ca
-  data.tar.gz: f2e1802388c8c0ae0cc8561ba453f56dd84c6a6bdf8f109812dbb73f87d8faedffe45f48f708f40fe5484558af6df59bd0110b74ba5250787b5d3b57ca975559
+  metadata.gz: 20e6cdf9a45f0da723ff60dc4bcab19c5cf06dd1be1ce54fab35cad878b167474740cb807fbe1aa2818edcd26993342bcce7d2cbee1283c82e77f36601f99161
+  data.tar.gz: 4646fa8579e83c41a2733c35c336257aab79fb869d3f4ea8f8122a03ef8e6d85a21dd093dcbe148d1fbc48992fec903d1b4616c721fba463dae18fb263a39bad

data/CHANGELOG.md

@@ -3,8 +3,16 @@ Artifactory Client CHANGELOG
 This file is used to document the changes between releases of the Artifactory
 Ruby client.
 
+v2.5.2 (01-27-2017)
+-------------------
+- Update tests to run properly on Windows
+- Begin testing PRs with Appveyor
+- Ensure URI from artifacts are escaped
+
 v2.5.1 (11-10-2016)
 -------------------
+- Ensure `Artifact#Upload_from_archive` returns empty response
+- Additional test coverage
 
 v2.5.0 (09-15-2016)
 -------------------

data/appveyor.yml

@@ -0,0 +1,28 @@
+version: '{build}'
+
+skip_tags: true
+
+environment:
+  matrix:
+    - RUBY_VERSION: 21
+    - RUBY_VERSION: 21-x64
+    - RUBY_VERSION: 200
+    - RUBY_VERSION: 193
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - gem install bundler
+  - bundle install --path=vendor/bundle --retry=3 --jobs=7
+
+cache:
+  - vendor/bundle
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake travis:ci

data/lib/artifactory/resources/base.rb

@@ -107,7 +107,7 @@ module Artifactory
       def from_url(url, options = {})
         # Parse the URL and only use the path so the configured
         # endpoint/proxy/SSL settings are used in the GET request.
-        path = URI.parse(url).path
+        path = URI.parse(url_safe(url)).path
         client = extract_client!(options)
         # If the endpoint contains a path part, we must remove the
         # endpoint path part from path, because the client uses
@@ -241,7 +241,7 @@ module Artifactory
       #   the URL-safe version of the string
       #
       def url_safe(value)
-        URI.escape(value.to_s)
+        URI.escape(URI.unescape(value.to_s))
       end
     end
 

data/lib/artifactory/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Artifactory
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/spec/integration/resources/artifact_spec.rb

@@ -6,7 +6,7 @@ module Artifactory
       it "finds artifacts by #{name}" do
         response = described_class.send(name, options)
         expect(response).to be_a(Array)
-        expect(response.size).to eq(2)
+        expect(response.size).to eq(3)
 
         artifact_1 = response[0]
         expect(artifact_1).to be_a(described_class)
@@ -15,6 +15,10 @@ module Artifactory
         artifact_2 = response[1]
         expect(artifact_2).to be_a(described_class)
         expect(artifact_2.repo).to eq('ext-release-local')
+
+        artifact_3 = response[2]
+        expect(artifact_3).to be_a(described_class)
+        expect(artifact_3.repo).to eq('bin-release-local')
       end
 
       it "finds artifacts by repo" do

data/spec/support/api_server/artifact_endpoints.rb

@@ -111,6 +111,31 @@ module Artifactory
         )
       end
 
+      app.get('/api/storage/bin-release-local/org/acme/artifact 1.0.0.msi') do
+        content_type 'application/vnd.org.jfrog.artifactory.storage.FileInfo+json'
+        JSON.fast_generate(
+          'uri'          => server_url.join('/api/storage/bin-release-local/org/acme/artifact 1.0.0.msi'),
+          'downloadUri'  => server_url.join('/artifactory/bin-release-local/org/acme/artifact 1.0.0.msi'),
+          'repo'         => 'bin-release-local',
+          'path'         => '/org/acme/artifact 1.0.0.msi',
+          'created'      => Time.parse('1995-04-11 11:05am'),
+          'createdBy'    => 'yzl',
+          'lastModified' => Time.parse('2013-11-10 10:10pm'),
+          'modifiedBy'   => 'schisamo',
+          'lastUpdated'  => Time.parse('2014-02-02 2:00pm'),
+          'size'         => '1024',
+          'mimeType'     => 'application/octet-stream',
+          'checksums'    => {
+            'md5' => 'MD5789',
+            'sha' => 'SHA101'
+          },
+          'originalChecksums' => {
+            'md5' => 'MD5789',
+            'sha' => 'SHA101'
+          }
+        )
+      end
+
       app.class_eval do
         def artifacts_for_conditions(&block)
           if block.call
@@ -125,6 +150,7 @@ module Artifactory
                 'results' => [
                   { 'uri' => server_url.join('/api/storage/libs-release-local/org/acme/artifact.deb') },
                   { 'uri' => server_url.join('/api/storage/ext-release-local/org/acme/artifact.deb') },
+                  { 'uri' => server_url.join('/api/storage/bin-release-local/org/acme/artifact 1.0.0.msi') },
                 ]
               )
             end

data/spec/unit/resources/artifact_spec.rb

@@ -44,7 +44,7 @@ module Artifactory
       subject { described_class.new(client: client, local_path: local_path) }
 
       before do
-        allow(File).to receive(:new).with(local_path).and_return(file)
+        allow(File).to receive(:new).with(/\A(\w:)?#{local_path}\z/).and_return(file)
       end
 
       context 'when the artifact is a file path' do

data/spec/unit/resources/repository_spec.rb

@@ -129,7 +129,7 @@ module Artifactory
       before do
         subject.client = client
         subject.key    = 'libs-release-local'
-        allow(File).to receive(:new).with('/fake/path').and_return(file)
+        allow(File).to receive(:new).with(/\A(\w:)?#{path}\z/).and_return(file)
       end
 
       context 'when the artifact is a file path' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - artifactory.gemspec
 - lib/artifactory.rb
 - lib/artifactory/client.rb