danger 5.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebc15e5d94bb1987f64914c8c4345f23837df23
-  data.tar.gz: 852987c3cd1dab15788f7563e27114b3b7409ddd
+  metadata.gz: 3248c206c971afa67361a2579ff0fe2a74a6e9db
+  data.tar.gz: 90a4b47170efda035644bb4d9974d55af7cdb67c
 SHA512:
-  metadata.gz: 385a51a1ff10d5670e1e91b16b3303e345c8ec39425e2f7b0d6bd37f91cda96336c42e11bc2207ad62d5504adaa004791892d1f4b1308040fa9d138b755baac2
-  data.tar.gz: 2cdf122f2787a31b58f885970ca5e25e543a59d666f52268623816e36548679642ad21e4ba637ad05176596e8e44f56d8ca8aa504e5d409879985fbef7554b8c
+  metadata.gz: 8259a349dbdd29d279c86a19f9344c3d64d58f1995b18f97bae37fc8fa7d2013209223f10fc12befa44b2bfd44d20d1b8009d522fcfd4a9afaec50ae37ac9abe
+  data.tar.gz: ad8acef7b9e8c8f775e57f57a41907fbef70b4ccf523cf5cc6c48986d446ed6c291a61479ff42e2cf2a02dd02444e0762b2d536d27b2861fba433149b55fd997

data/lib/danger/ci_source/drone.rb

@@ -11,19 +11,31 @@ module Danger
   #  ``` shell
   #   build:
   #     image: golang
-  #       commands:
-  #         - ...
-  #         - bundle exec danger
+  #     commands:
+  #       - ...
+  #       - bundle exec danger
   #  ```
   #
   # ### Token Setup
   #
-  # As this is self-hosted, you will need to add the `DANGER_GITHUB_API_TOKEN` to your build user's ENV. The alternative
-  # is to pass in the token as a prefix to the command `DANGER_GITHUB_API_TOKEN="123" bundle exec danger`.
+  # As this is self-hosted, you will need to expose the `DANGER_GITHUB_API_TOKEN` as a secret to your
+  # builds:
   #
+  # Drone secrets: http://readme.drone.io/usage/secret-guide/
+  # NOTE: This is a new syntax in DroneCI 0.6+
+  #
+  # ```
+  #   build:
+  #     image: golang
+  #     secrets:
+  #       - DANGER_GITHUB_API_TOKEN
+  #     commands:
+  #       - ...
+  #       - bundle exec danger
+  # ```
   class Drone < CI
     def self.validates_as_ci?(env)
-      env.key? "DRONE_REPO"
+      validates_as_ci_post_06?(env) or validates_as_ci_pre_06?(env)
     end
 
     def self.validates_as_pr?(env)
@@ -35,9 +47,25 @@ module Danger
     end
 
     def initialize(env)
-      self.repo_slug = env["DRONE_REPO"]
+      if self.class.validates_as_ci_post_06?(env)
+        self.repo_slug = "#{env['DRONE_REPO_OWNER']}/#{env['DRONE_REPO_NAME']}"
+        self.repo_url = env["DRONE_REPO_LINK"] if self.class.validates_as_ci_post_06?(env)
+      elsif self.class.validates_as_ci_pre_06?(env)
+        self.repo_slug = env["DRONE_REPO"]
+        self.repo_url = GitRepo.new.origins
+      end
+
       self.pull_request_id = env["DRONE_PULL_REQUEST"]
-      self.repo_url = GitRepo.new.origins # Drone doesn't provide a repo url env variable :/
+    end
+
+    # Check if this build is valid for CI with drone 0.6 or later
+    def self.validates_as_ci_post_06?(env)
+      env.key? "DRONE_REPO_OWNER" and env.key? "DRONE_REPO_NAME"
+    end
+
+    # Checks if this build is valid for CI with drone 0.5 or earlier
+    def self.validates_as_ci_pre_06?(env)
+      env.key? "DRONE_REPO"
     end
   end
 end

data/lib/danger/commands/init.rb

@@ -265,7 +265,7 @@ module Danger
 
     def info
       ui.header "Useful info"
-      ui.say "- One of the best ways to test out new rules locally is via " + "bundle exec danger local".yellow + "."
+      ui.say "- One of the best ways to test out new rules locally is via " + "bundle exec danger pr".yellow + "."
       ui.pause 0.6
       ui.say "- You can have Danger output all of its variables to the console via the " + "--verbose".yellow + " option."
       ui.pause 0.6

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.0.3".freeze
+  VERSION = "5.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: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide