artifactory 1.1.0 → 1.2.0

data/spec/unit/resources/build_spec.rb

@@ -25,7 +25,7 @@ module Artifactory
 
       context 'when the system has no builds' do
         it 'returns an empty array' do
-          client.stub(:get).and_raise(Error::NotFound)
+          client.stub(:get).and_raise(Error::HTTPError.new('status' => 404))
           expect(described_class.all).to be_empty
         end
       end

data/spec/unit/resources/group_spec.rb

@@ -62,7 +62,7 @@ module Artifactory
         }
       end
 
-      it 'creates a new instnace' do
+      it 'creates a new instance' do
         instance = described_class.from_hash(hash)
         expect(instance.name).to eq('readers')
         expect(instance.description).to eq('This list of read-only users')

data/spec/unit/resources/layout_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module Artifactory
+  describe Resource::Layout do
+    let(:client) { double(:client) }
+
+    before(:each) do
+      Artifactory.stub(:client).and_return(client)
+      client.stub(:get).and_return(response) if defined?(response)
+    end
+
+    describe '.all' do
+      doc = <<-XML
+        <config>
+          <repoLayouts>
+            <repoLayout>
+              <name>fake-layout</name>
+            </repoLayout>
+          </repoLayouts>
+        </config>
+      XML
+      let(:xml) do
+        REXML::Document.new(doc)
+      end
+
+      before do
+        Resource::System.stub(:configuration).and_return(xml)
+      end
+
+      it 'returns the layouts' do
+        expect(described_class.all).to be_a(Array)
+        expect(described_class.all.first).to be_a(described_class)
+        expect(described_class.all.first.name).to eq('fake-layout')
+      end
+    end
+
+    describe '.find' do
+      doc = <<-XML
+        <config>
+          <repoLayouts>
+            <repoLayout>
+              <name>found-layout</name>
+            </repoLayout>
+          </repoLayouts>
+        </config>
+      XML
+      let(:xml) do
+        REXML::Document.new(doc)
+      end
+
+      before do
+        Resource::System.stub(:configuration).and_return(xml)
+      end
+
+      it 'returns the found layout' do
+        expect(described_class.find('found-layout')).to be_a(described_class)
+        expect(described_class.find('found-layout').name).to eq('found-layout')
+      end
+    end
+  end
+end

data/spec/unit/resources/repository_spec.rb

@@ -18,9 +18,9 @@ module Artifactory
         ]
       end
       before do
-        described_class.stub(:find).with(name: 'a', client: client).and_return('a')
-        described_class.stub(:find).with(name: 'b', client: client).and_return('b')
-        described_class.stub(:find).with(name: 'c', client: client).and_return('c')
+        described_class.stub(:find).with('a', client: client).and_return('a')
+        described_class.stub(:find).with('b', client: client).and_return('b')
+        described_class.stub(:find).with('c', client: client).and_return('c')
       end
 
       it 'gets /api/repositories' do
@@ -38,7 +38,7 @@ module Artifactory
 
       it 'gets /api/repositories/#{name}' do
         expect(client).to receive(:get).with('/api/repositories/libs-release-local').once
-        described_class.find(name: 'libs-release-local')
+        described_class.find('libs-release-local')
       end
     end
 
@@ -68,7 +68,7 @@ module Artifactory
         }
       end
 
-      it 'creates a new instnace' do
+      it 'creates a new instance' do
         instance = described_class.from_hash(hash)
         expect(instance.blacked_out).to be_false
         expect(instance.description).to eq('Local repository for in-house libraries')
@@ -81,14 +81,27 @@ module Artifactory
         expect(instance.maximum_unique_snapshots).to eq(0)
         expect(instance.notes).to eq('')
         expect(instance.property_sets).to eq(['artifactory'])
+        expect(instance.rclass).to eq('local')
         expect(instance.snapshot_version_behavior).to eq('unique')
         expect(instance.suppress_pom_checks).to be_false
