danger 6.2.2 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b362f1e56f963bb7e924c541d6934d426ce840f092fb26aa4158956bb9fb5d
-  data.tar.gz: af30407cccc20cd672276fe288626506c2e6835215fbc4ee8c775119c4703099
+  metadata.gz: 9d926df8cc4784ba1922fb73e34566e9b22e29f7345965d673fda190b265c151
+  data.tar.gz: f8970d62ca3a0e305e1c80e1e27bde421c2eeb6dffc5633e7abba91d21c6b92f
 SHA512:
-  metadata.gz: bf6970506bab77f49b534185392873b8448af90d4ac1a7ba6004673a900d63e3f8141f3561372fa5da2935be0fe00646d08f7fea97da1165826d1851932ad038
-  data.tar.gz: b1cfca29b03ac5ad85089b92d2ea5d17df40a6a4ed2e0da15e4fa772f50696347976f1d701a4f891febf3d42acaab864aa15d1e5c2f8894fc344cb352c208f14
+  metadata.gz: 9608e049321d268c0f3870c3bb8b73409a18f8fcedc7f51b199a70a0495f5ed4d2d729276fd65cfdf398b04702c2a55d75c4ddcfe73d80098971c5126f5b33c7
+  data.tar.gz: 4fd51d8b97e1e1e417885ef72b4ece5755fbfe691bccd60b437950071cb70e009a3205397a5f8da281c776da58133d9690c98f415eb29a17bcb99da5b6fc277d

data/lib/danger/ci_source/bitrise.rb

@@ -25,7 +25,7 @@ module Danger
   # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable 
   # comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the 
   # Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
-  # The pattern used is `(%r{([\/:])(([^\/]+\/){1,2}[^\/]+?)(\.git$|$)}`.
+  # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` .
   #
   class Bitrise < CI
     def self.validates_as_ci?(env)
@@ -48,9 +48,15 @@ module Danger
     def initialize(env)
       self.pull_request_id = env["BITRISE_PULL_REQUEST"]
       self.repo_url = env["GIT_REPOSITORY_URL"]
-
-      repo_matches = self.repo_url.match(%r{([\/:])(([^\/]+\/){1,2}[^\/]+?)(\.git$|$)})
-      self.repo_slug = repo_matches[2] unless repo_matches.nil?
+  
+      if repo_url.include? ".com/"
+        repo_matches = self.repo_url.match(%r{\.com/(.*)})[1]
+      elsif repo_url.include? ".com:"
+        repo_matches = self.repo_url.match(%r{\.com:(.*)})[1]
+      end
+      
+      self.repo_slug = repo_matches unless repo_matches.nil?
+      
     end
   end
 end

data/lib/danger/commands/runner.rb

@@ -3,6 +3,7 @@ module Danger
     require "danger/commands/init"
     require "danger/commands/local"
     require "danger/commands/dry_run"
+    require "danger/commands/staging"
     require "danger/commands/systems"
     require "danger/commands/pr"
 

data/lib/danger/commands/staging.rb

@@ -0,0 +1,53 @@
+require "danger/commands/local_helpers/pry_setup"
+require "fileutils"
+require "tmpdir"
+
+module Danger
+  class Staging < Runner
+    self.summary = "Run the Dangerfile locally against local master"
+    self.command = "staging"
+
+    def self.options
+      [
+          ["--pry", "Drop into a Pry shell after evaluating the Dangerfile."]
+      ]
+    end
+
+    def initialize(argv)
+      show_help = true if argv.arguments == ["-h"]
+
+      # Currently CLAide doesn't support short option like -h https://github.com/CocoaPods/CLAide/pull/60
+      # when user pass in -h, mimic the behavior of passing in --help.
+      argv = CLAide::ARGV.new ["--help"] if show_help
+
+      super
+
+      if argv.flag?("pry", false)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
+      end
+    end
+
+    def validate!
+      super
+      unless @dangerfile_path
+        help! "Could not find a Dangerfile."
+      end
+    end
+
+    def run
+      ENV["DANGER_USE_LOCAL_ONLY_GIT"] = "YES"
+
+      env = EnvironmentManager.new(ENV, cork)
+      dm = Dangerfile.new(env, cork)
+
+      dm.run(
+          Danger::EnvironmentManager.danger_base_branch,
+          Danger::EnvironmentManager.danger_head_branch,
+          @dangerfile_path,
+          nil,
+          nil,
+          nil
+      )
+    end
+  end
+end

data/lib/danger/request_sources/gitlab.rb

@@ -36,9 +36,13 @@ module Danger
         require "gitlab"
 
         @client ||= Gitlab.client(endpoint: endpoint, private_token: token)
-      rescue LoadError
-        puts "The GitLab gem was not installed, you will need to change your Gem from `danger` to `danger-gitlab`.".red
-        puts "\n - See https://github.com/danger/danger/blob/master/CHANGELOG.md#400"
+      rescue LoadError => e
+        if e.path == "gitlab"
+          puts "The GitLab gem was not installed, you will need to change your Gem from `danger` to `danger-gitlab`.".red
+          puts "\n - See https://github.com/danger/danger/blob/master/CHANGELOG.md#400"
+        else
+          puts "Error: #{e}".red
+        end
         abort
       end
 
@@ -122,11 +126,11 @@ module Danger
       end
 
       def setup_danger_branches
+        # we can use a GitLab specific feature here:
         base_branch = self.mr_json.source_branch
+        base_commit = self.mr_json.diff_refs.base_sha
         head_branch = self.mr_json.target_branch
-        head_commit = self.scm.head_commit
-
-        raise "Are you running `danger local/pr` against the correct repository? Also this can happen if you run danger on MR without changes" if base_commit == head_commit
+        head_commit = self.mr_json.diff_refs.head_sha
 
         # Next, we want to ensure that we have a version of the current branch at a known location
         scm.ensure_commitish_exists_on_branch! base_branch, base_commit
@@ -512,4 +516,3 @@ module Danger
     end
   end
 end
-

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.2.2".freeze
+  VERSION = "6.3.0".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.2.2
+  version: 6.3.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -246,6 +246,7 @@ files:
 - lib/danger/commands/plugins/plugin_readme.rb
 - lib/danger/commands/pr.rb
 - lib/danger/commands/runner.rb
+- lib/danger/commands/staging.rb
 - lib/danger/commands/systems.rb
 - lib/danger/comment_generators/bitbucket_server.md.erb
 - lib/danger/comment_generators/bitbucket_server_inline.md.erb