danger 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bdf784866d4e556b6e665ae22edc46048983f26
-  data.tar.gz: d4e01b88a5b73d250a194cb98ada8f361c4b20ae
+  metadata.gz: 04e4dcb2c7122c516f919f4974a599726ff4990f
+  data.tar.gz: fc4acfef02e8aec3732fd5a29570697518a81271
 SHA512:
-  metadata.gz: 463ee74a57de4fdf20387f988da779668a6adced5c8785ec2723e83cf3cbc88f990e4dea7767f8c4559286be4253718a1bab0fdb61003be0229b64b005e764f0
-  data.tar.gz: 6c73599cbc71be47bd903336cb5a106b5d8932544188ef30b6d93853ddf0ec515f08fc867c4efeda734acad5b0dd363e0fd4e6fd92ef0dabebc14e1cf72972a4
+  metadata.gz: 8c09366fbb3cda48045db4b6436be7363c24e36cb9274c59cf6d29065199c5abd4f5ea8ab7d4d9cb42c2edccdbe1837713985a0aff0a214bc374d00f1e9d1bb9
+  data.tar.gz: a52f301b783e08d1f76cc60e9c20214fda799b7ea2d38ffb40bd7eab74016907b9466aff97842c1f13eabab1861210ee6d1deb0fad86ead3b05cd4ebfef5b5de

data/lib/danger/ci_source/bitrise.rb

@@ -0,0 +1,39 @@
+# http://devcenter.bitrise.io/docs/available-environment-variables
+
+module Danger
+  # ### CI Setup
+  #
+  # Add a script step to your workflow:
+  # ``` yml
+  # - script@1.1.2:
+  #     inputs:
+  #    - content: |-
+  #        bundle install
+  #        bundle exec danger
+  # ```
+  # ### Token Setup
+  #
+  # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's Secret Env Vars
+  #
+  class Bitrise < CI
+    def self.validates_as_ci?(env)
+      env.key? "BITRISE_IO"
+    end
+
+    def self.validates_as_pr?(env)
+      return !env["BITRISE_PULL_REQUEST"].to_s.empty?
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::GitLab]
+    end
+
+    def initialize(env)
+      self.pull_request_id = env["BITRISE_PULL_REQUEST"]
+      self.repo_url = env["GIT_REPOSITORY_URL"]
+
+      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
+      self.repo_slug = repo_matches[2] unless repo_matches.nil?
+    end
+  end
+end

data/lib/danger/ci_source/buildkite.rb

@@ -35,7 +35,7 @@ module Danger
     end
 
     def initialize(env)
-      self.repo_url = env["BUILDKITE_PULL_REQUEST_REPO"]
+      self.repo_url = env["BUILDKITE_REPO"]
       self.pull_request_id = env["BUILDKITE_PULL_REQUEST"]
 
       repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})

data/lib/danger/ci_source/circle.rb

@@ -40,7 +40,7 @@ module Danger
 
     def self.validates_as_pr?(env)
       # This will get used if it's available, instead of the API faffing.
-      return true unless env["CI_PULL_REQUEST"].empty?
+      return true if env["CI_PULL_REQUEST"] && !env["CI_PULL_REQUEST"].empty?
 
       # Real-world talk, it should be worrying if none of these are in the environment
       return false unless ["CIRCLE_CI_API_TOKEN", "CIRCLE_PROJECT_USERNAME", "CIRCLE_PROJECT_REPONAME", "CIRCLE_BUILD_NUM"].all? { |x| env[x] && !env[x].empty? }

data/lib/danger/ci_source/gitlab_ci.rb

@@ -8,7 +8,7 @@ module Danger
   # exist as of yet, however there is an
   # [MR](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5698) fixing this.
   # If that has been merged and you are using either gitlab.com or a release
-  # with that change this CISource will wokr.
+  # with that change this CISource will work.
   #
   class GitLabCI < CI
     def self.validates_as_ci?(env)

data/lib/danger/ci_source/local_git_repo.rb

@@ -52,7 +52,6 @@ module Danger
           raise "No recent pull requests found for this repo, danger requires at least one PR for the local mode."
         end
       end
-
       self.pull_request_id = pr_merge.match("#([0-9]+)")[1]
       sha = pr_merge.split(" ")[0]
       parents = run_git("rev-list --parents -n 1 #{sha}").strip.split(" ")

data/lib/danger/ci_source/semaphore.rb

@@ -4,7 +4,8 @@ module Danger
   # ### CI Setup
   #
   # For Semaphor you will want to go to the settings page of the project. Inside "Build Settings"
-  # you should add `bundle exec danger` to the Setup thread.
+  # you should add `bundle exec danger` to the Setup thread. Note that Semaphore only provides
+  # the build environment variables necessary for Danger on PRs across forks.
   #
   # ### Token Setup
   #
