diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9b648960..d48d1e61 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,6 @@ require 'logger' require 'gh' require 'multi_json' -require 'travis/support' require 'travis/api/app' require 'travis/testing' require 'travis/testing/scenario' diff --git a/travis-api.gemspec b/travis-api.gemspec index c45d6326..25fb88e3 100644 --- a/travis-api.gemspec +++ b/travis-api.gemspec @@ -9,136 +9,89 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.authors = [ - "Konstantin Haase", - "Piotr Sarnacki", - "carlad", - "Sven Fuchs", - "Hiro Asari", - "Mathias Meyer", - "Josh Kalderimis", - "Henrik Hodne", - "Steffen Kötte", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be "Ana Rosas", - "Tyranja", - "Lennard Wolf", - "Steffen", - "Jonas Chromik", -======= - "Tyranja", - "Lennard Wolf", - "Ana Rosas", - "Steffen", - "Jonas Chromik", - "Renée Hendricksen", ->>>>>>> update the gemspec - "Dan Buch", "Andre Arko", - "Erik Michaels-Ober", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be + "Brian Ford", + "Bryan Goldstein", "C. Scott Ananian", "Christopher Weyand", - "Lisa P", - "Brian Ford", - "Renée Hendricksen", - "Steve Richert", - "Nick Schonning", - "Lucas CHERIFI", - "Puneeth Chaganti", - "Bryan Goldstein", -======= - "Christopher Weyand", - "Lisa P", - "Brian Ford", - "Steve Richert", - "Nick Schonning", - "María de Antón", - "Puneeth Chaganti", - "Lucas CHERIFI", ->>>>>>> update the gemspec - "James Dennes", + "Dan Buch", + "Dan Rice", + "Erik Michaels-Ober", + "Henrik Hodne", + "Hiro Asari", "Igor Wiedler", - "rainsun", "Igor", + "James Dennes", + "Jonas Chromik", + "Josh Kalderimis", + "Konstantin Haase", + "Lennard Wolf", + "Lisa P", + "Lucas CHERIFI", + "María de Antón", + "Mathias Meyer", + "Nick Schonning", + "Patrick Williams" + "Piotr Sarnacki", + "Puneeth Chaganti", + "Renée Hendricksen", + "Steffen Kötte", + "Steffen", + "Steve Richert", + "Sven Fuchs", "Thais Camilo and Konstantin Haase", "Tim Carey-Smith", - "Dan Rice", + "Tyranja", "Zachary Scott", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be - "María de Antón", -======= - "Bryan Goldstein", ->>>>>>> update the gemspec - "Patrick Williams" + "carlad", + "rainsun", ] s.email = [ - "konstantin.mailinglists@googlemail.com", - "drogus@gmail.com", - "carla@travis-ci.com", - "me@svenfuchs.com", - "asari.ruby@gmail.com", - "meyer@paperplanes.de", - "josh.kalderimis@gmail.com", - "steffen.koette@gmail.com", - "carlad@users.noreply.github.com", - "me@henrikhodne.com", - "henrik@hodne.io", - "carla@travis-ci.org", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be - "a.rosas10@gmail.com", - "tyranja@cassiopeia.uberspace.de", - "konstantin.haase@gmail.com", - "lennardwolf@live.de", - "steffen.koette@gmail.com", "Jonas.Chromik@student.hpi.uni-potsdam.de", -======= - "tyranja@cassiopeia.uberspace.de", - "konstantin.haase@gmail.com", - "lennardwolf@live.de", - "a.rosas10@gmail.com", - "steffen.koette@gmail.com", - "Jonas.Chromik@student.hpi.uni-potsdam.de", - "renee@travis-ci.org", ->>>>>>> update the gemspec - "dan@travis-ci.org", - "andre@arko.net", - "svenfuchs@artweb-design.de", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be - "andre@arko.net", - "christopher.weyand@student.hpi.de", - "sferik@gmail.com", - "cscott@cscott.net", -======= - "cscott@cscott.net", - "christopher.weyand@student.hpi.de", - "sferik@gmail.com", ->>>>>>> update the gemspec - "steve.richert@gmail.com", - "bford@engineyard.com", - "henrik@travis-ci.com", - "mail@lislis.de", -<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be - "renee@travis-ci.org", - "patrick@bittorrent.com", - "rainsuner@gmail.com", -======= - "rainsuner@gmail.com", - "patrick@bittorrent.com", ->>>>>>> update the gemspec - "nschonni@gmail.com", "MariadeAnton@users.noreply.github.com", - "lucas@cherifi.info", - "jdennes@gmail.com", - "igor@travis-ci.org", - "dev+narwen+rkh@rkh.im", - "tim@spork.in", - "igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com", - "e@zzak.io", - "dan@zoombody.com", - "dan@meatballhat.com", + "a.rosas10@gmail.com", + "andre@arko.net", + "asari.ruby@gmail.com", + "bford@engineyard.com", "brysgo@gmail.com", + "carla@travis-ci.com", + "carla@travis-ci.org", + "carlad@users.noreply.github.com", + "christopher.weyand@student.hpi.de", + "cscott@cscott.net", + "dan@meatballhat.com", + "dan@travis-ci.org", + "dan@zoombody.com", + "dev+narwen+rkh@rkh.im", + "drogus@gmail.com", + "e@zzak.io", + "henrik@hodne.io", + "henrik@travis-ci.com", + "igor@travis-ci.org", + "igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com", + "jdennes@gmail.com", + "josh.kalderimis@gmail.com", + "konstantin.haase@gmail.com", + "konstantin.mailinglists@googlemail.com", + "lennardwolf@live.de", + "lucas@cherifi.info", + "mail@lislis.de", + "me@henrikhodne.com", + "me@svenfuchs.com", + "meyer@paperplanes.de", + "nschonni@gmail.com", + "patrick@bittorrent.com", "punchagan@muse-amuse.in" + "rainsuner@gmail.com", + "renee@travis-ci.org", + "sferik@gmail.com", + "steffen.koette@gmail.com", + "steve.richert@gmail.com", + "svenfuchs@artweb-design.de", + "tim@spork.in", + "tyranja@cassiopeia.uberspace.de", ] s.files = [ @@ -192,6 +145,39 @@ Gem::Specification.new do |s| "core_specs/core/model/url_spec.rb", "core_specs/core/model/user/oauth_spec.rb", "core_specs/core/model/user_spec.rb", + "core_specs/core/services/cancel_build_spec.rb", + "core_specs/core/services/cancel_job_spec.rb", + "core_specs/core/services/find_admin_spec.rb", + "core_specs/core/services/find_annotation_spec.rb", + "core_specs/core/services/find_branch_spec.rb", + "core_specs/core/services/find_branches_spec.rb", + "core_specs/core/services/find_build_spec.rb", + "core_specs/core/services/find_builds_spec.rb", + "core_specs/core/services/find_caches_spec.rb", + "core_specs/core/services/find_daily_repos_stats_spec.rb", + "core_specs/core/services/find_daily_tests_stats_spec.rb", + "core_specs/core/services/find_hooks_spec.rb", + "core_specs/core/services/find_job_spec.rb", + "core_specs/core/services/find_jobs_spec.rb", + "core_specs/core/services/find_log_spec.rb", + "core_specs/core/services/find_repo_key_spec.rb", + "core_specs/core/services/find_repo_settings_spec.rb", + "core_specs/core/services/find_repo_spec.rb", + "core_specs/core/services/find_repos_spec.rb", + "core_specs/core/services/find_request_spec.rb", + "core_specs/core/services/find_requests_spec.rb", + "core_specs/core/services/find_user_accounts_spec.rb", + "core_specs/core/services/next_build_number_spec.rb", + "core_specs/core/services/regenerate_repo_key_spec.rb", + "core_specs/core/services/remove_log_spec.rb", + "core_specs/core/services/reset_model_spec.rb", + "core_specs/core/services/sync_user_spec.rb", + "core_specs/core/services/update_annotation_spec.rb", + "core_specs/core/services/update_hook_spec.rb", + "core_specs/core/services/update_job_spec.rb", + "core_specs/core/services/update_log_spec.rb", + "core_specs/core/services/update_user_spec.rb", + "core_specs/core/services_spec.rb", "lib/active_record_postgres_variables.rb", "lib/conditional_skylight.rb", "lib/tasks/build_update_branch.rake", @@ -476,8 +462,10 @@ Gem::Specification.new do |s| "spec/support/active_record.rb", "spec/support/coverage.rb", "spec/support/formats.rb", + "spec/support/gcs.rb", "spec/support/matchers.rb", "spec/support/payloads.rb", + "spec/support/s3.rb", "spec/unit/access_token_spec.rb", "spec/unit/api/v2/http/accounts_spec.rb", "spec/unit/api/v2/http/annotations_spec.rb",