From 56a59e4cc306fba671ca84d98db7b60306e6918c Mon Sep 17 00:00:00 2001 From: Tyranja Date: Mon, 13 Jun 2016 15:03:41 +0200 Subject: [PATCH] Adds debugging output for canceling jobs --- spec/spec_helper.rb | 2 + travis-api.gemspec | 70 +++++++++++++++------------- vendor/travis-core/lib/travis/api.rb | 1 + 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d48d1e61..66d6ae0d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,6 +18,8 @@ require 'travis/testing/matchers' require 'support/matchers' require 'support/formats' +require 'pry' + Travis.logger = Logger.new(StringIO.new) Travis::Api::App.setup Travis.config.client_domain = "www.example.com" diff --git a/travis-api.gemspec b/travis-api.gemspec index 14932cb8..8404a7cd 100644 --- a/travis-api.gemspec +++ b/travis-api.gemspec @@ -31,6 +31,7 @@ Gem::Specification.new do |s| "Jonas Chromik", "Dan Buch", "Andre Arko", + "C. Scott Ananian", "Christopher Weyand", "Erik Michaels-Ober", "C. Scott Ananian", @@ -66,6 +67,23 @@ Gem::Specification.new do |s| "Zachary Scott", "carlad", "rainsun", + "Brian Ford", + "Lisa P", + "Steve Richert", + "Bryan Goldstein", + "Dan Rice", + "Igor", + "Igor Wiedler", + "James Dennes", + "Lucas CHERIFI", + "María de Antón", + "Nick Schonning", + "Patrick Williams", + "Puneeth Chaganti", + "Thais Camilo and Konstantin Haase", + "Tim Carey-Smith", + "Zachary Scott", + "rainsun" ] s.email = [ @@ -116,8 +134,8 @@ Gem::Specification.new do |s| "renee@travis-ci.org", "steffen.koette@gmail.com", "Jonas.Chromik@student.hpi.uni-potsdam.de", - "dan@travis-ci.org", "andre@arko.net", + "dan@travis-ci.org", "svenfuchs@artweb-design.de", "cscott@cscott.net", "christopher.weyand@student.hpi.de", @@ -127,6 +145,25 @@ Gem::Specification.new do |s| "svenfuchs@artweb-design.de", "tim@spork.in", "tyranja@cassiopeia.uberspace.de", + "bford@engineyard.com", + "henrik@travis-ci.com", + "mail@lislis.de", + "steve.richert@gmail.com", + "brysgo@gmail.com", + "dan@meatballhat.com", + "dan@zoombody.com", + "igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com", + "igor@travis-ci.org", + "jdennes@gmail.com", + "lucas@cherifi.info", + "MariadeAnton@users.noreply.github.com", + "nschonni@gmail.com", + "patrick@bittorrent.com", + "punchagan@muse-amuse.in", + "dev+narwen+rkh@rkh.im", + "tim@spork.in", + "e@zzak.io", + "rainsuner@gmail.com" ] s.files = [ @@ -639,40 +676,9 @@ Gem::Specification.new do |s| "vendor/travis-core/lib/travis/addons/webhook.rb", "vendor/travis-core/lib/travis/addons/webhook/event_handler.rb", "vendor/travis-core/lib/travis/addons/webhook/instruments.rb", - "vendor/travis-core/lib/travis/advisory_locks.rb", "vendor/travis-core/lib/travis/api.rb", "vendor/travis-core/lib/travis/api/README.markdown", "vendor/travis-core/lib/travis/api/formats.rb", - "vendor/travis-core/lib/travis/api/v0.rb", - "vendor/travis-core/lib/travis/api/v0/event.rb", - "vendor/travis-core/lib/travis/api/v0/event/build.rb", - "vendor/travis-core/lib/travis/api/v0/event/job.rb", - "vendor/travis-core/lib/travis/api/v0/notification.rb", - "vendor/travis-core/lib/travis/api/v0/notification/build.rb", - "vendor/travis-core/lib/travis/api/v0/notification/repository.rb", - "vendor/travis-core/lib/travis/api/v0/notification/user.rb", - "vendor/travis-core/lib/travis/api/v0/pusher.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/annotation.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/annotation/created.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/annotation/updated.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/canceled.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/created.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/finished.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/received.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/received/job.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/started.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/build/started/job.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/canceled.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/created.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/finished.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/log.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/received.rb", - "vendor/travis-core/lib/travis/api/v0/pusher/job/started.rb", - "vendor/travis-core/lib/travis/api/v0/worker.rb", - "vendor/travis-core/lib/travis/api/v0/worker/job.rb", - "vendor/travis-core/lib/travis/api/v0/worker/job/test.rb", "vendor/travis-core/lib/travis/api/v1.rb", "vendor/travis-core/lib/travis/api/v1/archive.rb", "vendor/travis-core/lib/travis/api/v1/archive/build.rb", diff --git a/vendor/travis-core/lib/travis/api.rb b/vendor/travis-core/lib/travis/api.rb index 9b31d94e..35011de0 100644 --- a/vendor/travis-core/lib/travis/api.rb +++ b/vendor/travis-core/lib/travis/api.rb @@ -15,6 +15,7 @@ module Travis target = (options[:for] || 'http').to_s.camelize version = (options[:version] || default_version(options)).to_s.camelize type = (options[:type] || type_for(resource)).to_s.camelize.split('::') + Travis.logger.info("target: #{target}, version: #{version}, type: #{type}") ([version, target] + type).inject(Travis::Api) do |const, name| begin if const && const.const_defined?(name.to_s.camelize, false)