artifactory 1.1.0 → 1.2.0

data/lib/artifactory/resources/system.rb

@@ -87,7 +87,11 @@ module Artifactory
       #
       def update_configuration(xml, options = {})
         client = extract_client!(options)
-        client.post('/api/system/configuration', xml)
+
+        # The Artifactory api requires a content type of 'application/xml'.
+        # See http://bit.ly/1l2IvZY
+        headers = { 'Content-Type' => 'application/xml' }
+        client.post('/api/system/configuration', xml, headers)
       end
 
       #

data/lib/artifactory/resources/user.rb

@@ -43,57 +43,10 @@ module Artifactory
 
         response = client.get("/api/security/users/#{url_safe(name)}")
         from_hash(response, client: client)
-      rescue Error::NotFound
+      rescue Error::HTTPError => e
+        raise unless e.code == 404
         nil
       end
-
-      #
-      # Construct a user from the given URL.
-      #
-      # @example Create an user object from the given URL
-      #   User.from_url('/security/users/readers') #=> #<Resource::User>
-      #
-      # @param [Artifactory::Client] client
-      #   the client object to make the request with
-      # @param [String] url
-      #   the URL to find the user from
-      #
-      # @return [Resource::User]
-      #
-      def from_url(url, options = {})
-        client = extract_client!(options)
-        from_hash(client.get(url), client: client)
-      end
-
-      #
-      # Create a instance from the given Hash. This method extracts the "safe"
-      # information from the hash and adds them to the instance.
-      #
-      # @example Create a new user from a hash
-      #   User.from_hash('realmAttributes' => '...', 'name' => '...')
-      #
-      # @param [Artifactory::Client] client
-      #   the client object to make the request with
-      # @param [Hash] hash
-      #   the hash to create the instance from
-      #
-      # @return [Resource::User]
-      #
-      def from_hash(hash, options = {})
-        client = extract_client!(options)
-
-        new.tap do |instance|
-          instance.admin                      = !!hash['admin']
-          instance.email                      = hash['email']
-          instance.groups                     = Array(hash['groups'])
-          instance.internal_password_disabled = hash['internalPasswordDisabled']
-          instance.last_logged_in             = hash['lastLoggedIn']
-          instance.name                       = hash['name']
-          instance.password                   = hash['password']
-          instance.profile_updatable          = !!hash['profileUpdatable']
-          instance.realm                      = hash['realm']
-        end
-      end
     end
 
     attribute :admin, false
@@ -114,8 +67,9 @@ module Artifactory
     #   true if the object was deleted successfully, false otherwise
     #
     def delete
-      !!client.delete(api_path)
-    rescue Error::NotFound
+      client.delete(api_path)
+      true
+    rescue Error::HTTPError => e
       false
     end
 
@@ -129,34 +83,6 @@ module Artifactory
       true
     end
 
-    #
-    # The hash format for this user.
-    #
-    # @return [Hash]
-    #
-    def to_hash
-      {
-        'admin'                    => admin,
-        'email'                    => email,
-        'groups'                   => groups,
-        'internalPasswordDisabled' => internal_password_disabled,
-        'lastLoggedIn'             => last_logged_in,
-        'name'                     => name,
-        'password'                 => password,
-        'profileUpdatable'         => profile_updatable,
-        'realm'                    => realm,
-      }
-    end
-
-    #
-    # The JSON representation of this resource.
-    #
-    # @return [String]
-    #
-    def to_json
-      JSON.fast_generate(to_hash)
-    end
-
     private
 
     #

data/lib/artifactory/util.rb

@@ -29,12 +29,18 @@ module Artifactory
     #
     # @return [String]
     #
-    def camelize(string)
-      string
+    def camelize(string, lowercase = false)
+      result = string
         .to_s
         .split('_')
         .map { |e| e.capitalize }
         .join
+
+      if lowercase
+        result[0,1].downcase + result[1..-1]
+      else
+        result
+      end
     end
 
     #

data/lib/artifactory/version.rb

@@ -1,3 +1,3 @@
 module Artifactory
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/integration/resources/layout_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Artifactory
+  describe Resource::Layout, :integration do
+    describe '.all' do
+      it 'returns an array of Layouts' do
+        results = described_class.all
+        expect(results).to be_a(Array)
+        expect(results.first).to be_a(described_class)
+      end
+    end
+
+    describe '.find' do
+      it 'finds a layout by name' do
+        mvn_layout = described_class.find('maven-2-default')
+
+        expect(mvn_layout).to be_a(described_class)
+        expect(mvn_layout.name).to eq('maven-2-default')
+      end
+    end
+  end
+end

data/spec/integration/resources/repository_spec.rb

@@ -9,5 +9,12 @@ module Artifactory
         expect(results.first).to be_a(described_class)
       end
     end
+
+    describe '#save' do
+      it 'saves the repository to the server' do
+        repository = described_class.new(key: 'libs-testing-local')
+        expect(repository.save).to be_true
+      end
+    end
   end
 end

data/spec/integration/resources/system_spec.rb

@@ -23,10 +23,10 @@ module Artifactory
     describe '.update_configuration' do
       let(:tempfile) { Tempfile.new(['config', 'xml']) }
       let(:content) do
-        """.strip.gsub(/^ {8}/, '')
-        <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-        <newConfig>true</newConfig>
-        """
+        <<-EOH.strip.gsub(/^ {10}/, '')
+          <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+          <newConfig>true</newConfig>
+        EOH
       end
 
       after do

data/spec/support/api_server/repository_endpoints.rb

@@ -70,6 +70,11 @@ module Artifactory
           'rclass'                       => 'local'
         })
       end
+
+      app.put('/api/repositories/libs-testing-local') do
+        content_type 'text/plain'
+        "Repository libs-resting-local created successfully!\n"
+      end
     end
   end
 end

data/spec/support/api_server/system_endpoints.rb

@@ -17,6 +17,24 @@ module Artifactory
                   xmlns='http://artifactory.jfrog.org/xsd/1.5.3'
                   xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
             <offlineMode>false</offlineMode>
+            <repoLayouts>
+              <repoLayout>
+                <name>maven-2-default</name>
+                <artifactPathPattern>[orgPath]/[module]/[baseRev](-[folderItegRev])/[module]-[baseRev](-[fileItegRev])(-[classifier]).[ext]</artifactPathPattern>
+                <distinctiveDescriptorPathPattern>true</distinctiveDescriptorPathPattern>
+                <descriptorPathPattern>[orgPath]/[module]/[baseRev](-[folderItegRev])/[module]-[baseRev](-[fileItegRev])(-[classifier]).pom</descriptorPathPattern>
+                <folderIntegrationRevisionRegExp>SNAPSHOT</folderIntegrationRevisionRegExp>
+                <fileIntegrationRevisionRegExp>SNAPSHOT|(?:(?:[0-9]{8}.[0-9]{6})-(?:[0-9]+))</fileIntegrationRevisionRegExp>
+              </repoLayout>
+              <repoLayout>
+                <name>gradle-default</name>
+                <artifactPathPattern>[orgPath]/[module]/[baseRev](-[folderItegRev])/[module]-[baseRev](-[fileItegRev])(-[classifier]).[ext]</artifactPathPattern>
+                <distinctiveDescriptorPathPattern>true</distinctiveDescriptorPathPattern>
+                <descriptorPathPattern>[orgPath]/[module]/[baseRev](-[folderItegRev])/[module]-[baseRev](-[fileItegRev])(-[classifier]).pom</descriptorPathPattern>
+                <folderIntegrationRevisionRegExp>SNAPSHOT</folderIntegrationRevisionRegExp>
+                <fileIntegrationRevisionRegExp>SNAPSHOT|(?:(?:[0-9]{8}.[0-9]{6})-(?:[0-9]+))</fileIntegrationRevisionRegExp>
+              </repoLayout>
+            </repoLayouts>
           </config>
         EOH
       end

data/spec/unit/client_spec.rb

@@ -41,134 +41,53 @@ module Artifactory
       end
     end
 
-    describe '#agent' do
-      it 'acts like an HTTPClient' do
-        expect(client.agent).to be_a(HTTPClient)
-      end
-
-      it 'caches the agent' do
-        agent = Artifactory.client.agent
-        expect(agent).to be(Artifactory.client.agent)
-      end
-
-      it 'sets basic auth if given' do
-        subject.username = 'admin'
-        subject.password = 'password'
-        expect(subject.agent.www_auth.basic_auth).to be_a(HTTPClient::BasicAuth)
-      end
-
-      it 'sets the proxy if given' do
-        subject.proxy = 'http://admin:password@localhost'
-        expect(subject.agent.proxy.to_s).to eq('http://admin:password@localhost')
-      end
-    end
-
     describe '#get' do
       it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:get, '/foo')
+        expect(subject).to receive(:request).with(:get, '/foo', {}, {})
         subject.get('/foo')
       end
     end
 
     describe '#post' do
+      let(:data) { double }
+
       it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:post, '/foo')
-        subject.post('/foo')
+        expect(subject).to receive(:request).with(:post, '/foo', data, {})
+        subject.post('/foo', data)
       end
     end
 
     describe '#put' do
+      let(:data) { double }
+
       it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:put, '/foo')
-        subject.put('/foo')
+        expect(subject).to receive(:request).with(:put, '/foo', data, {})
+        subject.put('/foo', data)
       end
     end
 
     describe '#patch' do
+      let(:data) { double }
+
       it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:patch, '/foo')
-        subject.patch('/foo')
+        expect(subject).to receive(:request).with(:patch, '/foo', data, {})
+        subject.patch('/foo', data)
       end
     end
 
     describe '#delete' do
       it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:delete, '/foo')
+        expect(subject).to receive(:request).with(:delete, '/foo', {}, {})
         subject.delete('/foo')
       end
     end
 
-    describe '#head' do
-      it 'delegates to the #request method' do
-        expect(subject).to receive(:request).with(:head, '/foo')
-        subject.head('/foo')
-      end
-    end
-
     describe '#request' do
-      # it 'transforms relative URLs' do
-      #   request = client.request(:get, '/api/system/info')
-      #   expect(request.url).to eq("#{client.endpoint}/api/system/info")
-      # end
-
-      # it 'does not transform absolute URLs' do
-      #   request = client.request(:get, 'https://github.com')
-      #   expect(request.url).to eq('https://github.com')
-      # end
-
       context 'when the response is a 400' do
-        before { stub_request(:get, /.+/).to_return(status: 400) }
-
-        it 'raises a BadRequest error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::BadRequest)
-        end
-      end
-
-      context 'when the response is a 401' do
-        before { stub_request(:get, /.+/).to_return(status: 401) }
-
-        it 'raises a Unauthorized error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::Unauthorized)
-        end
-      end
-
-      context 'when the response is a 403' do
-        before { stub_request(:get, /.+/).to_return(status: 403) }
-
-        it 'raises a Forbidden error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::Forbidden)
-        end
-      end
-
-      context 'when the response is a 404' do
-        before { stub_request(:get, /.+/).to_return(status: 404) }
-
-        it 'raises a NotFound error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::NotFound)
-        end
-      end
-
-      context 'when the response is a 405' do
-        before { stub_request(:get, /.+/).to_return(status: 405) }
-
-        it 'raises a MethodNotAllowed error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::MethodNotAllowed)
-        end
-      end
-
-      context 'when the response is a 500' do
-        before { stub_request(:get, /.+/).to_return(status: 500) }
-
-        it 'raises a ConnectionError error' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::ConnectionError)
-        end
-      end
-
-      context 'when something really bad happens' do
-        before { stub_request(:get, /.+/).to_raise(SocketError) }
+        before { stub_request(:get, /.+/).to_return(status: 5000, body: 'No!') }
 
-        it 'converts to a ConnectionError' do
-          expect { subject.request(:get, '/') }.to raise_error(Error::ConnectionError)
+        it 'raises an HTTPError error' do
+          expect { subject.request(:get, '/') }.to raise_error(Error::HTTPError)
         end
       end
     end

data/spec/unit/resources/artifact_spec.rb

@@ -34,6 +34,92 @@ module Artifactory
       end
     end
 
+    describe '#upload' do
+      let(:client) { double(put: {}) }
+      before do
+        subject.client = client
+      end
+
+      context 'when the artifact is a File' do
+        it 'PUTs the file to the server' do
+          file = double(file)
+          File.stub(:new).and_return(file)
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, {})
+
+          subject.upload('libs-release-local', file, '/remote/path')
+        end
+      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'
+          File.stub(:new).with('/fake/path').and_return(file)
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, {})
+
+          subject.upload('libs-release-local', path, '/remote/path')
+        end
+      end
+
+      context 'when matrix properties are given' do
+        it 'converts the hash into matrix properties' do
+          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('libs-release-local', file, '/remote/path',
+            branch: 'master',
+            user: 'Seth Vargo',
+          )
+        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)
+          File.stub(:new).and_return(file)
+          expect(client).to receive(:put).with('libs-release-local/remote/path', file, headers)
+
+          subject.upload('libs-release-local', file, '/remote/path', {}, headers)
+        end
+      end
+    end
+
+    describe '#upload_with_checksum' do
+      it 'delegates to #upload' do
+        expect(subject).to receive(:upload).with(
+          'libs-release-local',
+          '/local/file',
+          '/remote/path',
+          { branch: 'master' },
+          {
+            'X-Checksum-Deploy' => true,
+            'X-Checksum-Sha1'   => 'ABCD1234',
+          },
+        )
+        subject.upload_with_checksum('libs-release-local', '/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(
+          'libs-release-local',
+          '/local/file',
+          '/remote/path',
+          {},
+          {
+            'X-Explode-Archive' => true,
+          },
+        )
+        subject.upload_from_archive('libs-release-local', '/local/file', '/remote/path')
+      end
+    end
+
     describe '.gavc_search' do
       let(:response) { { 'results' => [] } }
 
