danger 0.8.4 → 0.8.5

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

@@ -7,19 +7,19 @@ module Danger
     end
 
     def show_prompt
-      ui.print "> ".bold.green
+      ui.print '> '.bold.green
     end
 
     def yellow_bang
-      "! ".yellow
+      '! '.yellow
     end
 
     def green_bang
-      "! ".green
+      '! '.green
     end
 
     def red_bang
-      "! ".red
+      '! '.red
     end
 
     def say(output)
@@ -33,7 +33,7 @@ module Danger
     end
 
     def link(url)
-      say " -> " + url.underline + "\n"
+      say ' -> ' + url.underline + "\n"
     end
 
     def pause(time)
@@ -48,12 +48,12 @@ module Danger
 
     def run_command(command, output_command = nil)
       output_command ||= command
-      ui.puts "  " + output_command.magenta
+      ui.puts '  ' + output_command.magenta
       system command
     end
 
     def ask(question)
-      answer = ""
+      answer = ''
       loop do
         ui.puts "\n#{question}?"
 
@@ -73,26 +73,26 @@ module Danger
       print_info = proc do
         possible_answers.each_with_index do |answer, i|
           the_answer = (i == 0) ? answer.underline : answer
-          ui.print " " + the_answer
-          ui.print(" /") if i != possible_answers.length - 1
+          ui.print ' ' + the_answer
+          ui.print(' /') if i != possible_answers.length - 1
         end
         ui.print " ]\n"
       end
       print_info.call
 
-      answer = ""
+      answer = ''
 
       loop do
         show_prompt
         answer = @no_waiting ? possible_answers[0].downcase : STDIN.gets.downcase.chomp
 
-        answer = "yes" if answer == "y"
-        answer = "no" if answer == "n"
+        answer = 'yes' if answer == 'y'
+        answer = 'no' if answer == 'n'
 
         # default to first answer
-        if answer == ""
+        if answer == ''
           answer = possible_answers[0].downcase
-          ui.puts "Using: " + answer.yellow
+          ui.puts 'Using: ' + answer.yellow
         end
 
         break if possible_answers.map(&:downcase).include? answer

data/lib/danger/commands/local.rb

@@ -4,7 +4,7 @@ module Danger
     self.command = 'local'
 
     def initialize(argv)
-      @dangerfile_path = "Dangerfile" if File.exist? "Dangerfile"
+      @dangerfile_path = 'Dangerfile' if File.exist? 'Dangerfile'
       @pr_num = argv.option('use-merged-pr')
       super
     end
@@ -18,13 +18,13 @@ module Danger
     def validate!
       super
       unless @dangerfile_path
-        help! "Could not find a Dangerfile."
+        help! 'Could not find a Dangerfile.'
       end
     end
 
     def run
-      ENV["DANGER_USE_LOCAL_GIT"] = "YES"
-      ENV["LOCAL_GIT_PR_ID"] = @pr_num if @pr_num
+      ENV['DANGER_USE_LOCAL_GIT'] = 'YES'
+      ENV['LOCAL_GIT_PR_ID'] = @pr_num if @pr_num
 
       env = EnvironmentManager.new(ENV)
       dm = Dangerfile.new(env, cork)
@@ -32,7 +32,7 @@ module Danger
 
       source = dm.env.ci_source
       if source.nil? or source.repo_slug.empty?
-        cork.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
 
@@ -41,7 +41,7 @@ module Danger
       cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
 
       if verbose != true
-        cork.puts "Turning on --verbose"
+        cork.puts 'Turning on --verbose'
         dm.verbose = true
       end
 
@@ -54,15 +54,16 @@ module Danger
       begin
         gh.fetch_details
       rescue Octokit::NotFound
-        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."
+        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
 
       dm.env.request_source = gh
 
       begin
+        dm.env.fill_environment_vars
         dm.env.ensure_danger_branches_are_setup
