lib/danger/commands/runner.rb in danger-0.8.1 vs lib/danger/commands/runner.rb in danger-0.8.2

@@ -13,10 +13,11 @@
     def initialize(argv)
       dangerfile = argv.option('dangerfile', 'Dangerfile')
       @dangerfile_path = dangerfile if File.exist? dangerfile
       @base = argv.option('base')
       @head = argv.option('head')
+      @danger_id = argv.option('danger_id', 'danger')
       super
     end
 
     def validate!
       super
@@ -27,11 +28,12 @@
 
     def self.options
       [
         ['--base=[master|dev|stable]', 'A branch/tag/commit to use as the base of the diff'],
         ['--head=[master|dev|stable]', 'A branch/tag/commit to use as the head'],
-        ['--dangerfile=<path/to/dangerfile>', 'The location of your Dangerfile']
+        ['--dangerfile=<path/to/dangerfile>', 'The location of your Dangerfile'],
+        ['--danger_id=<id>', 'The identifier of this Danger instance']
       ].concat(super)
     end
 
     def run
       env = EnvironmentManager.new(ENV)
@@ -45,12 +47,12 @@
 
         begin
           dm.env.ensure_danger_branches_are_setup
 
           # Offer the chance for a user to specify a branch through the command line
-          ci_base = @base || dm.env.danger_head_branch
-          ci_head = @head || dm.env.danger_base_branch
+          ci_base = @base || EnvironmentManager.danger_base_branch
+          ci_head = @head || EnvironmentManager.danger_head_branch
           dm.env.scm.diff_for_folder(".", from: ci_base, to: ci_head)
 
           dm.parse Pathname.new(@dangerfile_path)
 
           post_results dm
@@ -66,9 +68,21 @@
     def post_results(dm)
       gh = dm.env.request_source
       violations = dm.violation_report
       status = dm.status_report
 
-      gh.update_pull_request!(warnings: violations[:warnings], errors: violations[:errors], messages: violations[:messages], markdowns: status[:markdowns])
+      gh.update_pull_request!(warnings: violations[:warnings], errors: violations[:errors], messages: violations[:messages], markdowns: status[:markdowns], danger_id: @danger_id)
+    end
+
+    def self.report_error(exception)
+      raise exception if exception.kind_of?(SystemExit)
+      message = "#{exception.message.red} (#{exception.class.to_s.yellow})"
+      if exception.backtrace
+        danger_lib = File.expand_path('../../..', __FILE__)
+        message << "\n\t" << exception.backtrace.reverse_each.
+                             drop_while { |bt| !bt.start_with?(danger_lib) }.reverse.
+                             join("\n\t")
+      end
+      abort(message)
     end
   end
 end