-        expect(instance.type).to eq('local')
       end
     end
 
-    describe '#upload' do
+    describe '#save' do
       let(:client) { double }
+      before do
+        subject.client = client
+        subject.key = 'libs-release-local'
+      end
+
+      it 'PUTS the file to the server' do
+        expect(client).to receive(:put).with('/api/repositories/libs-release-local', kind_of(String), kind_of(Hash))
+        subject.save
+      end
+    end
+
+    describe '#upload' do
+      let(:client) { double(put: {}) }
       before do
         subject.client = client
         subject.key    = 'libs-release-local'
@@ -96,8 +109,9 @@ module Artifactory
 
       context 'when the artifact is a File' do
         it 'PUTs the file to the server' do
-          file = double(:file, is_a?: true)
-          expect(client).to receive(:put).with('libs-release-local/remote/path', { file: file }, {})
+          file = double(file)
+          File.stub(:new).and_return(file)
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, {})
 
           subject.upload(file, '/remote/path')
         end
@@ -105,10 +119,10 @@ module Artifactory
 
       context 'when the artifact is a file path' do
         it 'PUTs the file at the path to the server' do
-          file = double(:file)
+          file = double(file)
           path = '/fake/path'
           File.stub(:new).with('/fake/path').and_return(file)
-          expect(client).to receive(:put).with('libs-release-local/remote/path', { file: file }, {})
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, {})
 
           subject.upload(path, '/remote/path')
         end
@@ -116,8 +130,9 @@ module Artifactory
 
       context 'when matrix properties are given' do
         it 'converts the hash into matrix properties' do
-          file = double(:file, is_a?: true)
-          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth%20Vargo/remote/path', { file: file }, {})
+          file = double(file)
+          File.stub(:new).and_return(file)
+          expect(client).to receive(:put).with('libs-release-local;branch=master;user=Seth%20Vargo/remote/path', file, {})
 
           subject.upload(file, '/remote/path',
             branch: 'master',
@@ -129,46 +144,15 @@ module Artifactory
       context 'when custom headers are given' do
         it 'passes the headers to the client' do
           headers = { 'Content-Type' => 'text/plain' }
-          file = double(:file, is_a?: true)
-          expect(client).to receive(:put).with('libs-release-local/remote/path', { file: file }, headers)
+          file = double(file)
+          File.stub(:new).and_return(file)
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, headers)
 
           subject.upload(file, '/remote/path', {}, headers)
         end
       end
     end
 
-    describe '#upload_with_checksum' do
-      it 'delegates to #upload' do
-        expect(subject).to receive(:upload).with(
-          '/local/file',
-          '/remote/path',
-          { branch: 'master' },
-          {
-            'X-Checksum-Deploy' => true,
-            'X-Checksum-Sha1'   => 'ABCD1234',
-          },
-        )
-        subject.upload_with_checksum('/local/file', '/remote/path',
-          'ABCD1234',
-          { branch: 'master' },
-        )
-      end
-    end
-
-    describe '#upload_from_archive' do
-      it 'delegates to #upload' do
-        expect(subject).to receive(:upload).with(
-          '/local/file',
-          '/remote/path',
-          {},
-          {
-            'X-Explode-Archive' => true,
-          },
-        )
-        subject.upload_from_archive('/local/file', '/remote/path')
-      end
-    end
-
     describe '#artifacts' do
       before { subject.key = 'libs-release-local' }
 

data/spec/unit/resources/system_spec.rb

@@ -38,7 +38,8 @@ module Artifactory
 
       context 'when the system is not running' do
         it 'returns false' do
-          client.stub(:get).and_raise(Error::ConnectionError)
+          client.stub(:get)
+            .and_raise(Error::ConnectionError.new(Artifactory.endpoint))
           expect(described_class.ping).to be_false
         end
       end
