artifactory 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562e2e027e6ca103ce6c1570126b43087a7dcd62
-  data.tar.gz: 37774d16b6e2ac098b1219af3cac95d248d12873
+  metadata.gz: cebccbe5005de8daa87ddb5c2cff9e7fd3a47d28
+  data.tar.gz: 8a616316ec8cbcf35a53fb49646273fad0e8ac09
 SHA512:
-  metadata.gz: 65431df8d3d1e2442ba29013bdcb58b2b49c80bb1baef033b25e6382084e9206d178ae018c615ae38a04296a0dbac661fd544708a354fabd02ebbaac4810e323
-  data.tar.gz: a53dc84bbc5a61acf178fa25fe14e8efe577141e5971f237b8aced47932b3fad0a654c078f849e2a1d8bf84c6f8e28c6d154086968dec7390dc5a2acee45b197
+  metadata.gz: 3e66007bc0e0c3a17bf27df588bd10ef21b7f60b39581c464254723f57d18d44d6299cd52deacf8a735b59fdf1e5d9d136799b57d00ae41fca11cc215c28b049
+  data.tar.gz: dac023ee6fea73f52003e52840b018996ad77b0fe425522bd03457798e2558b94599ae6376a36ffe7dd67886821f458306e0543e2e9230ce690f98ed33e1a4bf

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.2 (08-26-2014)
+-------------------
+- Use the proper REST verbs on various resources to prevent a bug
+
 v2.1.1 (08-25-2014)
 -------------------
 - Use the proper name for POM consistency checks

data/lib/artifactory/resources/group.rb

@@ -70,12 +70,17 @@ module Artifactory
     end
 
     #
-    # Save the group to the artifactory server.
+    # Creates or updates a group configuration depending on if the
+    # group configuration previously existed.
     #
     # @return [Boolean]
     #
     def save
-      client.put(api_path, to_json, headers)
+      if self.class.find(name, client: client)
+        client.post(api_path, to_json, headers)
+      else
+        client.put(api_path, to_json, headers)
+      end
       true
     end
 

data/lib/artifactory/resources/repository.rb

@@ -65,8 +65,22 @@ module Artifactory
     attribute :snapshot_version_behavior, 'non-unique'
     attribute :suppress_pom_consistency_checks, false
 
+    #
+    # Creates or updates a repository configuration depending on if the
+    # repository configuration previously existed. This method also works
+    # around Artifactory's dangerous default behavior:
+    #
+    #   > An existing repository with the same key are removed from the
+    #   > configuration and its content is removed!
+    #
+    # @return [Boolean]
+    #
     def save
-      client.put(api_path, to_json, headers)
+      if self.class.find(key, client: client)
+        client.post(api_path, to_json, headers)
+      else
+        client.put(api_path, to_json, headers)
+      end
       true
     end
 

data/lib/artifactory/resources/user.rb

@@ -74,12 +74,17 @@ module Artifactory
     end
 
     #
-    # Save the user to the artifactory server.
+    # Creates or updates a user configuration depending on if the
+    # user configuration previously existed.
     #
     # @return [Boolean]
     #
     def save
-      client.put(api_path, to_json, headers)
+      if self.class.find(name, client: client)
+        client.post(api_path, to_json, headers)
+      else
+        client.put(api_path, to_json, headers)
+      end
       true
     end
 

data/lib/artifactory/version.rb

@@ -1,3 +1,3 @@
 module Artifactory
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/support/api_server/repository_endpoints.rb

@@ -71,6 +71,11 @@ module Artifactory
         })
       end
 
+      # Simulate a non-existent repository
+      app.get('/api/repositories/libs-testing-local') do
+        status 400
+      end
+
       app.put('/api/repositories/libs-testing-local') do
         content_type 'text/plain'
         "Repository libs-resting-local created successfully!\n"

data/spec/unit/resources/group_spec.rb

@@ -71,5 +71,35 @@ module Artifactory
         expect(instance.realm_attributes).to be_nil
       end
     end
+
+    describe '#save' do
+      let(:client) { double }
+      before do
+        subject.client = client
+        subject.name = 'deployers'
+      end
+
+      context 'when the group is new' do
+        before do
+          allow(described_class).to receive(:find).with(subject.name, client: client).and_return(nil)
+        end
+
+        it 'PUTS the group to the server' do
+          expect(client).to receive(:put).with("/api/security/groups/#{subject.name}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
+      end
+
+      context 'when the group exists' do
+        before do
+          allow(described_class).to receive(:find).with(subject.name, client: client).and_return({name: subject.name})
+        end
+
+        it 'POSTS the group to the server' do
+          expect(client).to receive(:post).with("/api/security/groups/#{subject.name}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
+      end
+    end
   end
 end

data/spec/unit/resources/repository_spec.rb

@@ -94,9 +94,26 @@ module Artifactory
         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
+      context 'when the repository is new' do
+        before do
+          allow(described_class).to receive(:find).with(subject.key, client: client).and_return(nil)
+        end
+
+        it 'PUTS the file to the server' do
+          expect(client).to receive(:put).with("/api/repositories/#{subject.key}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
+      end
+
+      context 'when the repository exists' do
+        before do
+          allow(described_class).to receive(:find).with(subject.key, client: client).and_return({key: subject.key})
+        end
+
+        it 'POSTS the file to the server' do
+          expect(client).to receive(:post).with("/api/repositories/#{subject.key}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
       end
     end
 

data/spec/unit/resources/user_spec.rb

@@ -78,5 +78,35 @@ module Artifactory
         expect(instance.realm).to eq('artifactory')
       end
     end
+
+    describe '#save' do
+      let(:client) { double }
+      before do
+        subject.client = client
+        subject.name = 'schisamo'
+      end
+
+      context 'when the user is new' do
+        before do
+          allow(described_class).to receive(:find).with(subject.name, client: client).and_return(nil)
+        end
+
+        it 'PUTS the user to the server' do
+          expect(client).to receive(:put).with("/api/security/users/#{subject.name}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
+      end
+
+      context 'when the user exists' do
+        before do
+          allow(described_class).to receive(:find).with(subject.name, client: client).and_return({name: subject.name})
+        end
+
+        it 'POSTS the user to the server' do
+          expect(client).to receive(:post).with("/api/security/users/#{subject.name}", kind_of(String), kind_of(Hash))
+          subject.save
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler