stash-api 1.1.30.0 → 1.1.31.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY3YWFkOGIyN2NmNTg0MjIxZTEwNzc5YzZiMTA4OTUzMWUxMmJjMA==
+    MWMxMTMyMmQwMTc3OTViMjllNTNmMGNiZmE4MDk1ZjM1NjE1ZWI4Yw==
   data.tar.gz: !binary |-
-    Nzc3MDdhZmYzZTU0MDJjOTNmNjNlN2IzODJiNWQ3M2VhNzQ5MmQ5NA==
+    YjM5YjA0ZWZjZTc1ZTM3N2QzYzlmNTkxOGYxZWRiNzE4N2RjZGQ2NA==
 SHA512:
   metadata.gz: !binary |-
-    MmE2NDg3M2FkZmM0MzgzMDZjNDQ3ZjRiZGNiN2M0OGZkNjBkZmViNjg1OGNl
-    ZmJjYmFjYmRmZmRjYzM0NDA5NDk0OTNhYzg4ZmMxNWE1ZDU1NzVkMjg4MWRk
-    MTViODJlOTQxYmU2YjBjODIzNjhkMDZmYTc0NjFjZTI3NWFhNTE=
+    MjY2ZjBhMTJhZjQ3NjlmYWRjYzcxZmIyMDEzMTJjOTBiZTRkODM0MzljYjkz
+    N2E1NGFjYTE3Y2ExZTE1NjkzOWUzYmEzZGZiZTk5NWRmNGVkMDFkNTc3ZDJm
+    Nzg0NTJlZThiZjgyOGE4MmM4Y2E1NjIyNzJmOTcwNTdiMzBiYzI=
   data.tar.gz: !binary |-
-    YzI5ZDU5M2E2YWJiNzc4YWUzNjk1OWYyODk1NWE2MDc0NDgzMGFlZjAxZDM4
-    ZDY3NjY0M2YzYmFiNzRiOGViNDQ5ZGQyZmQ3MTRmOTBiYmQ3NTJlZDE2M2Vl
-    YjI3NzRkMTFmNzI3NGFlZTJiNWMzYmFhYjIwYzY5NTc4NjM5NzA=
+    MmI3MDVmMmVlYWE5NDhhMzYwMWIzY2QxMjI2OGU2OGE5MDc5ODZiY2E0ZTU0
+    OWIwZGE0N2VlOGY5YTVhMTE0Y2YxMjhkZjFmZGY5Zjg3NGU1MjQwZjVmZjM4
+    Y2Y1YzZiNmJiYWQwN2Q0N2NjZTk4ZmNkNjlhYmM0YjUwNmY5OGQ=

data/lib/stash-api/client.rb

@@ -16,16 +16,12 @@ module Stash
 
       match = remote_origin_url.match(/(ssh|https?):\/\/([^@]*@)?(?<server>[^\:\/]*)[^\/]*\/(scm\/)?(?<project>[^\/].*)\/(?<repository_name>[^\/]*)\.git$/)
       raise "Remote origin cannot be inferred from the url: #{remote_origin_url}.  Run `git remote add origin URL` to add an origin." if !match
-
-      @remote_api_url = File.join("https://#{match[:server]}", 'rest', 'api', '1.0', 'projects', match[:project], 'repos', match[:repository_name])
-      @branch_permissions_url = File.join("https://#{match[:server]}", 'rest', 'branch-permissions', '2.0', 'projects', match[:project], 'repos', match[:repository_name], 'restrictions')
-      @branchring_model_url = File.join("https://#{match[:server]}", 'rest', 'branch-utils', '1.0', 'projects', match[:project], 'repos', match[:repository_name])
-      @pull_request_settings = File.join("https://#{match[:server]}", 'rest', 'pullrequest-settings', '1.0', 'projects', match[:project], 'repos', match[:repository_name])
+      @server = match[:server]
 
       repository_information = nil
       RestClient::Request.new(
         :method => :get,
-        :url => URI::encode(@remote_api_url),
+        :url => URI::encode(File.join("https://#{@server}", 'rest', 'api', '1.0', 'projects', match[:project], 'repos', match[:repository_name])),
         :user => @username,
         :password => @password,
         :headers => { :accept => :json, :content_type => :json }).execute do |response, request, result|
@@ -39,6 +35,12 @@ module Stash
       @project = repository_information['project']['key']
       @repository_name = repository_information['slug']
       @ssh_url = repository_information['links']['clone'].select{|link| link['name'].match(/^ssh$/i)}.first['href']
+      
+      #Set remote api URLs
+      @remote_api_url = File.join("https://#{@server}", 'rest', 'api', '1.0', 'projects', @project, 'repos', @repository_name)
+      @branch_permissions_url = File.join("https://#{@server}", 'rest', 'branch-permissions', '2.0', 'projects', @project, 'repos', @repository_name, 'restrictions')
+      @branchring_model_url = File.join("https://#{@server}", 'rest', 'branch-utils', '1.0', 'projects', @project, 'repos', @repository_name)
+      @pull_request_settings = File.join("https://#{@server}", 'rest', 'pullrequest-settings', '1.0', 'projects', @project, 'repos', @repository_name)
     end
 
     SETTINGS_HOOKS_URL = File.join('settings', 'hooks')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stash-api
 version: !ruby/object:Gem::Version
-  version: 1.1.30.0
+  version: 1.1.31.0
 platform: ruby
 authors:
 - Warren Parad