-        dm.env.scm.diff_for_folder(".", from: dm.env.ci_source.base_commit, to: dm.env.ci_source.head_commit)
+        dm.env.scm.diff_for_folder('.', from: Danger::EnvironmentManager.danger_base_branch, to: Danger::EnvironmentManager.danger_head_branch)
         dm.parse(Pathname.new(@dangerfile_path))
         dm.print_results
       ensure

data/lib/danger/commands/plugins/plugin_new.rb

@@ -8,26 +8,26 @@ module Danger
 
       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: "
+      cork.puts 'Name of your new plugin: '
       name = STDIN.gets.strip
 
       dir = Danger.gem_path
-      content = File.read(File.join(dir, "lib", "assets", "PluginTemplate.rb.template"))
-      content.gsub!("[[CLASS_NAME]]", name.danger_class)
+      content = File.read(File.join(dir, 'lib', 'assets', 'PluginTemplate.rb.template'))
+      content.gsub!('[[CLASS_NAME]]', name.danger_class)
 
-      plugins_path = "danger_plugins"
+      plugins_path = 'danger_plugins'
       FileUtils.mkdir_p(plugins_path) unless File.directory?(plugins_path)
 
       output_path = File.join(plugins_path, "#{name}.rb")
       raise "File '#{output_path}' already exists!" if File.exist?(output_path)
       File.write(output_path, content)
 
-      cork.puts ""
+      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 'Add this to your `Dangerfile` to use it:'
+      cork.puts ''
       cork.puts "#{name}(parameter1: 123, parameter2: \"Club Mate\")".blue
-      cork.puts ""
+      cork.puts ''
       cork.puts "Enjoy ✨"
     end
   end

data/lib/danger/commands/plugins/plugin_readme.rb

@@ -35,8 +35,8 @@ module Danger
       self.markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_intra_emphasis: true)
       self.json = JSON.parse(parser.to_json)
 
-      template = File.join(Danger.gem_path, "lib/danger/plugin_support/templates/readme_table.html.erb")
-      cork.puts ERB.new(File.read(template), 0, "-").result(binding)
+      template = File.join(Danger.gem_path, 'lib/danger/plugin_support/templates/readme_table.html.erb')
+      cork.puts ERB.new(File.read(template), 0, '-').result(binding)
     end
   end
 end

data/lib/danger/commands/runner.rb

@@ -26,7 +26,7 @@ module Danger
     def validate!
       super
       if self.class == Runner && !@dangerfile_path
-        help! "Could not find a Dangerfile."
+        help! 'Could not find a Dangerfile.'
       end
     end
 
@@ -55,7 +55,7 @@ module Danger
           # Offer the chance for a user to specify a branch through the command line
           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.env.scm.diff_for_folder('.', from: ci_base, to: ci_head)
 
           dm.parse Pathname.new(@dangerfile_path)
 
@@ -65,7 +65,7 @@ module Danger
           dm.env.clean_up
         end
       else
-        cork.puts "Not a Pull Request - skipping `danger` run"
+        cork.puts 'Not a Pull Request - skipping `danger` run'
       end
     end
 

data/lib/danger/comment_generators/github.md.erb

@@ -36,5 +36,5 @@
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
 <p align="right" data-meta="generated_by_<%= @danger_id %>">
-  Generated by :no_entry_sign: <a href="https://github.com/danger/danger/">danger</a>
+  Generated by :no_entry_sign: <a href="http://danger.systems/">danger</a>
 </p>

data/lib/danger/core_ext/string.rb

@@ -11,7 +11,7 @@ class String
     self.gsub(/::/, '/').
       gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
       gsub(/([a-z\d])([A-Z])/, '\1_\2').
-      tr("-", "_").
+      tr('-', '_').
       downcase
   end
 end

data/lib/danger/danger_core/dangerfile.rb

@@ -73,7 +73,7 @@ module Danger
       @env = env_manager
 
       # Triggers local plugins from the root of a project
-      Dir["./danger_plugins/*.rb"].each do |file|
+      Dir['./danger_plugins/*.rb'].each do |file|
         require File.expand_path(file)
       end
 
@@ -115,10 +115,10 @@ module Danger
         methods.map do |method|
           case method
           when :api
-            value = "Octokit::Client"
+            value = 'Octokit::Client'
 
           when :pr_json
-            value = "[Skipped]"
+            value = '[Skipped]'
 
           when :pr_body
             value = plugin.send(method)
@@ -140,14 +140,14 @@ module Danger
     def print_known_info
       rows = []
       rows += method_values_for_plugin_hashes(core_dsl_attributes)
-      rows << ["---", "---"]
+      rows << ['---', '---']
       rows += method_values_for_plugin_hashes(external_dsl_attributes)
-      rows << ["---", "---"]
-      rows << ["SCM", env.scm.class]
-      rows << ["Source", env.ci_source.class]
-      rows << ["Requests", env.request_source.class]
-      rows << ["Base Commit", env.meta_info_for_base]
-      rows << ["Head Commit", env.meta_info_for_head]
+      rows << ['---', '---']
+      rows << ['SCM', env.scm.class]
+      rows << ['Source', env.ci_source.class]
+      rows << ['Requests', env.request_source.class]
+      rows << ['Base Commit', env.meta_info_for_base]
+      rows << ['Head Commit', env.meta_info_for_head]
 
       params = {}
       params[:rows] = rows.each { |current| current[0] = current[0].yellow }
@@ -180,8 +180,8 @@ module Danger
           'you should turn off smart quotes in your editor of choice.'.red
       end
 
-      if contents.include?("puts")
-        ui.puts "You used `puts` in your Dangerfile. To print out text to GitHub use `message` instead"
+      if contents.include?('puts')
+        ui.puts 'You used `puts` in your Dangerfile. To print out text to GitHub use `message` instead'
       end
 
       self.defined_in_file = path

data/lib/danger/danger_core/dangerfile_dsl.rb

@@ -20,7 +20,7 @@ module Danger
       end
 
       def load_default_plugins
-        Dir["./danger_plugins/*.rb"].each do |file|
+        Dir['./danger_plugins/*.rb'].each do |file|
           require File.expand_path(file)
         end
       end

data/lib/danger/danger_core/environment_manager.rb

@@ -1,5 +1,5 @@
-require "danger/ci_source/ci_source"
-require "danger/request_source/request_source"
+require 'danger/ci_source/ci_source'
+require 'danger/request_source/request_source'
 
 module Danger
   class EnvironmentManager
@@ -18,7 +18,7 @@ module Danger
         end
       end
 
-      raise "Could not find a valid pull request within the known CI sources".red unless self.ci_source
+      raise 'Could not find a valid pull request within the known CI sources'.red unless self.ci_source
 
       RequestSources::RequestSource.available_request_sources.each do |klass|
         next unless self.ci_source.supports?(klass)
@@ -28,7 +28,7 @@ module Danger
         self.request_source = request_source
       end
 
-      raise "Could not find a Request Source".red unless self.request_source
+      raise 'Could not find a Request Source'.red unless self.request_source
 
       self.scm = self.request_source.scm
     end
@@ -62,11 +62,11 @@ module Danger
     end
 
     def self.danger_head_branch
-      "danger_head"
+      'danger_head'
     end
 
     def self.danger_base_branch
-      "danger_base"
+      'danger_base'
     end
   end
 end

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

@@ -31,7 +31,7 @@ module Danger
 
   class DangerfileGitPlugin < Plugin
     def self.instance_name
-      "git"
+      'git'
     end
 
     def initialize(dangerfile)
@@ -43,23 +43,23 @@ module Danger
 
     # @!group Git Files
     # Paths for files that were added during the diff
-    # @return [FileList] an [Array] subclass
+    # @return [FileList<String>] an [Array] subclass
     #
     def added_files
-      Danger::FileList.new(@git.diff.select { |diff| diff.type == "new" }.map(&:path))
+      Danger::FileList.new(@git.diff.select { |diff| diff.type == 'new' }.map(&:path))
     end
 
     # @!group Git Files
     # Paths for files that were removed during the diff
-    # @return [FileList] an [Array] subclass
+    # @return [FileList<String>] an [Array] subclass
     #
     def deleted_files
-      Danger::FileList.new(@git.diff.select { |diff| diff.type == "deleted" }.map(&:path))
+      Danger::FileList.new(@git.diff.select { |diff| diff.type == 'deleted' }.map(&:path))
     end
 
     # @!group Git Files
     # Paths for files that changed during the diff
-    # @return [FileList] an [Array] subclass
+    # @return [FileList<String>] an [Array] subclass
     #
     def modified_files
       Danger::FileList.new(@git.diff.stats[:files].keys)
@@ -67,7 +67,7 @@ module Danger
 
     # @!group Git Metadata
     # The overall lines of code added/removed in the diff
-    # @return Int
+    # @return [Fixnum]
     #
     def lines_of_code
       @git.diff.lines
@@ -75,7 +75,7 @@ module Danger
 
     # @!group Git Metadata
     # The overall lines of code removed in the diff
-    # @return Int
+    # @return [Fixnum]
     #
     def deletions
       @git.diff.deletions
@@ -83,7 +83,7 @@ module Danger
 
     # @!group Git Metadata
     # The overall lines of code added in the diff
-    # @return Int
+    # @return [Fixnum]
     #
     def insertions
       @git.diff.insertions

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

@@ -34,12 +34,12 @@ module Danger
     end
 
     def self.instance_name
-      "github"
+      'github'
     end
 
     # @!group PR Metadata
     # The title of the Pull Request.
-    # @return String
+    # @return [String]
     #
     def pr_title
       @github.pr_json[:title].to_s
@@ -47,7 +47,7 @@ module Danger
 
     # @!group PR Metadata
     # The body text of the Pull Request.
-    # @return String
+    # @return [String]
     #
     def pr_body
       pr_json[:body].to_s
@@ -55,7 +55,7 @@ module Danger
 
     # @!group PR Metadata
     # The username of the author of the Pull Request.
-    # @return String
+    # @return [String]
     #
     def pr_author
       pr_json[:user][:login].to_s
@@ -71,7 +71,7 @@ module Danger
 
     # @!group PR Commit Metadata
     # The branch to which the PR is going to be merged into.
-    # @return String
+    # @return [String]
     #
     def branch_for_base
       pr_json[:base][:ref]
@@ -79,7 +79,7 @@ module Danger
 
     # @!group PR Commit Metadata
     # The branch to which the PR is going to be merged from.
-    # @return String
+    # @return [String]
     #
     def branch_for_head
       pr_json[:head][:ref]
@@ -95,7 +95,7 @@ module Danger
 
     # @!group PR Commit Metadata
     # The head commit to which the PR is requesting to be merged from.
-    # @return String
+    # @return [String]
     #
     def head_commit
       pr_json[:head][:sha]
@@ -104,7 +104,7 @@ module Danger
     # @!group GitHub Misca
     # The hash that represents the PR's JSON. For an example of what this looks like
     # see the [Danger Fixture'd one](https://raw.githubusercontent.com/danger/danger/master/spec/fixtures/pr_response.json).
-    # @return Hash
+    # @return [Hash]
     #
     def pr_json
       @github.pr_json
@@ -113,7 +113,7 @@ module Danger
     # @!group GitHub Misc
     # Provides access to the GitHub API client used inside Danger. Making
     # it easy to use the GitHub API inside a Dangerfile.
-    # @return Octokit::Client
+    # @return [Octokit::Client]
     def api
       @github.client
     end