@@ -63,7 +64,8 @@ module Artifactory
       before { client.stub(:post).and_return(response) }
 
       it 'posts /api/system/configuration' do
-        expect(client).to receive(:post).with('/api/system/configuration', xml).once
+        headers = { 'Content-Type' => 'application/xml' }
+        expect(client).to receive(:post).with('/api/system/configuration', xml, headers).once
         described_class.update_configuration(xml)
       end
 

data/spec/unit/resources/user_spec.rb

@@ -65,7 +65,7 @@ module Artifactory
         }
       end
 
-      it 'creates a new instnace' do
+      it 'creates a new instance' do
         instance = described_class.from_hash(hash)
         expect(instance.admin).to be_false
         expect(instance.email).to eq('admin@example.com')

metadata

@@ -1,69 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby client for Artifactory
@@ -72,8 +44,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -91,16 +63,17 @@ files:
 - lib/artifactory/resources/base.rb
 - lib/artifactory/resources/build.rb
 - lib/artifactory/resources/group.rb
+- lib/artifactory/resources/layout.rb
 - lib/artifactory/resources/plugin.rb
 - lib/artifactory/resources/repository.rb
 - lib/artifactory/resources/system.rb
 - lib/artifactory/resources/user.rb
 - lib/artifactory/util.rb
 - lib/artifactory/version.rb
-- locales/en.yml
 - spec/integration/resources/artifact_spec.rb
 - spec/integration/resources/build_spec.rb
 - spec/integration/resources/group_spec.rb
+- spec/integration/resources/layout_spec.rb
 - spec/integration/resources/repository_spec.rb
 - spec/integration/resources/system_spec.rb
 - spec/integration/resources/user_spec.rb
@@ -119,6 +92,7 @@ files:
 - spec/unit/resources/base_spec.rb
 - spec/unit/resources/build_spec.rb
 - spec/unit/resources/group_spec.rb
+- spec/unit/resources/layout_spec.rb
 - spec/unit/resources/plugin_spec.rb
 - spec/unit/resources/repository_spec.rb
 - spec/unit/resources/system_spec.rb
@@ -133,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Artifactory is a simple, lightweight Ruby client for interacting with the
@@ -152,6 +126,7 @@ test_files:
 - spec/integration/resources/artifact_spec.rb
 - spec/integration/resources/build_spec.rb
 - spec/integration/resources/group_spec.rb
+- spec/integration/resources/layout_spec.rb
 - spec/integration/resources/repository_spec.rb
 - spec/integration/resources/system_spec.rb
 - spec/integration/resources/user_spec.rb
@@ -170,6 +145,7 @@ test_files:
 - spec/unit/resources/base_spec.rb
 - spec/unit/resources/build_spec.rb
 - spec/unit/resources/group_spec.rb
+- spec/unit/resources/layout_spec.rb
 - spec/unit/resources/plugin_spec.rb
 - spec/unit/resources/repository_spec.rb
 - spec/unit/resources/system_spec.rb

data/locales/en.yml

@@ -1,27 +0,0 @@
-en:
-  artifactory:
-    errors:
-      bad_request: >
-        The Artifactory server declined to server the URL `%{url}'. Here is
-        more information from the server:
-
-          %{body}
-      connection_error: >
-        The Artifactory server at `%{url}' threw an unexpected error. We do not
-        have any additional information to offer, sorry. Here is what the server
-        said:
-
-          %{body}
-      forbidden: >
-        You are not permitted to access `%{url}'. The Artifactory server
-        responded with a 403 Forbidden error.
-      method_not_allowed: >
-        That HTTP method is not allowed!
-      not_found: >
-        The requested URL `%{url}' does not exist on the Artifactory server.
-        Please confirm you have spelled everything correctly.
-      unauthorized: >
-        You are not authorized to access `%{url}'. The Artifactory server
-        responded with a 401 Unauthorzed. The requested endpoint requires
-        authentication - try adding basic authentication to your request and
-        try again.