universal-git-client 1.2.4 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b4c37347ad2d272fb542744b0f095e9901b45d5a422eb0ef13eba7144377a2a
-  data.tar.gz: a6e42628553bbe0674131e8d90f270e2e91d52aa8048dd7a374abd2d368df3a4
+  metadata.gz: d586b92fbf25a887fd3d22be2102eeb6cd43707e43210259dd29b01f5ee83f91
+  data.tar.gz: 1e63b3f3ec9d2eab5cbb089ec8d95264413bc467ca9e9e9a382bcc5fdabe7028
 SHA512:
-  metadata.gz: 45d3c7fde797319a54f5b05e79b9993ce17ebb3305ee6145f898c70e375edd9952b302e7efacdecf27befa97ce2712e8af1a2cc0eaf596efab43cc2e2d698d01
-  data.tar.gz: 461a1270d635a7a15a96a3912313d8377220c1e58cc4879d4afd2ef48a4a22cf6232eea81e511ac06aecb2de8a3d1dbb447bbe755384f1fab66c88e8eab53d44
+  metadata.gz: ca113697918244cb981c8e4ea760233a74f5d2a9a027b56cc8f639bc297709f84ee77439911e6db11600043880253d638728a1ab8566a01e6b8fbb6a216a0b75
+  data.tar.gz: 3842d99fbbb97fa1f42e849b8def3c0d0313f21a1ecc2e8bec1699447f004145b4dd83441a8280759702d94ed4978dfe406a0e4aede4862c36d7adb1000bd306

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.9

data/lib/universal-git-client/client.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'universal-git-client/normalizers/github'
 require 'universal-git-client/normalizers/gitlab'
 require 'universal-git-client/normalizers/bitbucket'
 require 'universal-git-client/normalizers/bitbucket_server'
 
-
 module UniversalGitClient
   class Client
     attr_reader :provider, :http_client

data/lib/universal-git-client/http/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'universal-git-client/http/response_validation'
 require 'httparty'
 require 'down'
@@ -62,7 +64,11 @@ module UniversalGitClient
 
       def down_default_options
         options = default_options[:headers].reject { |k, _v| %w[Accept Content-Type].include?(k) }
-        options.reject { |k, _v| [:base_uri, :logger, :log_level, :log_format].include?(k) }
+        options.reject { |k, _v| %i[base_uri logger log_level log_format].include?(k) }
+        # By default Down allows 2 redirections before raising.
+        # We're cranking this up as Bitbucket seems to do more redirects
+        # when a project has moved.
+        options.merge(max_redirects: 5)
       end
     end
   end

data/lib/universal-git-client/http/bitbucket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'universal-git-client/http/base'
 require 'uri'
 
@@ -13,28 +15,28 @@ module UniversalGitClient
       def organizations(page: 1, per_page: nil)
         with_response_validation! do
           self.class.get(
-            '/teams',
+            '/workspaces',
             default_options.merge(
               query: {
-                role: 'member',
                 page: page,
                 pagelen: per_page || default_elements_per_page,
-              },
+                q: %(uuid!="#{user['uuid']}")
+              }
             )
           )
         end
       end
 
       def user_repos(page: 1, per_page: nil)
-        current_user_uuid = URI.encode_www_form_component(self.user['uuid'])
+        current_user_uuid = URI.encode_www_form_component(user['uuid'])
         with_response_validation! do
           self.class.get(
             "/repositories/#{current_user_uuid}",
             default_options.merge(
               query: {
                 page: page,
-                pagelen: per_page || default_elements_per_page,
-              },
+                pagelen: per_page || default_elements_per_page
+              }
             )
           )
         end
@@ -47,8 +49,8 @@ module UniversalGitClient
             default_options.merge(
               query: {
                 page: page,
-                pagelen: per_page || default_elements_per_page,
-              },
+                pagelen: per_page || default_elements_per_page
+              }
             )
           )
         end
@@ -67,17 +69,18 @@ module UniversalGitClient
             default_options.merge(
               query: {
                 page: page,
-                pagelen: per_page || default_elements_per_page,
-              },
+                pagelen: per_page || default_elements_per_page
+              }
             )
           )
         end
       end
 
       def branch(owner:, repo:, branch:)
+        encoded_branch = URI.encode_www_form_component(branch)
         with_response_validation! do
           self.class.get(
-            "/repositories/#{owner}/#{repo}/refs/branches/#{branch}",
+            "/repositories/#{owner}/#{repo}/refs/branches/#{encoded_branch}",
             default_options
           )
         end
@@ -97,9 +100,9 @@ module UniversalGitClient
                 url: webhook_secret ? "#{webhook_url}?secret=#{webhook_secret}" : webhook_url,
                 active: true,
                 events: [
-                  'repo:push',
-                ],
-              }.to_json,
+                  'repo:push'
+                ]
+              }.to_json
             )
           )
         end

data/lib/universal-git-client/http/github.rb

@@ -74,9 +74,10 @@ module UniversalGitClient
       end
 
       def branch(owner:, repo:, branch:)
+        encoded_branch = URI.encode_www_form_component(branch)
         with_response_validation! do
           self.class.get(
-            "/repos/#{owner}/#{repo}/branches/#{branch}",
+            "/repos/#{owner}/#{repo}/branches/#{encoded_branch}",
             default_options
           )
         end

data/lib/universal-git-client/http/gitlab.rb

@@ -78,9 +78,10 @@ module UniversalGitClient
 
       def branch(owner:, repo:, branch:)
         encoded_namespace = encode_namespace(owner, repo)
+        encoded_branch = URI.encode_www_form_component(branch)
         with_response_validation! do
           self.class.get(
-            "/projects/#{encoded_namespace}/repository/branches/#{branch}",
+            "/projects/#{encoded_namespace}/repository/branches/#{encoded_branch}",
             default_options
           )
         end

data/lib/universal-git-client/http/response_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'universal-git-client/errors'
 
 module UniversalGitClient

data/lib/universal-git-client/normalizers/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'fast_jsonapi'
 require 'deep_merge'
@@ -49,9 +51,9 @@ module UniversalGitClient
               prev: prev_page_index,
               next: next_page_index,
               last: last_page_index,
-              per_page: per_page_index,
-            },
-          },
+              per_page: per_page_index
+            }
+          }
         }
       end
 
@@ -86,7 +88,7 @@ module UniversalGitClient
       private
 
       def fetch_rel_value(rel)
-        Hash[URI::decode_www_form(links.by_rel(rel).target.query)]['page']
+        Hash[URI.decode_www_form(links.by_rel(rel).target.query)]['page']
       rescue StandardError
         nil
       end

data/lib/universal-git-client/normalizers/bitbucket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'universal-git-client/normalizers/base'
 
 module UniversalGitClient
@@ -29,7 +31,7 @@ module UniversalGitClient
 
       def get_page_index(rel)
         Hash[
-          URI::decode_www_form(
+          URI.decode_www_form(
             URI.parse(response[rel]).query
           )
         ]['page']
@@ -49,7 +51,7 @@ module UniversalGitClient
 
       class OrganizationSerializer < BaseSerializer
         set_id :uuid
-        attribute :login, &:username
+        attribute :login, &:slug
 
         attribute :avatar_url do |object|
           object.links.avatar.href

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal-git-client
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.9
 platform: ruby
 authors:
 - HipTest
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -298,7 +298,7 @@ homepage: https://github.com/SmartBear/universal-git-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Use this gem to normalize git providers api responses
 test_files: []