@@ -16,7 +17,7 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      ["SEMAPHORE_REPO_SLUG", "PULL_REQUEST_NUMBER"].all? { |x| env[x] }
+      ["SEMAPHORE_REPO_SLUG", "PULL_REQUEST_NUMBER"].all? { |x| env[x] && !env[x].empty? }
     end
 
     def supported_request_sources

data/lib/danger/ci_source/surf.rb

@@ -13,11 +13,11 @@ module Danger
   #
   class Surf < CI
     def self.validates_as_ci?(env)
-      return ["SURF_REPO", "SURF_NWO"].all? { |x| env[x] }
+      return ["SURF_REPO", "SURF_NWO"].all? { |x| env[x] && !env[x].empty? }
     end
 
-    def self.validates_as_pr?(_)
-      true
+    def self.validates_as_pr?(env)
+      validates_as_ci?(env)
     end
 
     def supported_request_sources

data/lib/danger/ci_source/travis.rb

@@ -31,7 +31,7 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      exists = ["TRAVIS_PULL_REQUEST", "TRAVIS_REPO_SLUG"].all? { |x| env[x] }
+      exists = ["TRAVIS_PULL_REQUEST", "TRAVIS_REPO_SLUG"].all? { |x| env[x] && !env[x].empty? }
       exists && env["TRAVIS_PULL_REQUEST"].to_i > 0
     end
 

data/lib/danger/ci_source/xcode_server.rb

@@ -21,7 +21,8 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      env["XCS_BOT_NAME"].include? "BuildaBot"
+      value = env["XCS_BOT_NAME"]
+      !value.nil? && value.include?("BuildaBot")
     end
 
     def supported_request_sources

data/lib/danger/commands/init.rb

@@ -145,7 +145,7 @@ module Danger
     def current_repo_slug
       @git = GitRepo.new
       repo_matches = @git.origins.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
-      repo_matches[2] || "[Your/Repo]"
+      (repo_matches[2] || "[Your/Repo]").strip
     end
 
     def setup_danger_ci
@@ -234,7 +234,7 @@ module Danger
         ui.say "I'll give you a minute to read it..."
         ui.wait_for_return
 
-        ui.say "On Danger/Danger we turn on " + "Permissive building of fork pull requests".yellow + " this exposes the token to Danger"
+        ui.say "On danger/danger we turn on " + "Permissive building of fork pull requests".yellow + " this exposes the token to Danger"
         ui.say "You can find this setting at:"
         ui.link "https://circleci.com/gh/#{current_repo_slug}/edit#advanced-settings\n"
         ui.say "I'll hold..."

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

@@ -19,8 +19,6 @@ module Danger
 
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a JSON format.
-      Note: Before 1.0, it will also parse the represented JSON to validate whether http://danger.systems would
-      show the plugin on the website.
     DESC
 
     self.arguments = [
@@ -29,12 +27,20 @@ module Danger
 
     def run
       file_resolver = PluginFileResolver.new(@refs)
-      paths = file_resolver.resolve_to_paths
+      data = file_resolver.resolve
 
-      parser = PluginParser.new(paths)
+      parser = PluginParser.new(data[:paths])
       parser.parse
-      json = parser.to_json_string
-      cork.puts json
+      json = parser.to_json
+
+      # Append gem metadata into every plugin
+      data[:gems].each do |gem_data|
+        json.each do |plugin|
+          plugin[:gem_metadata] = gem_data if plugin[:gem] == gem_data[:gem]
+        end
+      end
+
+      cork.puts json.to_json
     end
   end
 end

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

@@ -37,9 +37,9 @@ module Danger
 
     def run
       file_resolver = PluginFileResolver.new(@refs)
-      paths = file_resolver.resolve_to_paths
+      data = file_resolver.resolve
 
-      parser = PluginParser.new(paths, verbose: true)
+      parser = PluginParser.new(data[:paths], verbose: true)
       parser.parse
       json = parser.to_json
 

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

@@ -31,9 +31,9 @@ module Danger
     attr_accessor :json, :markdown
     def run
       file_resolver = PluginFileResolver.new(@refs)
-      paths = file_resolver.resolve_to_paths
+      data = file_resolver.resolve
 
-      parser = PluginParser.new(paths)
+      parser = PluginParser.new(data[:paths])
       parser.parse
 
       self.json = JSON.parse(parser.to_json_string)

data/lib/danger/commands/runner.rb

@@ -53,7 +53,7 @@ module Danger
     end
 
     def run
-      Executor.new.run(base: @base,
+      Executor.new(ENV).run(base: @base,
                        head: @head,
                        dangerfile_path: @dangerfile_path,
                        danger_id: @danger_id)

data/lib/danger/danger_core/executor.rb

@@ -1,5 +1,9 @@
 module Danger
   class Executor
+    def initialize(system_env)
+      @system_env = system_env
+    end
+
     def run(env: nil,
             dm: nil,
             cork: nil,
@@ -12,18 +16,18 @@ module Danger
                               verbose: false)
 
       # Could we find a CI source at all?
-      unless EnvironmentManager.local_ci_source(ENV)
-        abort("Could not find the type of CI for Danger to run on.".red) unless ci_klass
+      unless EnvironmentManager.local_ci_source(@system_env)
+        abort("Could not find the type of CI for Danger to run on.".red)
       end
 
       # Could we determine that the CI source is inside a PR?
-      unless EnvironmentManager.pr?(ENV)
+      unless EnvironmentManager.pr?(@system_env)
         cork.puts "Not a Pull Request - skipping `danger` run".yellow
         return
       end
 
       # OK, then we can have some
-      env ||= EnvironmentManager.new(ENV)
+      env ||= EnvironmentManager.new(@system_env)
       dm ||= Dangerfile.new(env, cork)
 
       dm.init_plugins

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

@@ -26,7 +26,7 @@ module Danger
   #
   # @example Only accept MRs to the develop branch
   #
-  #          fail "Please re-submit this MR to develop, we may have already fixed your issue." if gitlab.branch_for_base != "develop"
+  #          fail "Please re-submit this MR to develop, we may have already fixed your issue." if gitlab.branch_for_merge != "develop"
   #
   # @example Note when MRs don't reference a milestone, which goes away when it does
   #

data/lib/danger/plugin_support/plugin_file_resolver.rb

@@ -10,10 +10,11 @@ module Danger
       @refs = references
     end
 
-    def resolve_to_paths
+    def resolve
       # When given existing paths, map to absolute & existing paths
       if !@refs.nil? and @refs.select { |ref| File.file? ref }.any?
-        @refs.select { |ref| File.file? ref }.map { |path| File.expand_path(path) }
+        paths = @refs.select { |ref| File.file? ref }.map { |path| File.expand_path(path) }
+        { paths: paths, gems: [] }
 
       # When given a list of gems
       elsif @refs and @refs.kind_of? Array
@@ -36,12 +37,29 @@ module Danger
 
             # the paths are relative to our current Chdir
             relative_paths = gem_names.flat_map { |plugin| Dir.glob("vendor/gems/ruby/*/gems/#{plugin}*/lib/**/**/**/**.rb") }
-            relative_paths.map { |path| File.join(dir, path) }
+            paths = relative_paths.map { |path| File.join(dir, path) }
+
+            spec_paths = gem_names.flat_map { |plugin| Dir.glob("vendor/gems/ruby/*/specifications/#{plugin}*.gemspec").first }
+            real_gems = spec_paths.map { |path| Gem::Specification.load path }
+
+            plugin_metadata = real_gems.map do |gem|
+              {
+                name: gem.name,
+                gem: gem.name,
+                author: gem.authors,
+                url: gem.homepage,
+                description: gem.summary,
+                license: gem.license || "Unknown",
+                version: gem.version.to_s
+              }
+            end
+            { paths: paths, gems: plugin_metadata }
           end
         end
       # When empty, imply you want to test the current lib folder as a plugin
       else
-        Dir.glob(File.join(".", "lib/**/*.rb")).map { |path| File.expand_path(path) }
+        paths = Dir.glob(File.join(".", "lib/**/*.rb")).map { |path| File.expand_path(path) }
+        { paths: paths, gems: [] }
       end
     end
   end

data/lib/danger/request_source/github.rb

@@ -64,6 +64,10 @@ module Danger
 
       def fetch_details
         self.pr_json = client.pull_request(ci_source.repo_slug, ci_source.pull_request_id)
+        if self.pr_json[:message] == "Moved Permanently"
+          raise "Repo moved or renamed, make sure to update the git remote".red
+        end
+
         fetch_issue_details(self.pr_json)
         self.ignored_violations = ignored_violations_from_pr(self.pr_json)
       end

data/lib/danger/scm_source/git_repo.rb

@@ -23,7 +23,7 @@ module Danger
     end
 
     def origins
-      exec("remote show origin -n").lines.grep(/Fetch URL/)[0].split(": ", 2)[1]
+      exec("remote show origin -n").lines.grep(/Fetch URL/)[0].split(": ", 2)[1].chomp
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.0.3".freeze
-  DESCRIPTION = "Automate your PR etiquette.".freeze
+  VERSION = "3.1.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.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -362,6 +362,7 @@ files:
 - lib/assets/DangerfileTemplate
 - lib/assets/PluginTemplate.rb.template
 - lib/danger.rb
+- lib/danger/ci_source/bitrise.rb
 - lib/danger/ci_source/buildkite.rb
 - lib/danger/ci_source/ci_source.rb
 - lib/danger/ci_source/circle.rb
@@ -430,9 +431,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Automate your PR etiquette.
+summary: Like Unit Tests, but for your Team Culture.
 test_files: []
-has_rdoc: