danger 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331ec016762064e8a92668e5b9b56521e5873f50
-  data.tar.gz: 69fb9998dbe05c5465301a4a0396a28ce4ebf1ca
+  metadata.gz: af48c7716089bda158a7d4fb5422684cda1cf882
+  data.tar.gz: 31bcd2dba47171bf5898a2d0954c385b7aa1e60b
 SHA512:
-  metadata.gz: 0abf5fed8d027d3368573054d82b87c4010bf806ef83d0d41f8b964d438e44fd35dd99f822de9ebc581c3d3d59ea6810145235a08b7ed7a20682f4ae35e80019
-  data.tar.gz: 2189b8616f4a18ee79d12863c5ce0db5dc803996635c5e14b6f56f66050b97207cb76198fc36cadad80399e4b3ed6c0901814f653972236d57ab4a5f37015583
+  metadata.gz: 18da3b3a61540d5b8725e5d154c5f38e346af10429ef61fbbc280fe9f8bab6206b8442f0c868ca4559bbfe28a011607f1caac4aaccc234f86679c33435fa32c3
+  data.tar.gz: de5ffb844e8cd08df544bdde71411d3a2e1a2520fd626f018f3c51ffe44bde1f207a2608713c1cbb7ab134682aea672a2de83e454285b29ca9abd5e033f7e6c8

data/lib/danger/ci_source/ci_source.rb

@@ -19,7 +19,7 @@ module Danger
     end
 
     def supports?(request_source)
-      supported_request_sources.include? request_source
+      supported_request_sources.include?(request_source)
     end
 
     def self.validates_as_ci?(_env)

data/lib/danger/ci_source/jenkins.rb

@@ -53,7 +53,7 @@ module Danger
     end
 
     def initialize(env)
-      self.repo_url = env["GIT_URL"]
+      self.repo_url = env.fetch("GIT_URL_1") { env["GIT_URL"] }
       self.pull_request_id = self.class.pull_request_id(env)
 
       repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})

data/lib/danger/commands/dangerfile/gem.rb

@@ -0,0 +1,43 @@
+require "claide_plugin"
+require "danger/commands/dangerfile/init"
+
+module Danger
+  class DangerfileGem < DangerfileCommand
+    self.summary = "Create a gem-based Dangerfile quickly."
+    def self.description
+      <<-DESC
+                Creates a scaffold for the development of a new gem based Dangerfile
+                named `NAME` according to the best practices.
+      DESC
+    end
+    self.command = "gem"
+    self.arguments = [
+      CLAide::Argument.new("NAME", true)
+    ]
+
+    def initialize(argv)
+      @name = argv.shift_argument
+      prefix = "dangerfile" + "-"
+      unless @name.nil? || @name.empty? || @name.start_with?(prefix)
+        @name = prefix + @name.dup
+      end
+      @template_url = argv.shift_argument
+      super
+    end
+
+    def validate!
+      super
+      if @name.nil? || @name.empty?
+        help! "A name for the plugin is required."
+      end
+
+      help! "The plugin name cannot contain spaces." if @name =~ /\s/
+    end
+
+    def run
+      runner = CLAide::TemplateRunner.new(@name, "https://github.com/danger/dangerfile-gem-template")
+      runner.clone_template
+      runner.configure_template
+    end
+  end
+end

data/lib/danger/commands/dangerfile/init.rb

@@ -0,0 +1,30 @@
+require "danger/danger_core/dangerfile_generator"
+
+# Mainly so we can have a nice strucutre for commands
+
+module Danger
+  class DangerfileCommand < Runner
+    self.summary = "Easily create you Dangerfiles."
+    self.command = "dangerfile"
+
+    self.abstract_command = true
+    def self.options
+      []
+    end
+  end
+end
+
+# Just a less verbose way of doing the Dangerfile from `danger init`.
+
+module Danger
+  class DangerfileInit < DangerfileCommand
+    self.summary = "Create an example Dangerfile."
+    self.command = "init"
+
+    def run
+      content = DangerfileGenerator.create_dangerfile(".", cork)
+      File.write("Dangerfile", content)
+      cork.puts "Created" + "./Dangerfile".green
+    end
+  end
+end

data/lib/danger/commands/init.rb

@@ -1,4 +1,5 @@
 require "danger/commands/init_helpers/interviewer"
+require "danger/danger_core/dangerfile_generator"
 require "danger/ci_source/local_git_repo"
 require "yaml"
 
@@ -53,8 +54,7 @@ module Danger
     end
 
     def setup_dangerfile
-      dir = Danger.gem_path
-      content = File.read(File.join(dir, "lib", "assets", "DangerfileTemplate"))
+      content = DangerfileGenerator.create_dangerfile(".", cork)
       File.write("Dangerfile", content)
 
       ui.header "Step 1: Creating a starter Dangerfile"

data/lib/danger/commands/runner.rb

@@ -19,6 +19,9 @@ module Danger
     require "danger/commands/plugins/plugin_json"
     require "danger/commands/plugins/plugin_readme"
 
+    require "danger/commands/dangerfile/init"
+    require "danger/commands/dangerfile/gem"
+
     attr_accessor :cork
 
     self.summary = "Run the Dangerfile."

data/lib/danger/danger_core/dangerfile.rb

@@ -68,10 +68,11 @@ module Danger
       super
     end
 
-    def initialize(env_manager, cork_board)
+    # cork_board not being set comes from plugins #585
+    def initialize(env_manager, cork_board = nil)
       @plugins = {}
       @core_plugins = []
-      @ui = cork_board
+      @ui = cork_board || Cork::Board.new(silent: false, verbose: false)
 
       # Triggers the core plugins
       @env = env_manager

data/lib/danger/danger_core/dangerfile_generator.rb

@@ -0,0 +1,11 @@
+module Danger
+  class DangerfileGenerator
+    # returns the string for a Dangerfile based on a folder's contents'
+    def self.create_dangerfile(_path, _ui)
+      # Use this template for now, but this is a really ripe place to
+      # improve now!
+      dir = Danger.gem_path
+      File.read(File.join(dir, "lib", "assets", "DangerfileTemplate"))
+    end
+  end
+end

data/lib/danger/danger_core/environment_manager.rb

@@ -15,10 +15,20 @@ module Danger
       local_ci_source(env).validates_as_pr?(env)
     end
 
-    def initialize(env, ui)
+    # @return [String] danger's default head branch
+    def self.danger_head_branch
+      "danger_head".freeze
+    end
+
+    # @return [String] danger's default base branch
+    def self.danger_base_branch
+      "danger_base".freeze
+    end
+
+    def initialize(env, ui = nil)
       ci_klass = self.class.local_ci_source(env)
       self.ci_source = ci_klass.new(env)
-      self.ui = ui
+      self.ui = ui || Cork::Board.new(silent: false, verbose: false)
 
       RequestSources::RequestSource.available_request_sources.each do |klass|
         next unless self.ci_source.supports?(klass)
@@ -53,20 +63,12 @@ module Danger
       end
     end
 
-    def meta_info_for_base
-      scm.exec("--no-pager log #{EnvironmentManager.danger_base_branch} -n1")
-    end
-
     def meta_info_for_head
       scm.exec("--no-pager log #{EnvironmentManager.danger_head_branch} -n1")
     end
 
-    def self.danger_head_branch
-      "danger_head"
-    end
-
-    def self.danger_base_branch
-      "danger_base"
+    def meta_info_for_base
+      scm.exec("--no-pager log #{EnvironmentManager.danger_base_branch} -n1")
     end
 
     def raise_error_for_no_request_source(env, ui)

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

@@ -29,6 +29,10 @@ module Danger
   #
   #          danger.import_dangerfile(gitlab: "ruby-grape/danger")
   #
+  # @example Run a Dangerfile from inside a repo branch and path
+  #
+  #          danger.import_dangerfile(github: "ruby-grape/danger", branch: "custom", path: "path/to/Dangerfile")
+  #
   # @see  danger/danger
   # @tags core, plugins
 
@@ -73,7 +77,7 @@ module Danger
         import_dangerfile_from_github(opts)
       elsif opts.kind_of?(Hash)
         if opts.key?(:github) || opts.key?(:gitlab)
-          import_dangerfile_from_github(opts[:github] || opts[:gitlab])
+          import_dangerfile_from_github(opts[:github] || opts[:gitlab], opts[:branch], opts[:path])
         elsif opts.key?(:path)
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
@@ -141,12 +145,16 @@ module Danger
     #
     # @param    [String] slug
     #           A slug that represents the repo where the Dangerfile is.
+    # @param    [String] branch
+    #           A branch from repo where the Dangerfile is.
+    # @param    [String] path
+    #           The path at the repo where Dangerfile is.
     # @return   [void]
     #
-    def import_dangerfile_from_github(slug)
+    def import_dangerfile_from_github(slug, branch = nil, path = nil)
       raise "`import_dangerfile_from_github` requires a string" unless slug.kind_of?(String)
       org, repo = slug.split("/")
-      download_url = env.request_source.file_url(organisation: org, repository: repo, branch: "master", path: "Dangerfile")
+      download_url = env.request_source.file_url(organisation: org, repository: repo, branch: branch || "master", path: path || "Dangerfile")
       local_path = download(download_url)
       @dangerfile.parse(Pathname.new(local_path))
     end
@@ -208,7 +216,7 @@ module Danger
     def validate_file_contains_plugin!(file)
       content = IO.read(file)
 
-      if content.scan(/class\s+(?<plugin_class>[\w]+)\s+<\s+Plugin/i).empty?
+      if content.scan(/class\s+(?<plugin_class>[\w]+)\s+<\s+((Danger::)?Plugin)/i).empty?
         raise("#{file} doesn't contain any valid danger plugin.")
       end
     end

data/lib/danger/scm_source/git_repo.rb

@@ -37,7 +37,7 @@ module Danger
     end
 
     def ensure_commitish_exists!(commitish)
-      exec("fetch") if exec("rev-parse --quiet --verify #{commitish}").empty?
+      exec("fetch") if exec("rev-parse --quiet --verify \"#{commitish}^{commit}\"").empty?
     end
 
     private

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.4.0".freeze
+  VERSION = "3.5.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: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -29,16 +29,16 @@ dependencies:
   name: claide-plugins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -374,7 +374,6 @@ files:
 - README.md
 - bin/danger
 - lib/assets/DangerfileTemplate
-- lib/assets/PluginTemplate.rb.template
 - lib/danger.rb
 - lib/danger/ci_source/bitrise.rb
 - lib/danger/ci_source/buildkite.rb
@@ -393,6 +392,8 @@ files:
 - lib/danger/ci_source/travis.rb
 - lib/danger/ci_source/xcode_server.rb
 - lib/danger/clients/rubygems_client.rb
+- lib/danger/commands/dangerfile/gem.rb
+- lib/danger/commands/dangerfile/init.rb
 - lib/danger/commands/init.rb
 - lib/danger/commands/init_helpers/interviewer.rb
 - lib/danger/commands/local.rb
@@ -410,6 +411,7 @@ files:
 - lib/danger/core_ext/string.rb
 - lib/danger/danger_core/dangerfile.rb
 - lib/danger/danger_core/dangerfile_dsl.rb
+- lib/danger/danger_core/dangerfile_generator.rb
 - lib/danger/danger_core/environment_manager.rb
 - lib/danger/danger_core/executor.rb
 - lib/danger/danger_core/messages/markdown.rb

data/lib/assets/PluginTemplate.rb.template

@@ -1,20 +0,0 @@
-module Danger
-  class Dangerfile
-    module DSL
-      class [[CLASS_NAME]] < Plugin
-        def run(parameter1: nil, parameter2: nil)
-          if (pr_body + pr_title).include?("WIP")
-            warn "Pull Request is Work in Progress"
-          end
-        end
-
-        def self.description
-          [
-            "Describe what this plugin does",
-            "and how the user can use it"
-          ].join(" ")
-        end
-      end
-    end
-  end
-end