danger 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 961961730193f38ada39854b1e3b14a665534539
-  data.tar.gz: 161dfd213ef838bf04dc47c95cd3a59d5e745cc7
+  metadata.gz: e4921ce4e3c1ab439ca418a004aac9ee64d6e7ed
+  data.tar.gz: e3065925be50c02d3b800f0a824fead466d4f84e
 SHA512:
-  metadata.gz: 9c298a712a18d76022aba76603f6946f03ef5999a2203c06c4cc34013e2131d9657fa3ad2972b0bbf9c406f9d6922f5d2677160068482aaf0fbd3572444a31df
-  data.tar.gz: b657e664d71d270a6118bfe68033f039ac2604f969d9494b2e16631e4a9b65448b7e8de1842909e628da7a97aae65ba72939b7b9dc3e2783d8bd33ec62946056
+  metadata.gz: 336014b027d584aac76ed805f4f790cd35af88c22a85d1ee704de3321bd203af6e3cf236b78962c825e33d881048782903193e436b16180fc7f10357a3b23529
+  data.tar.gz: be97d88ff2b2f6749aebc7a3d2149e3df5439d6c3b4375f66a46ee5e13c356ce75fd7f14e9646413c8d82866eb913f5b2357e933f2fb1cd73219fee34b89a7da

data/README.md

@@ -25,7 +25,13 @@ Add this line to your application's [Gemfile](https://guides.cocoapods.org/using
 gem 'danger'
 ```
 
-To get up and running quickly, just run
+Then use Bundler to install the gem.
+
+```shell
+bundle install
+```
+
+Then, to get up and running quickly, just run
 
 ```
 bundle exec danger init

data/lib/danger.rb

@@ -9,6 +9,7 @@ require "claide"
 require "colored"
 require "pathname"
 require "terminal-table"
+require "cork"
 
 # Import all the Sources (CI, Request and SCM)
 Dir[File.expand_path('danger/*source/*.rb', File.dirname(__FILE__))].each do |file|

data/lib/danger/ci_source/ci_source.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Danger
   module CISource
     # "abstract" CI class

data/lib/danger/commands/init.rb

@@ -7,6 +7,8 @@ module Danger
     self.summary = 'Helps you set up Danger.'
     self.command = 'init'
 
+    attr_accessor :ui
+
     def self.options
       [
         ['--impatient', "'I've not got all day here. Don't add any thematic delays please.'"],
@@ -15,14 +17,14 @@ module Danger
     end
 
     def initialize(argv)
-      ui.no_delay = argv.flag?('impatient', false)
-      ui.no_waiting = argv.flag?('mousey', false)
       @bot_name = File.basename(Dir.getwd).split(".").first.capitalize + "Bot"
       super
+      @ui = Interviewer.new(cork)
+      ui.no_delay = argv.flag?('impatient', false)
+      ui.no_waiting = argv.flag?('mousey', false)
     end
 
     def run
-      ui = Interviewer.new
       ui.say "\nOK, thanks #{ENV['LOGNAME']}, have a seat and we'll get you started.\n".yellow
       ui.pause 1
 
@@ -38,10 +40,6 @@ module Danger
       thanks
     end
 
-    def ui
-      @ui ||= Interviewer.new
-    end
-
     def show_todo_state
       ui.say "We need to do the following:\n"
       ui.pause 0.6
@@ -134,8 +132,9 @@ module Danger
     end
 
     def current_repo_slug
-      @repo ||= Danger::CISource::LocalGitRepo.new
-      @repo.repo_slug || "[Your/Repo]"
+      @git = GitRepo.new
+      repo_matches = @git.origins.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
+      repo_matches[2] || "[Your/Repo]"
     end
 
     def setup_danger_ci

data/lib/danger/commands/init_helpers/interviewer.rb

@@ -1,9 +1,13 @@
 module Danger
   class Interviewer
-    attr_accessor :no_delay, :no_waiting
+    attr_accessor :no_delay, :no_waiting, :ui
+
+    def initialize(cork_board)
+      @ui = cork_board
+    end
 
     def show_prompt
-      print "> ".bold.green
+      ui.print "> ".bold.green
     end
 
     def yellow_bang
@@ -19,7 +23,7 @@ module Danger
     end
 
     def say(output)
-      puts output
+      ui.puts output
     end
 
     def header(title)
@@ -39,40 +43,40 @@ module Danger
     def wait_for_return
       STDOUT.flush
       STDIN.gets unless @no_delay
-      puts ""
+      ui.puts
     end
 
     def run_command(command, output_command = nil)
       output_command ||= command
-      puts "  " + output_command.magenta
+      ui.puts "  " + output_command.magenta
       system command
     end
 
     def ask(question)
       answer = ""
       loop do
-        puts "\n#{question}?"
+        ui.puts "\n#{question}?"
 
         show_prompt
         answer = STDIN.gets.chomp
 
         break if answer.empty?
 
-        print "\nYou need to provide an answer."
+        ui.print "\nYou need to provide an answer."
       end
       answer
     end
 
     def ask_with_answers(question, possible_answers)
-      print "\n#{question}? ["
+      ui.print "\n#{question}? ["
 
       print_info = proc do
         possible_answers.each_with_index do |answer, i|
           the_answer = (i == 0) ? answer.underline : answer
-          print " " + the_answer
-          print(" /") if i != possible_answers.length - 1
+          ui.print " " + the_answer
+          ui.print(" /") if i != possible_answers.length - 1
         end
-        print " ]\n"
+        ui.print " ]\n"
       end
       print_info.call
 
@@ -88,12 +92,12 @@ module Danger
         # default to first answer
         if answer == ""
           answer = possible_answers[0].downcase
-          puts "Using: " + answer.yellow
+          ui.puts "Using: " + answer.yellow
         end
 
         break if possible_answers.map(&:downcase).include? answer
 
-        print "\nPossible answers are ["
+        ui.print "\nPossible answers are ["
         print_info.call
       end
 

data/lib/danger/commands/local.rb

@@ -27,25 +27,25 @@ module Danger
       ENV["LOCAL_GIT_PR_ID"] = @pr_num if @pr_num
 
       env = EnvironmentManager.new(ENV)
-      dm = Dangerfile.new(env)
+      dm = Dangerfile.new(env, cork)
       dm.init_plugins
 
       source = dm.env.ci_source
       if source.nil? or source.repo_slug.empty?
-        puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
+        cork.puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
         exit 0
       end
 
       gh = dm.env.request_source
 
-      puts "Running your Dangerfile against this PR - https://#{gh.github_host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
+      cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
 
       if verbose != true
-        puts "Turning on --verbose"
+        cork.puts "Turning on --verbose"
         dm.verbose = true
       end
 
-      puts ""
+      cork.puts
 
       # We can use tokenless here, as it's running on someone's computer
       # and is IP locked, as opposed  to on the CI.
@@ -54,7 +54,7 @@ module Danger
       begin
         gh.fetch_details
       rescue Octokit::NotFound
-        puts "Local repository was not found on GitHub. If you're trying to test a private repository please provide a valid API token through " + "DANGER_GITHUB_API_TOKEN".yellow + " environment variable."
+        cork.puts "Local repository was not found on GitHub. If you're trying to test a private repository please provide a valid API token through " + "DANGER_GITHUB_API_TOKEN".yellow + " environment variable."
         return
       end
 

data/lib/danger/commands/new_plugin.rb

@@ -6,9 +6,9 @@ module Danger
     def run
       require 'fileutils'
 
-      puts "Must be lower case, and use a '_' between words. Do not use '.'".green
-      puts "examples: 'number_of_emojis', 'ensure_pr_title_contains_keyword'".green
-      puts "Name of your new plugin: "
+      cork.puts "Must be lower case, and use a '_' between words. Do not use '.'".green
+      cork.puts "examples: 'number_of_emojis', 'ensure_pr_title_contains_keyword'".green
+      cork.puts "Name of your new plugin: "
       name = STDIN.gets.strip
 
       dir = Danger.gem_path
@@ -22,13 +22,13 @@ module Danger
       raise "File '#{output_path}' already exists!" if File.exist?(output_path)
       File.write(output_path, content)
 
-      puts ""
-      puts "Successfully created new plugin at path '#{output_path}'".green
-      puts "Add this to your `Dangerfile` to use it:"
-      puts ""
-      puts "#{name}(parameter1: 123, parameter2: \"Club Mate\")".blue
-      puts ""
-      puts "Enjoy ✨"
+      cork.puts ""
+      cork.puts "Successfully created new plugin at path '#{output_path}'".green
+      cork.puts "Add this to your `Dangerfile` to use it:"
+      cork.puts ""
+      cork.puts "#{name}(parameter1: 123, parameter2: \"Club Mate\")".blue
+      cork.puts ""
+      cork.puts "Enjoy ✨"
     end
   end
 end

data/lib/danger/commands/runner.rb

@@ -10,12 +10,16 @@ module Danger
 
     self.plugin_prefixes = %w(claide danger)
 
+    attr_accessor :cork
+
     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')
+      @cork = Cork::Board.new(silent: argv.option('silent', false),
+                              verbose: argv.option('verbose', false))
       super
     end
 
@@ -37,7 +41,7 @@ module Danger
 
     def run
       env = EnvironmentManager.new(ENV)
-      dm = Dangerfile.new(env)
+      dm = Dangerfile.new(env, cork)
 
       if dm.env.pr?
         dm.verbose = verbose
@@ -61,7 +65,7 @@ module Danger
           dm.env.clean_up
         end
       else
-        puts "Not a Pull Request - skipping `danger` run"
+        cork.puts "Not a Pull Request - skipping `danger` run"
       end
     end
 

data/lib/danger/danger_core/dangerfile.rb

@@ -14,7 +14,7 @@ module Danger
   class Dangerfile
     include Danger::Dangerfile::DSL
 
-    attr_accessor :env, :verbose, :plugins
+    attr_accessor :env, :verbose, :plugins, :ui
 
     # @return [Pathname] the path where the Dangerfile was loaded from. It is nil
     #         if the Dangerfile was generated programmatically.
@@ -64,9 +64,10 @@ module Danger
       super
     end
 
-    def initialize(env_manager)
+    def initialize(env_manager, cork_board)
       @plugins = {}
       @core_plugins = []
+      @ui = cork_board
 
       # Triggers the core plugins
       @env = env_manager
@@ -140,9 +141,11 @@ module Danger
       params[:rows] = rows.each { |current| current[0] = current[0].yellow }
       params[:title] = "Danger v#{Danger::VERSION}\nDSL Attributes".green
 
-      puts ""
-      puts Terminal::Table.new(params)
-      puts ""
+      ui.section('Info:') do
+        ui.puts
+        ui.puts Terminal::Table.new(params)
+        ui.puts
+      end
     end
 
     # Parses the file at a path, optionally takes the content of the file for DI
@@ -159,14 +162,14 @@ module Danger
 
       if contents.tr!('“”‘’‛', %(""'''))
         # Changes have been made
-        puts "Your #{path.basename} has had smart quotes sanitised. " \
-                    'To avoid issues in the future, you should not use ' \
-                    'TextEdit for editing it. If you are not using TextEdit, ' \
-                    'you should turn off smart quotes in your editor of choice.'.red
+        ui.puts "Your #{path.basename} has had smart quotes sanitised. " \
+          'To avoid issues in the future, you should not use ' \
+          'TextEdit for editing it. If you are not using TextEdit, ' \
+          'you should turn off smart quotes in your editor of choice.'.red
       end
 
       if contents.include?("puts")
-        puts "You used `puts` in your Dangerfile. To print out text to GitHub use `message` instead"
+        ui.puts "You used `puts` in your Dangerfile. To print out text to GitHub use `message` instead"
       end
 
       self.defined_in_file = path
@@ -188,30 +191,39 @@ module Danger
       status = status_report
       return if (status[:errors] + status[:warnings] + status[:messages] + status[:markdowns]).count == 0
 
-      puts ""
-      puts "danger results:"
-      [:errors, :warnings, :messages].each do |current|
-        params = {}
-        params[:rows] = status[current].map { |item| [item] }
-        next unless params[:rows].count > 0
-        params[:title] = case current
-                         when :errors
-                           current.to_s.capitalize.red
-                         when :warnings
-                           current.to_s.capitalize.yellow
-                         else
-                           current.to_s.capitalize
-                         end
-
-        puts ""
-        puts Terminal::Table.new(params)
-        puts ""
-      end
+      ui.section('Results:') do
+        [:errors, :warnings, :messages].each do |key|
+          formatted = key.to_s.capitalize + ':'
+          title = case key
+                  when :errors
+                    formatted.red
+                  when :warnings
+                    formatted.yellow
+                  else
+                    formatted
+                  end
+          rows = status[key]
+          print_list(title, rows)
+        end
 
-      puts "Markdown: ".green if status[:markdowns].count > 0
-      status[:markdowns].each do |current_markdown|
-        puts current_markdown
+        if status[:markdowns].count > 0
+          ui.section('Markdown:') do
+            status[:markdowns].each do |current_markdown|
+              ui.puts current_markdown
+            end
+          end
+        end
       end
     end
+
+    private
+
+    def print_list(title, rows)
+      ui.title(title) do
+        rows.each do |row|
+          ui.puts("- [ ] #{row}")
+        end
+      end unless rows.empty?
+    end
   end
 end

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

@@ -19,7 +19,6 @@ module Danger
     #           The markdown based message to be printed below the table
     def markdown(message)
       @markdowns << message
-      puts "Printing markdown #{message}"
     end
 
     # @!group Core
@@ -31,7 +30,6 @@ module Danger
     #           defaults to `true`.
     def message(message, sticky: true)
       @messages << Violation.new(message, sticky)
-      puts "Printing message '#{message}'"
     end
 
     # @!group Core
@@ -44,7 +42,6 @@ module Danger
     def warn(message, sticky: true)
       return if should_ignore_violation(message)
       @warnings << Violation.new(message, sticky)
-      puts "Printing warning '#{message}'"
     end
 
     # @!group Core
@@ -58,7 +55,6 @@ module Danger
     def fail(message, sticky: true)
       return if should_ignore_violation(message)
       @errors << Violation.new(message, sticky)
-      puts "Raising error '#{message}'"
     end
 
     def status_report

data/lib/danger/request_source/github.rb

@@ -38,15 +38,15 @@ module Danger
 
       def setup_danger_branches
         # we can use a github specific feature here:
-        pull_id = self.ci_source.pull_request_id
-        test_branch = self.pr_json[:base][:sha]
+        base_commit = self.pr_json[:base][:sha]
+        head_commit = self.scm.head_commit
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{test_branch}"
+        self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        self.scm.exec "fetch origin +refs/pull/#{pull_id}/merge:#{EnvironmentManager.danger_head_branch}"
+        self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 
       def fetch_details
@@ -106,23 +106,32 @@ module Danger
                                  details_url: comment_result['html_url'])
       end
 
-      def submit_pull_request_status!(warnings: nil, errors: nil, details_url: nil)
+      def submit_pull_request_status!(warnings: [], errors: [], details_url: [])
         status = (errors.count == 0 ? 'success' : 'failure')
         message = generate_github_description(warnings: warnings, errors: errors)
-        client.create_status(ci_source.repo_slug, latest_pr_commit_ref, status, {
-          description: message,
-          context: "danger/danger",
-          target_url: details_url
-        })
-      rescue
-        # This usually means the user has no commit access to this repo
-        # That's always the case for open source projects where you can only
-        # use a read-only GitHub account
-        if errors.count > 0
-          # We need to fail the actual build here
-          abort("\nDanger has failed this build. \nFound #{'error'.danger_pluralize(errors.count)} and I don't have write access to the PR set a PR status.")
-        else
-          puts message
+
+        latest_pr_commit_ref = self.pr_json[:head][:sha]
+
+        if latest_pr_commit_ref.empty? || latest_pr_commit_ref.nil?
+          raise "Couldn't find a commit to update its status".red
+        end
+
+        begin
+          client.create_status(ci_source.repo_slug, latest_pr_commit_ref, status, {
+            description: message,
+            context: "danger/danger",
+            target_url: details_url
+          })
+        rescue
+          # This usually means the user has no commit access to this repo
+          # That's always the case for open source projects where you can only
+          # use a read-only GitHub account
+          if errors.count > 0
+            # We need to fail the actual build here
+            abort("\nDanger has failed this build. \nFound #{'error'.danger_pluralize(errors.count)} and I don't have write access to the PR set a PR status.")
+          else
+            puts message
+          end
         end
       end
 

data/lib/danger/scm_source/git_repo.rb

@@ -16,6 +16,10 @@ module Danger
       `git #{string}`.strip
     end
 
+    def head_commit
+      exec "rev-parse HEAD"
+    end
+
     def origins
       exec "remote show origin -n | grep \"Fetch URL\" | cut -d ':' -f 2-"
     end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "0.8.2".freeze
+  VERSION = "0.8.3".freeze
   DESCRIPTION = "Automate your PR etiquette.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -57,14 +57,14 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: cork
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,72 +155,72 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: '0.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -225,30 +239,30 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 description: Create a Dangerfile to introspect your pull request in CI, makes it easy
   to enforce social conventions like changelogs and tests.
 email: