artifactory 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebccbe5005de8daa87ddb5c2cff9e7fd3a47d28
-  data.tar.gz: 8a616316ec8cbcf35a53fb49646273fad0e8ac09
+  metadata.gz: 9ccfaa5ca0cc4863850ec3838804360dbeab5680
+  data.tar.gz: f1a22d50c6a7ebecedb5f2f6bd1d2b73778b2a0a
 SHA512:
-  metadata.gz: 3e66007bc0e0c3a17bf27df588bd10ef21b7f60b39581c464254723f57d18d44d6299cd52deacf8a735b59fdf1e5d9d136799b57d00ae41fca11cc215c28b049
-  data.tar.gz: dac023ee6fea73f52003e52840b018996ad77b0fe425522bd03457798e2558b94599ae6376a36ffe7dd67886821f458306e0543e2e9230ce690f98ed33e1a4bf
+  metadata.gz: 03c8645b02635c10d936e5b2f8b96dbd77355facda716164f1495efd3eb6955e3fd7f33338243518b4ac08ded41cc025cc0471ca0d54bfbcc392f8f9536b3c6f
+  data.tar.gz: f87b952b9e0f0e282d8bcf9fcef3888a0fecf7d7c21dd341deb864bbf60783f1f6d0f7bc84c1163ac81cdeedd0857072ea8d7f574ce292b5cb87659ef99851a1

data/CHANGELOG.md

@@ -3,6 +3,10 @@ Artifactory Client CHANGELOG
 This file is used to document the changes between releases of the Artifactory
 Ruby client.
 
+v2.1.3 (08-29-2014)
+-------------------
+- CGI escape matrix properties
+
 v2.1.2 (08-26-2014)
 -------------------
 - Use the proper REST verbs on various resources to prevent a bug

data/lib/artifactory.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'pathname'
 require 'artifactory/version'
 

data/lib/artifactory/client.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'json'
 require 'net/http'
 require 'uri'

data/lib/artifactory/collections/artifact.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Collection::Artifact < Collection::Base
     #

data/lib/artifactory/collections/base.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Collection::Base
     #

data/lib/artifactory/configurable.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   #
   # A re-usable class containing configuration information for the {Client}. See

data/lib/artifactory/defaults.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'artifactory/version'
 
 module Artifactory

data/lib/artifactory/errors.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   module Error
     # Base class for all errors

data/lib/artifactory/resources/artifact.rb

@@ -1,3 +1,21 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'tempfile'
+
 module Artifactory
   class Resource::Artifact < Resource::Base
     class << self

data/lib/artifactory/resources/backup.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'rexml/document'
 
 module Artifactory

data/lib/artifactory/resources/base.rb

@@ -1,3 +1,20 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'cgi'
 require 'json'
 
 module Artifactory
@@ -305,8 +322,8 @@ module Artifactory
     #
     def to_matrix_properties(hash = {})
       properties = hash.map do |k, v|
-        key   = URI.escape(k.to_s)
-        value = URI.escape(v.to_s)
+        key   = CGI.escape(k.to_s)
+        value = CGI.escape(v.to_s)
 
         "#{key}=#{value}"
       end

data/lib/artifactory/resources/build.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::Build < Resource::Base
     class << self

data/lib/artifactory/resources/group.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::Group < Resource::Base
     class << self

data/lib/artifactory/resources/layout.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'rexml/document'
 
 module Artifactory

data/lib/artifactory/resources/ldap_setting.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'rexml/document'
 
 module Artifactory

data/lib/artifactory/resources/mail_server.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'rexml/document'
 
 module Artifactory

data/lib/artifactory/resources/plugin.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::Plugin < Resource::Base
     class << self

data/lib/artifactory/resources/repository.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::Repository < Resource::Base
     class << self

data/lib/artifactory/resources/system.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::System < Resource::Base
     class << self

data/lib/artifactory/resources/url_base.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'rexml/document'
 
 module Artifactory

data/lib/artifactory/resources/user.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   class Resource::User < Resource::Base
     class << self

data/lib/artifactory/util.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
   module Util
     extend self

data/lib/artifactory/version.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2014 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Artifactory
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/spec/unit/resources/artifact_spec.rb

@@ -54,13 +54,29 @@ module Artifactory
 
       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%20Vargo/remote/path', file, {})
+          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth/remote/path', file, {})
 
           subject.upload('libs-release-local', '/remote/path',
             branch: 'master',
+            user: 'Seth',
+          )
+        end
+
+        it 'converts spaces to "+" characters' do
+          expect(client).to receive(:put).with('libs-release-local;user=Seth+Vargo/remote/path', file, {})
+
+          subject.upload('libs-release-local', '/remote/path',
             user: 'Seth Vargo',
           )
         end
+
+        it 'converts "+" to "%2B"' do
+          expect(client).to receive(:put).with('libs-release-local;version=12.0.0-alpha.1%2B20140826080510.git.50.f5ff271/remote/path', file, {})
+
+          subject.upload('libs-release-local', '/remote/path',
+            version: '12.0.0-alpha.1+20140826080510.git.50.f5ff271',
+          )
+        end
       end
 
       context 'when custom headers are given' do

data/spec/unit/resources/repository_spec.rb

@@ -119,16 +119,16 @@ module Artifactory
 
     describe '#upload' do
       let(:client) { double(put: {}) }
+      let(:file) { double(File) }
+      let(:path) { '/fake/path' }
       before do
         subject.client = client
         subject.key    = 'libs-release-local'
+        allow(File).to receive(:new).with('/fake/path').and_return(file)
       end
 
       context 'when the artifact is a file path' do
         it 'PUTs the file at the path to the server' do
-          file = double(File)
-          path = '/fake/path'
-          allow(File).to receive(:new).with('/fake/path').and_return(file)
           expect(client).to receive(:put).with('libs-release-local/remote/path', file, {})
 
           subject.upload(path, '/remote/path')
@@ -137,24 +137,43 @@ module Artifactory
 
       context 'when matrix properties are given' do
         it 'converts the hash into matrix properties' do
-          file = double(File)
-          path = '/fake/path'
-          allow(File).to receive(:new).with('/fake/path').and_return(file)
-          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth%20Vargo/remote/path', file, {})
+          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth+Vargo%2B1/remote/path', file, {})
 
           subject.upload(path, '/remote/path',
             branch: 'master',
+            user: 'Seth Vargo+1',
+          )
+        end
+
+        it 'converts the hash into matrix properties' do
+          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth/remote/path', file, {})
+
+          subject.upload(path, '/remote/path',
+            branch: 'master',
+            user: 'Seth',
+          )
+        end
+
+        it 'converts spaces to "+" characters' do
+          expect(client).to receive(:put).with('libs-release-local;user=Seth+Vargo/remote/path', file, {})
+
+          subject.upload(path, '/remote/path',
             user: 'Seth Vargo',
           )
         end
+
+        it 'converts "+" to "%2B"' do
+          expect(client).to receive(:put).with('libs-release-local;version=12.0.0-alpha.1%2B20140826080510.git.50.f5ff271/remote/path', file, {})
+
+          subject.upload(path, '/remote/path',
+            version: '12.0.0-alpha.1+20140826080510.git.50.f5ff271',
+          )
+        end
       end
 
       context 'when custom headers are given' do
         it 'passes the headers to the client' do
           headers = { 'Content-Type' => 'text/plain' }
-          file = double(File)
-          path = '/fake/path'
-          allow(File).to receive(:new).with('/fake/path').and_return(file)
           expect(client).to receive(:put).with('libs-release-local/remote/path', file, headers)
 
           subject.upload(path, '/remote/path', {}, headers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Artifactory is a simple, lightweight Ruby client for interacting with the
@@ -170,4 +170,3 @@ test_files:
 - spec/unit/resources/system_spec.rb
 - spec/unit/resources/url_base_spec.rb
 - spec/unit/resources/user_spec.rb
-has_rdoc: