danger 0.8.5 → 0.9.0

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)
@@ -28,12 +28,12 @@ module Danger
 
     def header(title)
       say title.yellow
-      say ''
+      say ""
       pause 0.6
     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

@@ -1,30 +1,30 @@
 module Danger
   class Local < Runner
-    self.summary = 'Run the Dangerfile locally.'
-    self.command = 'local'
+    self.summary = "Run the Dangerfile locally."
+    self.command = "local"
 
     def initialize(argv)
-      @dangerfile_path = 'Dangerfile' if File.exist? 'Dangerfile'
-      @pr_num = argv.option('use-merged-pr')
+      @dangerfile_path = "Dangerfile" if File.exist? "Dangerfile"
+      @pr_num = argv.option("use-merged-pr")
       super
     end
 
     def self.options
       [
-        ['--use-merged-pr=[#id]', 'The ID of an already merged PR inside your history to use as a reference for the local run.']
+        ["--use-merged-pr=[#id]", "The ID of an already merged PR inside your history to use as a reference for the local run."]
       ].concat(super)
     end
 
     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,20 +41,20 @@ 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
 
       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.
+      # and is IP locked, as opposed to on the CI.
       gh.support_tokenless_auth = true
 
       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
 
@@ -63,7 +63,7 @@ module Danger
       begin
         dm.env.fill_environment_vars
         dm.env.ensure_danger_branches_are_setup
-        dm.env.scm.diff_for_folder('.', from: Danger::EnvironmentManager.danger_base_branch, to: Danger::EnvironmentManager.danger_head_branch)
+        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_lint.rb

@@ -1,18 +1,21 @@
-require 'danger/commands/plugins/plugin_abstract'
-require 'danger/plugin_support/plugin_parser'
-require 'danger/plugin_support/plugin_file_resolver'
+require "danger/plugin_support/plugin_parser"
+require "danger/plugin_support/plugin_file_resolver"
 
 module Danger
-  class PluginLint < PluginAbstract
-    self.summary = 'Lints a plugin'
-    self.command = 'lint'
+  class PluginLint < CLAide::Command::Plugins
+    self.summary = "Lints a plugin"
+    self.command = "lint"
+
+    attr_accessor :cork
 
     def initialize(argv)
       @refs = argv.arguments! unless argv.arguments.empty?
+      @cork = Cork::Board.new(silent: argv.option("silent", false),
+                              verbose: argv.option("verbose", false))
       super
     end
 
-    self.summary = 'Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success.'
+    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
 
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a JSON format.
@@ -21,7 +24,7 @@ module Danger
     DESC
 
     self.arguments = [
-      CLAide::Argument.new('Paths, Gems or Nothing', false, true)
+      CLAide::Argument.new("Paths, Gems or Nothing", false, true)
     ]
 
     def run

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

@@ -1,19 +1,23 @@
-require 'danger/commands/plugins/plugin_abstract'
-require 'danger/plugin_support/plugin_parser'
-require 'danger/plugin_support/plugin_file_resolver'
-require 'json'
+require "danger/plugin_support/plugin_parser"
+require "danger/plugin_support/plugin_file_resolver"
+require "json"
+require "erb"
 
 module Danger
-  class PluginReadme < PluginAbstract
-    self.summary = 'Generates a README from a set of plugins'
-    self.command = 'readme'
+  class PluginReadme < CLAide::Command::Plugins
+    self.summary = "Generates a README from a set of plugins"
+    self.command = "readme"
+
+    attr_accessor :cork
 
     def initialize(argv)
       @refs = argv.arguments! unless argv.arguments.empty?
+      @cork = Cork::Board.new(silent: argv.option("silent", false),
+                              verbose: argv.option("verbose", false))
       super
     end
 
-    self.summary = 'Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success.'
+    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
 
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a format usable in a README.
@@ -21,7 +25,7 @@ module Danger
     DESC
 
     self.arguments = [
-      CLAide::Argument.new('Paths, Gems or Nothing', false, true)
+      CLAide::Argument.new("Paths, Gems or Nothing", false, true)
     ]
 
     attr_accessor :json, :markdown
@@ -35,8 +39,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

@@ -1,11 +1,22 @@
 module Danger
   class Runner < CLAide::Command
-    require 'danger/commands/init'
-    require 'danger/commands/local'
-    require 'danger/commands/plugins/plugin_abstract'
-
-    self.summary = 'Run the Dangerfile.'
-    self.command = 'danger'
+    require "danger/commands/init"
+    require "danger/commands/local"
+
+    # manually set claide plugins as a subcommand
+    require "claide_plugin"
+    @subcommands << CLAide::Command::Plugins
+    CLAide::Plugins.config =
+      CLAide::Plugins::Configuration.new("Danger",
+                                         "danger",
+                                         "https://raw.githubusercontent.com/danger/danger.systems/master/plugins-search-generated.json",
+                                         "https://github.com/danger/danger-plugin-template")
+
+    require "danger/commands/plugins/plugin_lint"
+    require "danger/commands/plugins/plugin_readme"
+
+    self.summary = "Run the Dangerfile."
+    self.command = "danger"
     self.version = Danger::VERSION
 
     self.plugin_prefixes = %w(claide danger)