@@ -161,7 +247,7 @@ module Artifactory
       end
 
       it 'returns an empty array when the server responses with a 404' do
-        client.stub(:get).and_raise(Error::NotFound)
+        client.stub(:get).and_raise(Error::HTTPError.new('status' => 404))
 
         result = described_class.versions
         expect(result).to be_a(Array)
@@ -207,7 +293,7 @@ module Artifactory
       end
 
       it 'returns an nil when the server responses with a 404' do
-        client.stub(:get).and_raise(Error::NotFound)
+        client.stub(:get).and_raise(Error::HTTPError.new('status' => 404))
 
         expect(described_class.latest_version).to be_nil
       end
@@ -242,13 +328,13 @@ module Artifactory
         }
       end
 
-      it 'creates a new instnace' do
+      it 'creates a new instance' do
         instance = described_class.from_hash(hash)
         expect(instance).to be_a(described_class)
-        expect(instance.api_path).to eq('http://localhost:8080/artifactory/api/storage/libs-release-local/org/acme/lib/ver/lib-ver.pom')
+        expect(instance.uri).to eq('http://localhost:8080/artifactory/api/storage/libs-release-local/org/acme/lib/ver/lib-ver.pom')
         expect(instance.client).to be(client)
         expect(instance.created).to eq(Time.parse('2014-01-01 10:00 UTC'))
-        expect(instance.download_path).to eq('http://localhost:8080/artifactory/libs-release-local/org/acme/lib/ver/lib-ver.pom')
+        expect(instance.download_uri).to eq('http://localhost:8080/artifactory/libs-release-local/org/acme/lib/ver/lib-ver.pom')
         expect(instance.last_modified).to eq(Time.parse('2014-01-01 11:00 UTC'))
         expect(instance.last_updated).to eq(Time.parse('2014-01-01 12:00 UTC'))
         expect(instance.md5).to eq('MD5123')
@@ -274,7 +360,7 @@ module Artifactory
 
       it 'sends DELETE to the client' do
         subject.client = client
-        subject.download_path = '/artifact.deb'
+        subject.download_uri = '/artifact.deb'
 
         expect(client).to receive(:delete)
         subject.delete
@@ -300,15 +386,15 @@ module Artifactory
         { 'properties' => properties }
       end
       let(:client) { double(get: response) }
-      let(:api_path) { '/artifact.deb' }
+      let(:uri) { '/artifact.deb' }
 
       before do
         subject.client   = client
-        subject.api_path = api_path
+        subject.uri = uri
       end
 
       it 'gets the properties from the server' do
-        expect(client).to receive(:get).with(api_path, properties: nil).once
+        expect(client).to receive(:get).with(uri, properties: nil).once
         expect(subject.properties).to eq(properties)
       end
 
@@ -323,11 +409,11 @@ module Artifactory
         { 'licenses' => [{ 'name' => 'LGPL v3' }] }
       end
       let(:client) { double(get: compliance) }
-      let(:api_path) { '/artifact.deb' }
+      let(:uri) { '/artifact.deb' }
 
       before do
         subject.client   = client
-        subject.api_path = api_path
+        subject.uri = uri
       end
 
       it 'gets the compliance from the server' do
@@ -349,7 +435,7 @@ module Artifactory
       before { described_class.send(:public, :relative_path) }
 
       it 'parses the relative path' do
-        subject.api_path = '/api/storage/foo/bar/zip'
+        subject.uri = '/api/storage/foo/bar/zip'
         expect(subject.relative_path).to eq('/foo/bar/zip')
       end
     end
@@ -360,7 +446,7 @@ module Artifactory
         described_class.send(:public, :copy_or_move)
 
         subject.client   = client
-        subject.api_path = '/api/storage/foo/bar/artifact.deb'
+        subject.uri = '/api/storage/foo/bar/artifact.deb'
       end
 
       it 'sends POST to the client with parsed params' do