danger 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331ec016762064e8a92668e5b9b56521e5873f50
-  data.tar.gz: 69fb9998dbe05c5465301a4a0396a28ce4ebf1ca
+  metadata.gz: de42011bfb76e71cb7b4a3307648b54695b9b725
+  data.tar.gz: 06eb74831ab383be09312427e072f9d49096089d
 SHA512:
-  metadata.gz: 0abf5fed8d027d3368573054d82b87c4010bf806ef83d0d41f8b964d438e44fd35dd99f822de9ebc581c3d3d59ea6810145235a08b7ed7a20682f4ae35e80019
-  data.tar.gz: 2189b8616f4a18ee79d12863c5ce0db5dc803996635c5e14b6f56f66050b97207cb76198fc36cadad80399e4b3ed6c0901814f653972236d57ab4a5f37015583
+  metadata.gz: c8ce21aa3ad48d64b7ac92623ec924220f05a98ff3a80dd8a41fa5354d92296625f00ab0796396d7c06882cbff5147cd62af5f802499c1a192ca04a796c64f29
+  data.tar.gz: 907dd19d7d3c044fe7f6c6e30dfbec053864de5b412e92bdbe7ebd05d29726d87c67f2de0c448f6c4e77bb6dfaf9a146a801adc4d03aefb3b09c9325b6dbb78c

data/lib/danger/ci_source/ci_source.rb

@@ -19,7 +19,7 @@ module Danger
     end
 
     def supports?(request_source)
-      supported_request_sources.include? request_source
+      supported_request_sources.include?(request_source)
     end
 
     def self.validates_as_ci?(_env)

data/lib/danger/danger_core/environment_manager.rb

@@ -15,6 +15,16 @@ module Danger
       local_ci_source(env).validates_as_pr?(env)
     end
 
+    # @return [String] danger's default head branch
+    def self.danger_head_branch
+      "danger_head".freeze
+    end
+
+    # @return [String] danger's default base branch
+    def self.danger_base_branch
+      "danger_base".freeze
+    end
+
     def initialize(env, ui)
       ci_klass = self.class.local_ci_source(env)
       self.ci_source = ci_klass.new(env)
@@ -53,20 +63,12 @@ module Danger
       end
     end
 
-    def meta_info_for_base
-      scm.exec("--no-pager log #{EnvironmentManager.danger_base_branch} -n1")
-    end
-
     def meta_info_for_head
       scm.exec("--no-pager log #{EnvironmentManager.danger_head_branch} -n1")
     end
 
-    def self.danger_head_branch
-      "danger_head"
-    end
-
-    def self.danger_base_branch
-      "danger_base"
+    def meta_info_for_base
+      scm.exec("--no-pager log #{EnvironmentManager.danger_base_branch} -n1")
     end
 
     def raise_error_for_no_request_source(env, ui)

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

@@ -29,6 +29,10 @@ module Danger
   #
   #          danger.import_dangerfile(gitlab: "ruby-grape/danger")
   #
+  # @example Run a Dangerfile from inside a repo branch and path
+  #
+  #          danger.import_dangerfile(github: "ruby-grape/danger", branch: "custom", path: "path/to/Dangerfile")
+  #
   # @see  danger/danger
   # @tags core, plugins
 
@@ -73,7 +77,7 @@ module Danger
         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])
+          import_dangerfile_from_github(opts[:github] || opts[:gitlab], opts[:branch], opts[:path])
         elsif opts.key?(:path)
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
@@ -141,12 +145,16 @@ module Danger
     #
     # @param    [String] slug
     #           A slug that represents 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_github(slug)
+    def import_dangerfile_from_github(slug, branch = nil, path = nil)
       raise "`import_dangerfile_from_github` requires a string" unless slug.kind_of?(String)
       org, repo = slug.split("/")
-      download_url = env.request_source.file_url(organisation: org, repository: repo, branch: "master", path: "Dangerfile")
+      download_url = env.request_source.file_url(organisation: org, repository: repo, branch: branch || "master", path: path || "Dangerfile")
       local_path = download(download_url)
       @dangerfile.parse(Pathname.new(local_path))
     end
@@ -208,7 +216,7 @@ module Danger
     def validate_file_contains_plugin!(file)
       content = IO.read(file)
 
-      if content.scan(/class\s+(?<plugin_class>[\w]+)\s+<\s+Plugin/i).empty?
+      if content.scan(/class\s+(?<plugin_class>[\w]+)\s+<\s+((Danger::)?Plugin)/i).empty?
         raise("#{file} doesn't contain any valid danger plugin.")
       end
     end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.4.0".freeze
+  VERSION = "3.4.1".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: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -459,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.