@@ -13,29 +24,29 @@ module Danger
     attr_accessor :cork
 
     def initialize(argv)
-      dangerfile = argv.option('dangerfile', 'Dangerfile')
+      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))
+      @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
 
     def validate!
       super
       if self.class == Runner && !@dangerfile_path
-        help! 'Could not find a Dangerfile.'
+        help! "Could not find a Dangerfile."
       end
     end
 
     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'],
-        ['--danger_id=<id>', 'The identifier of this Danger instance']
+        ["--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"],
+        ["--danger_id=<id>", "The identifier of this Danger instance"]
       ].concat(super)
     end
 
@@ -55,7 +66,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 +76,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
 
@@ -81,7 +92,7 @@ module Danger
       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__)
+        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")

data/lib/danger/core_ext/string.rb

@@ -1,6 +1,6 @@
 class String
   def danger_class
-    split('_').collect!(&:capitalize).join
+    split("_").collect!(&:capitalize).join
   end
 
   def danger_pluralize(count)
@@ -8,10 +8,10 @@ class String
   end
 
   def danger_underscore
-    self.gsub(/::/, '/').
+    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

@@ -1,14 +1,14 @@
 # So much was ripped direct from CocoaPods-Core - thanks!
 
-require 'danger/danger_core/dangerfile_dsl'
-require 'danger/danger_core/standard_error'
+require "danger/danger_core/dangerfile_dsl"
+require "danger/danger_core/standard_error"
 
-require 'danger/danger_core/plugins/dangerfile_messaging_plugin'
-require 'danger/danger_core/plugins/dangerfile_import_plugin'
-require 'danger/danger_core/plugins/dangerfile_git_plugin'
-require 'danger/danger_core/plugins/dangerfile_github_plugin'
+require "danger/danger_core/plugins/dangerfile_messaging_plugin"
+require "danger/danger_core/plugins/dangerfile_import_plugin"
+require "danger/danger_core/plugins/dangerfile_git_plugin"
+require "danger/danger_core/plugins/dangerfile_github_plugin"
 
-require 'danger/danger_core/plugins/dangerfile_github_plugin'
+require "danger/danger_core/plugins/dangerfile_github_plugin"
 
 module Danger
   class Dangerfile
@@ -25,7 +25,7 @@ module Danger
     #         presented to the user.
     #
     def to_s
-      'Dangerfile'
+      "Dangerfile"
     end
 
     # These are the classes that are allowed to also use method_missing
@@ -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,20 +140,20 @@ 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 }
       params[:title] = "Danger v#{Danger::VERSION}\nDSL Attributes".green
 
-      ui.section('Info:') do
+      ui.section("Info:") do
         ui.puts
         ui.puts Terminal::Table.new(params)
         ui.puts
@@ -165,23 +165,23 @@ module Danger
     def parse(path, contents = nil)
       print_known_info if verbose
 
-      contents ||= File.open(path, 'r:utf-8', &:read)
+      contents ||= File.open(path, "r:utf-8", &:read)
 
       # Work around for Rubinius incomplete encoding in 1.9 mode
-      if contents.respond_to?(:encoding) && contents.encoding.name != 'UTF-8'
-        contents.encode!('UTF-8')
+      if contents.respond_to?(:encoding) && contents.encoding.name != "UTF-8"
+        contents.encode!("UTF-8")
       end
 
-      if contents.tr!('“”‘’‛', %(""'''))
+      if contents.tr!("“”‘’‛", %(""'''))
         # Changes have been made
         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
+          "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')
-        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
@@ -203,9 +203,9 @@ module Danger
       status = status_report
       return if (status[:errors] + status[:warnings] + status[:messages] + status[:markdowns]).count == 0
 
-      ui.section('Results:') do
+      ui.section("Results:") do
         [:errors, :warnings, :messages].each do |key|
-          formatted = key.to_s.capitalize + ':'
+          formatted = key.to_s.capitalize + ":"
           title = case key
                   when :errors
                     formatted.red
@@ -219,7 +219,7 @@ module Danger
         end
 
         if status[:markdowns].count > 0
-          ui.section('Markdown:') do
+          ui.section("Markdown:") do
             status[:markdowns].each do |current_markdown|
               ui.puts current_markdown
             end