travis_dedup 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007c6dee85cf3e9a12349700b6d50c50619826db
-  data.tar.gz: eb663f3908fabd9fb7b2cbf08662286dc52abc09
+  metadata.gz: 14a0b42455ff794f353c282be857cd4cfe122656
+  data.tar.gz: 57bbe0650d1551bcac0304bc2cb3084c167af4b0
 SHA512:
-  metadata.gz: c8095f99a463e177c1e41436ca804f249c8e2326d52d58780e46031e42a222e65ab36ccd4221e1290b74b59d74896fa42dc12b27f4d40bf0a84f705bf4d41b31
-  data.tar.gz: a1021578505d929ce3f63eaef7789e1aa2ca10bbe83a2ed7d7cf13d67e83c50ddcab034f2c2f1210075af630842847f7f1d37eb6489da6336b9dbe883763104a
+  metadata.gz: 8de894c16503ccb38b9f7cc5aa3e3301f6734851ac5dbaa392fe4555b598c30608eb8a6b80b2bac2c6f3f10dd486075a09cc0c27af5b7bb808ffd30e7f9dd883
+  data.tar.gz: 77dacb5de7e21bd0c52c2dda124d3ba45a30ab903d292d41262bd35b368ff78d7213fea5c1aadf331dfd7be297993c3b4f7b0f82ec3201936d6d78879d560417

data/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (C) 2013 Michael Grosser <michael@grosser.it>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/travis_dedup.rb

@@ -3,10 +3,10 @@ require 'json'
 require 'optparse'
 
 module TravisDedup
-  PENDING = %w[created started queued]
+  ACTIVE = %w[created started queued]
 
   class << self
-    attr_accessor :pro
+    attr_accessor :pro, :verbose
 
     def cli(argv)
       parser = OptionParser.new do |opts|
@@ -29,26 +29,42 @@ module TravisDedup
         return 1
       end
 
-      canceled = dedup(*argv)
-      canceled = (canceled.any? ? canceled.map { |b| b.fetch("id") }.join(", ") : "None")
-      puts "Builds canceled: #{canceled}"
+      puts dedup_message(*argv)
       0
     end
 
     def dedup(repo, access_token)
-      headers = {
-        "Authorization" => %{token "#{access_token}"},
-        'Accept' => 'application/vnd.travis-ci.2+json' # otherwise we only get half the build data
-      }
-      builds = request(:get, "repos/#{repo}/builds", {}, headers).fetch("builds")
+      dedup_builds(repo, access_token).last
+    end
 
+    def dedup_message(repo, access_token)
+      all, canceled = dedup_builds(repo, access_token)
+      canceled = (canceled.any? ? canceled.map { |b| b.fetch("id") }.join(", ") : "None")
+      "Found #{all.size} builds, canceled: #{canceled}"
+    end
+
+    def access_token(github_token)
+      request(:post, "auth/github", github_token: github_token).fetch("access_token")
+    end
+
+    private
+
+    def dedup_builds(repo, access_token)
+      builds = active_builds(repo, access_token)
+      cancel = duplicate_builds(builds)
+      cancel(cancel, access_token)
+      return builds, cancel
+    end
+
+    def cancel(builds, access_token)
+      builds.each { |build| request :post, "builds/#{build.fetch("id")}/cancel", {}, headers(access_token) }
+    end
+
+    def duplicate_builds(builds)
       seen = []
-      builds.select! { |b| PENDING.include?(b.fetch("state")) }
       builds.select do |build|
-        pr = build.fetch("pull_request_number")
-        id = build.fetch("id")
+        next unless pr = build.fetch("pull_request_number")
         if seen.include?(pr)
-          request :post, "builds/#{id}/cancel", {}, headers
           true
         else
           seen << pr
@@ -57,11 +73,17 @@ module TravisDedup
       end
     end
 
-    def access_token(github_token)
-      request(:post, "auth/github", github_token: github_token).fetch("access_token")
+    def active_builds(repo, access_token)
+      request(:get, "repos/#{repo}/builds", {}, headers(access_token)).fetch("builds")
+        .select { |b| ACTIVE.include?(b.fetch("state")) }
     end
 
-    private
+    def headers(access_token)
+      {
+        "Authorization" => %{token "#{access_token}"},
+        'Accept' => 'application/vnd.travis-ci.2+json' # otherwise we only get half the build data
+      }
+    end
 
     def host
       pro ? "https://api.travis-ci.com" : "https://api.travis-ci.org"

data/lib/travis_dedup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_dedup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,6 +45,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE.txt
 - bin/travis-dedup
 - lib/travis_dedup.rb
 - lib/travis_dedup/version.rb