gerry 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50cbfe20d0fa8c4f9a179cb5e74fc4ed0bdf346c
-  data.tar.gz: e865e925bda4a23be8df637f48278174fd3ae048
+  metadata.gz: 7acb8ce23cd5d62c8c798fd0ec2c0894d7c3261b
+  data.tar.gz: 48ce2f02ba42cf6054eac0e43bbf1369db8349bb
 SHA512:
-  metadata.gz: a0f656b7564de7d4f0a68bbd3a90323f3392e1fca2724d22ba7847a3063f81337531194eb5129b269f47a126efbef728673d1a25dc77cff79923b5ffcceb5760
-  data.tar.gz: 9cd7d00b43322b5dbc68fe116d80e16a5d26d594be79778b4cebee17bb813e7dacd40dcdb1bcdbe484a73d1b92e0f0d9bfcd8d2710e684cebb1315f8fd86548e
+  metadata.gz: fa5fbdc2557111413f6d49025b3e260d004eaead164998fdcf56ee65ead061d0dad52058b86a75759a0971c01ecb60b79a0f1de4a2f6183cff13c6c053bb48b3
+  data.tar.gz: 6a6362df52ea5469b09a6c8e1b64989f20b36c7f7025488f908ff64917d19fff979a9d294c641c7891ea97a39e843346cc4228ec3b1caeb045b4ef2231a6f1c4

data/README.md

@@ -39,10 +39,19 @@ client.changes(['q=is:open'])
 => [{"project"=>"awesome", "branch"=>"master", "id"=>"Ibfedd978...."}]
 ```
 
+### Authentication type
+Gerrit uses digest authentication by default. This can be changed by
+configuring `auth.gitBasicAuth = true`. If the gerrit server uses
+basic authentication, you need to specify it:
+```ruby
+client = Gerry.new('https://review', 'user', 'p455w0rd')
+client.set_auth_type(:basic_auth)
+```
+
 ## Licence
 The MIT Licence
 
-Copyright (c) Fabian Mettler, Andrew Erickson, Travis Truman, Sebastian Schuberth
+Copyright (c) Fabian Mettler, Andrew Erickson, Travis Truman, Sebastian Schuberth, Orgad Shaneh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -51,10 +60,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## References
-[http://code.google.com/p/gerrit/][gerrit]
-
-[gerrit]: http://code.google.com/p/gerrit/
-
-[https://gerrit-review.googlesource.com/Documentation/rest-api.html][apidocumentation]
+https://www.gerritcodereview.com/
 
-[apidocumentation]: https://gerrit-review.googlesource.com/Documentation/rest-api.html
+https://gerrit-review.googlesource.com/Documentation/rest-api.html

data/lib/gerry/client.rb

@@ -20,8 +20,13 @@ module Gerry
     include Projects
     include Request
 
+    def set_auth_type(auth_type)
+      @auth_type = auth_type
+    end
+
     def initialize(url, username = nil, password = nil)
       self.class.base_uri(url)
+      @auth_type = :digest_auth
 
       if username && password
         @username = username

data/lib/gerry/client/changes.rb

@@ -16,7 +16,7 @@ module Gerry
         end
 
         response = get(url)
-        return response unless response.last.delete('_more_changes')
+        return response if response.empty? || !response.last.delete('_more_changes')
 
         # Get the original start parameter, if any, else start from 0.
         query = URI.parse(url).query
@@ -30,7 +30,7 @@ module Gerry
           url = endpoint + '?' + map_options(query)
 
           response.concat(get(url))
-          return response unless response.last.delete('_more_changes')
+          return response if response.empty? || !response.last.delete('_more_changes')
         end
       end
     end

data/lib/gerry/client/request.rb

@@ -13,27 +13,23 @@ module Gerry
         end
       end
 
-      private
-      class RequestError < StandardError
-      end
-
       def get(url)
         response = if @username && @password
           auth = { username: @username, password: @password }
-          self.class.get("/a#{url}", digest_auth: auth)
+          self.class.get("/a#{url}", @auth_type => auth)
         else
           self.class.get(url)
         end
         parse(response)
       end
 
-      def put(url, body)
+      def put(url, body = nil)
         if @username && @password
           auth = { username: @username, password: @password }
           response = self.class.put("/a#{url}",
             body: body.to_json,
             headers: { 'Content-Type' => 'application/json' },
-            digest_auth: auth
+            @auth_type => auth
           )
           parse(response)
         else
@@ -51,7 +47,7 @@ module Gerry
           response = self.class.post("/a#{url}",
             body: body.to_json,
             headers: { 'Content-Type' => 'application/json' },
-            digest_auth: auth
+            @auth_type => auth
           )
           parse(response)
         else
@@ -63,6 +59,20 @@ module Gerry
         end
       end
 
+      def delete(url)
+        response = if @username && @password
+          auth = { username: @username, password: @password }
+          self.class.delete("/a#{url}", @auth_type => auth)
+        else
+          self.class.delete(url)
+        end
+        parse(response)
+      end
+
+      private
+      class RequestError < StandardError
+      end
+
       def parse(response)
         unless /2[0-9][0-9]/.match(response.code.to_s)
           raise_request_error(response)

data/lib/gerry/version.rb

@@ -1,5 +1,5 @@
 module Gerry
 
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
-end
+end

data/spec/request_spec.rb

@@ -20,7 +20,7 @@ describe '.get' do
     expect(stub).to have_been_requested
   end
 
-  it 'should request projects as user' do
+  it 'should request projects as user with digest auth' do
     username = 'gerry'
     password = 'whoop'
 
@@ -39,4 +39,24 @@ describe '.get' do
     expect(projects['awesome']['description']).to eq('Awesome project')
     expect(projects['clean']['description']).to eq('Clean code!')
   end
-end
+
+  it 'should request projects as user with basic auth' do
+    username = 'gerry'
+    password = 'whoop'
+
+    body = get_fixture('projects.json')
+
+    stub = stub_request(:get, "http://#{username}:#{password}@localhost/a/projects/").
+      with(:headers => {'Accept'=>'application/json'}).
+        to_return(:status => 200, :body => body, :headers => {})
+
+    client = Gerry.new(MockGerry::URL, 'gerry', 'whoop')
+    client.set_auth_type(:basic_auth)
+    projects = client.projects
+
+    expect(stub).to have_been_requested
+
+    expect(projects['awesome']['description']).to eq('Awesome project')
+    expect(projects['clean']['description']).to eq('Clean code!')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gerry
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fabian Mettler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -125,8 +125,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-    Simple Ruby wrapper for the Gerrit Code Review REST-API.
+description: "  Simple Ruby wrapper for the Gerrit Code Review REST-API.\n"
 email: trumant@gmail.com
 executables: []
 extensions: []
@@ -182,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Ruby wrapper for the Gerrit Code Review REST-API.