travis_dedup 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a0b42455ff794f353c282be857cd4cfe122656
-  data.tar.gz: 57bbe0650d1551bcac0304bc2cb3084c167af4b0
+  metadata.gz: 04603ba6cc68114fb41abe32e6a7f13d17891d1e
+  data.tar.gz: 7efca7ec8c3752a5ed4db4801c8c0508cfbf740e
 SHA512:
-  metadata.gz: 8de894c16503ccb38b9f7cc5aa3e3301f6734851ac5dbaa392fe4555b598c30608eb8a6b80b2bac2c6f3f10dd486075a09cc0c27af5b7bb808ffd30e7f9dd883
-  data.tar.gz: 77dacb5de7e21bd0c52c2dda124d3ba45a30ab903d292d41262bd35b368ff78d7213fea5c1aadf331dfd7be297993c3b4f7b0f82ec3201936d6d78879d560417
+  metadata.gz: 5860acfa91d3c46a7e44bf7b5b97fda4a096cfc87991c57e019c51f22c389c0d004df4f0d4484d5ef7026a93bd7ed30bf53c15c1a76470810e069c61ba6a71bb
+  data.tar.gz: efef33df8b0cc3c3ebbd8f00dca972cd9941de7b240210a6e2579e64a504ad2326a469adb38043f4f24fa4013c5a00fd19b0a2628cabb41f642fae7ce76ce529

data/lib/travis_dedup.rb

@@ -6,7 +6,7 @@ module TravisDedup
   ACTIVE = %w[created started queued]
 
   class << self
-    attr_accessor :pro, :verbose
+    attr_accessor :pro, :verbose, :branches
 
     def cli(argv)
       parser = OptionParser.new do |opts|
@@ -19,6 +19,7 @@ module TravisDedup
           Options:
         BANNER
         opts.on("--pro", "travis pro") { self.pro = true }
+        opts.on("--branches", "dedup builds on branches too") { self.branches = true }
         opts.on("-h", "--help","Show this") { puts opts; exit }
         opts.on('-v', '--version','Show Version'){ require 'travis_dedup/version'; puts TravisDedup::VERSION; exit}
       end
@@ -63,19 +64,26 @@ module TravisDedup
     def duplicate_builds(builds)
       seen = []
       builds.select do |build|
-        next unless pr = build.fetch("pull_request_number")
-        if seen.include?(pr)
+        pr = build.fetch "pull_request_number"
+        branch = build.fetch "branch"
+
+        next if !pr && !branches
+
+        id = pr || branch
+        if seen.include?(id)
           true
         else
-          seen << pr
+          seen << id
           false
         end
       end
     end
 
+    # see http://docs.travis-ci.com/api/#builds
     def active_builds(repo, access_token)
-      request(:get, "repos/#{repo}/builds", {}, headers(access_token)).fetch("builds")
-        .select { |b| ACTIVE.include?(b.fetch("state")) }
+      response = request(:get, "repos/#{repo}/builds", {}, headers(access_token))
+      builds = response.fetch("builds").select { |b| ACTIVE.include?(b.fetch("state")) }
+      builds.each { |build| build["branch"] = response.fetch("commits").detect { |c| c["id"] == build["commit_id"] }.fetch("branch") }
     end
 
     def headers(access_token)

data/lib/travis_dedup/version.rb

@@ -1,3 +1,3 @@
 module TravisDedup
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_dedup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday