danger 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d812582b1d50574cecbc874f8e746a7e070f97decce7470b1616abd8871dd3d
-  data.tar.gz: 44a6746b63eef45617e9ba0057b1319539bfcdaabd3a359b561f3dd2ff4d3c65
+  metadata.gz: 5ed2cdc61eed91524dbc037cc0b4109298a59f79bae857ab9ab4fb91f9f16d17
+  data.tar.gz: 59ddea79d36ee0dca6664f1ed3ce654e88bebfb70ed9f43ed5948d7bee11349f
 SHA512:
-  metadata.gz: 54479ef3587f4486a282323894e32778e5dcc4c21d41410fddc25f2d02e581c692dfe488755828aff27e04115076031d032261f1e45ab60ff41df6ba429dd12a
-  data.tar.gz: 28b3b370371b9426168e57ebbce738bc5e7771b8dc7f223f49aa19d5de4bc62047c845720316074b677ca1e1ee387d65b24406077d0d532b764edc0c84f07ad8
+  metadata.gz: 1ed19550308a3957a370beab7524037eec4760f4c08664c7f4283ca647b2c10a909a9cf7aab934dd65b9ff518cb7f72d2ce51b2c1f4703c2c6b7fd1f061dd1b6
+  data.tar.gz: 99784fe747487d86ccbe6e65ac320ac5fbdcfab8818128f4c453c1161a7517b738f7611da988e1825e61d7613b96f946d412e8ea0ba71cf80c38cd784adfdac5

data/lib/danger/ci_source/bitbucket_pipelines.rb

@@ -8,9 +8,11 @@ module Danger
   # ```
   #
   # #### Token Setup
-  # 
-  # Add `DANGER_BITBUCKETCLOUD_USERNAME` and `DANGER_BITBUCKETCLOUD_USERNAME` to your pipeline repository variable.
-  # Settings > Pipelines > Repository Variables
+  #
+  # Add `DANGER_BITBUCKETCLOUD_USERNAME` and `DANGER_BITBUCKETCLOUD_USERNAME` to your pipeline repository variable
+  # or instead using `DANGER_BITBUCKETCLOUD_OAUTH_KEY` and `DANGER_BITBUCKETCLOUD_OAUTH_SECRET`.
+  #
+  # You can find them in Settings > Pipelines > Repository Variables
 
   class BitbucketPipelines < CI
 

data/lib/danger/ci_source/teamcity.rb

@@ -42,11 +42,19 @@ module Danger
   #
   # You will need to add the following environment variables as build parameters or by exporting them inside your
   # Simple Command Runner.
-  # - `DANGER_BITBUCKETCLOUD_USERNAME`
-  # - `DANGER_BITBUCKETCLOUD_PASSWORD`
+  #
+  #
   # - `BITBUCKET_REPO_SLUG`
   # - `BITBUCKET_REPO_URL`
   #
+  # - `DANGER_BITBUCKETCLOUD_USERNAME`
+  # - `DANGER_BITBUCKETCLOUD_PASSWORD`
+  #
+  # or
+  #
+  # - `DANGER_BITBUCKETCLOUD_OAUTH_KEY`
+  # - `DANGER_BITBUCKETCLOUD_OAUTH_SECRET`
+  #
   # You will also need to set the `BITBUCKET_BRANCH_NAME` environment variable.
   # TeamCity provides `%teamcity.build.branch%`, which you can use at the top of your Simple Command Runner:
   # ```sh
@@ -57,6 +65,7 @@ module Danger
   #
   # You will need to add the following environment variables as build parameters or by exporting them inside your
   # Simple Command Runner.
+  #
   # - `DANGER_BITBUCKETSERVER_USERNAME`
   # - `DANGER_BITBUCKETSERVER_PASSWORD`
   # - `DANGER_BITBUCKETSERVER_HOST`

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -16,6 +16,10 @@ module Danger
         ]
       end
 
+      def self.optional_env_vars
+        ["DANGER_BITBUCKETCLOUD_OAUTH_KEY", "DANGER_BITBUCKETCLOUD_OAUTH_SECRET"]
+      end
+
       def initialize(ci_source, environment)
         self.ci_source = ci_source
         self.environment = environment

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -5,12 +5,13 @@ require "danger/helpers/comments_helper"
 module Danger
   module RequestSources
     class BitbucketCloudAPI
-      attr_accessor :host, :project, :slug, :pull_request_id
+      attr_accessor :host, :project, :slug, :access_token, :pull_request_id
 
       def initialize(repo_slug, pull_request_id, branch_name, environment)
         @username = environment["DANGER_BITBUCKETCLOUD_USERNAME"]
         @password = environment["DANGER_BITBUCKETCLOUD_PASSWORD"]
         self.project, self.slug = repo_slug.split("/")
+        self.access_token = fetch_access_token(environment)
         self.pull_request_id = pull_request_id || fetch_pr_from_branch(branch_name)
         self.host = "https://bitbucket.org/"
       end
@@ -77,11 +78,32 @@ module Danger
         fetch_json(uri)[:values][0][:id]
       end
 
+      def fetch_access_token(environment)
+        oauth_key = environment["DANGER_BITBUCKETCLOUD_OAUTH_KEY"]
+        oauth_secret = environment["DANGER_BITBUCKETCLOUD_OAUTH_SECRET"]
+        return nil if oauth_key.nil?
+        return nil if oauth_secret.nil?
+        
+        uri = URI.parse("https://bitbucket.org/site/oauth2/access_token")
+        req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
+        req.basic_auth oauth_key, oauth_secret
+        req.set_form_data({'grant_type' => 'client_credentials'})
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(req)
+        end
+    
+        JSON.parse(res.body, symbolize_names: true)[:access_token]
+      end
+
       def fetch_json(uri)
         raise credentials_not_available unless credentials_given?
 
         req = Net::HTTP::Get.new(uri.request_uri, { "Content-Type" => "application/json" })
-        req.basic_auth @username, @password
+        if access_token.nil?
+          req.basic_auth @username, @password
+        else
+          req["Authorization"] = "Bearer #{access_token}"
+        end
         res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
@@ -94,7 +116,11 @@ module Danger
         raise credentials_not_available unless credentials_given?
 
         req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
-        req.basic_auth @username, @password
+        if access_token.nil?
+          req.basic_auth @username, @password
+        else
+          req["Authorization"] = "Bearer #{access_token}"
+        end
         req.body = body
         Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
@@ -105,7 +131,11 @@ module Danger
         raise credentials_not_available unless credentials_given?
         
         req = Net::HTTP::Delete.new(uri.request_uri, { "Content-Type" => "application/json" })
-        req.basic_auth @username, @password
+        if access_token.nil?
+          req.basic_auth @username, @password
+        else
+          req["Authorization"] = "Bearer #{access_token}"
+        end        
         Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.0.2".freeze
+  VERSION = "6.0.3".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide