danger 6.0.6 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6399c2198aa30f430f23acac0880e17511981dc2ff30aea5870621cb85e9e65
-  data.tar.gz: 81efc6836e4664d805360368f3ede80ec2c758f6327e622ed9875e7dca53ea65
+  metadata.gz: aa6b37fb17398fe4c260d3061dc0f70e65a78394d7457d315073d44dba7b879f
+  data.tar.gz: 0ab01536474a4520b80f06451dd0c94d4f3965b0094968745c72d58780ee0307
 SHA512:
-  metadata.gz: 4042bc459386e5873c0468e1579ab5cd5512229be5743a75fc17573e1e7ce67bfab2569dbe9986db8d5dd0554ee927d31b8fbf6e6d6cadf027b4543d26b5dc9a
-  data.tar.gz: ef91e279bc7889fa61a3f4cb6c370fe6d186d3a25607252f2bb0250c26347ceadf0a8aa1ae556eb41ce95ec59b9e5f3f807562ca867a53fe28f25d16a6b31399
+  metadata.gz: c79ca524ee16c5e5bf9e7c5e99895bbadcc3ee3979ba5fda2b8510bae5f08a0ee48eef52675566bb745f05799ba2b5ab32e1110b924a0bc205d3510b1da908a9
+  data.tar.gz: 31ad9d9cb0e42ec3954d5ba510106fe2ebb4b3bbaca7bb92916018eb6c4690e3fe73f3bb975683ff1e99e94c9118e55682bf78870fcec8f02949204247e90ba0

data/lib/danger/danger_core/plugins/dangerfile_danger_plugin.rb

@@ -76,8 +76,10 @@ module Danger
         warn "Use `import_dangerfile(github: '#{opts}')` instead of `import_dangerfile '#{opts}'`."
         import_dangerfile_from_github(opts)
       elsif opts.kind_of?(Hash)
-        if opts.key?(:github) || opts.key?(:gitlab)
-          import_dangerfile_from_github(opts[:github] || opts[:gitlab], opts[:branch], opts[:path])
+        if opts.key?(:github)
+          import_dangerfile_from_github(opts[:github], opts[:branch], opts[:path])
+        elsif opts.key?(:gitlab_project_id)
+          import_dangerfile_from_gitlab(opts[:gitlab_project_id], opts[:branch], opts[:path])
         elsif opts.key?(:path)
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
@@ -161,6 +163,24 @@ module Danger
       @dangerfile.parse(Pathname.new(local_path))
     end
 
+    # @!group Danger
+    # Download and execute a remote Dangerfile.
+    #
+    # @param    [Int] project_id
+    #           The id of the repo where the Dangerfile is.
+    # @param    [String] branch
+    #           A branch from repo where the Dangerfile is.
+    # @param    [String] path
+    #           The path at the repo where Dangerfile is.
+    # @return   [void]
+    #
+    def import_dangerfile_from_gitlab(project_id, branch = nil, path = nil)
+      raise "`import_dangerfile_from_gitlab` requires a integer" unless project_id.kind_of?(Integer)
+      download_url = env.request_source.file_url(repository: project_id, branch: branch, path: path || "Dangerfile")
+      local_path = download(download_url)
+      @dangerfile.parse(Pathname.new(local_path))
+    end
+
     # @!group Plugins
     # Download a local or remote plugin or Dangerfile.
     # This method will not import the file for you, use plugin.import instead

data/lib/danger/request_sources/gitlab.rb

@@ -297,8 +297,8 @@ module Danger
       # @return [String] A URL to the specific file, ready to be downloaded
       def file_url(organisation: nil, repository: nil, branch: nil, path: nil)
         branch ||= 'master'
-
-        "https://#{host}/#{organisation}/#{repository}/raw/#{branch}/#{path}"
+        token = @environment["DANGER_GITLAB_API_TOKEN"]
+        "#{endpoint}/projects/#{repository}/repository/files/#{path}/raw?ref=#{branch}&private_token=#{token}"
       end
 
       def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.0.6".freeze
+  VERSION = "6.0.7".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.6
+  version: 6.0.7
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -316,8 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.