suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rkh-metrics

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Mathias Meyer 2013-06-10 08:23:42 +02:00
commit 49015050c1
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Gemfile.lock
View File

@ -1,8 +1,8 @@
GIT GIT
remote: git://github.com/getsentry/raven-ruby.git remote: git://github.com/getsentry/raven-ruby.git
revision: 267b33417a3ed43f552911cf353561a641ba9fb2 revision: a07adb1fcbe4b11d938e2af236eb2063d2a22c32
specs: specs:
sentry-raven (0.4.6) sentry-raven (0.4.8)
faraday (>= 0.7.6) faraday (>= 0.7.6)
hashie (>= 1.1.0) hashie (>= 1.1.0)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -10,16 +10,16 @@ GIT
GIT GIT
remote: git://github.com/rack/rack-contrib.git remote: git://github.com/rack/rack-contrib.git
revision: 6f337267eae0bedb4110879f2aea6b1bb2137980 revision: 1026181ca6bbe01e7daad43d15b701296abf95b8
specs: specs:
rack-contrib (1.2.0) rack-contrib (1.2.0)
rack (>= 0.9.1) rack (>= 0.9.1)
GIT GIT
remote: git://github.com/rkh/gh.git remote: git://github.com/rkh/gh.git
revision: ff93c759591a66c9d5250cada5234d2adde95dd3 revision: 6eec1a730700d7e94bb288742ad23822d2d28604
specs: specs:
gh (0.11.1) gh (0.11.2)
addressable addressable
backports backports
faraday (~> 0.8) faraday (~> 0.8)
@ -53,7 +53,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 7931f7847fda40e788ab61a4b7724a41123128c2 revision: 475973f29cd817bacec61db17a903730f4f07c51
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.12) actionmailer (~> 3.2.12)
@ -82,7 +82,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-support.git remote: git://github.com/travis-ci/travis-support.git
revision: 5463f10e58563e79b950da8c6c392d1e80ec3013 revision: c0add49c71ff3c788b4b7e5b63c11d3896d9847d
specs: specs:
travis-support (0.0.1) travis-support (0.0.1)
@ -97,7 +97,6 @@ PATH
specs: specs:
travis-api (0.0.1) travis-api (0.0.1)
backports (~> 2.5) backports (~> 2.5)
hubble (~> 0.1)
newrelic_rpm (~> 3.6.1.88) newrelic_rpm (~> 3.6.1.88)
pg (~> 0.13.2) pg (~> 0.13.2)
rack-contrib (~> 1.1) rack-contrib (~> 1.1)
@ -159,7 +158,7 @@ GEM
dotenv (0.7.0) dotenv (0.7.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
facter (1.7.0) facter (1.7.1)
factory_girl (2.4.2) factory_girl (2.4.2)
activesupport activesupport
faraday (0.8.7) faraday (0.8.7)
@ -168,16 +167,14 @@ GEM
foreman (0.63.0) foreman (0.63.0)
dotenv (>= 0.7) dotenv (>= 0.7)
thor (>= 0.13.6) thor (>= 0.13.6)
hashie (2.0.4) hashie (2.0.5)
hashr (0.0.22) hashr (0.0.22)
hike (1.2.2) hike (1.2.2)
hitimes (1.2.1) hitimes (1.2.1)
hubble (0.1.2)
yajl-ruby (~> 1.1)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
json (1.8.0) json (1.8.0)
listen (1.0.3) listen (1.1.3)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
rb-kqueue (>= 0.2) rb-kqueue (>= 0.2)
@ -191,7 +188,7 @@ GEM
avl_tree (~> 1.1.2) avl_tree (~> 1.1.2)
hitimes (~> 1.1) hitimes (~> 1.1)
mime-types (1.23) mime-types (1.23)
mocha (0.13.3) mocha (0.14.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.7.3) multi_json (1.7.3)
multipart-post (1.2.0) multipart-post (1.2.0)
@ -200,7 +197,7 @@ GEM
newrelic_rpm (3.6.1.88) newrelic_rpm (3.6.1.88)
pg (0.13.2) pg (0.13.2)
polyglot (0.3.3) polyglot (0.3.3)
pry (0.9.12.1) pry (0.9.12.2)
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.4) slop (~> 3.4)
@ -233,7 +230,7 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.3.0)
redis (3.0.4) redis (3.0.4)
redis-namespace (1.3.0) redis-namespace (1.3.0)
redis (~> 3.0.0) redis (~> 3.0.0)
@ -266,7 +263,7 @@ GEM
rack-test rack-test
sinatra (~> 1.3.0) sinatra (~> 1.3.0)
tilt (~> 1.3) tilt (~> 1.3)
slop (3.4.4) slop (3.4.5)
sprockets (2.2.2) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -284,7 +281,6 @@ GEM
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.37) tzinfo (0.3.37)
uuidtools (2.1.4) uuidtools (2.1.4)
yajl-ruby (1.1.0)
yard (0.8.6.1) yard (0.8.6.1)
PLATFORMS PLATFORMS

2
lib/travis/api/app/endpoint/authorization.rb
View File

@ -272,6 +272,8 @@ class Travis::Api::App
return unless uri = Addressable::URI.parse(target_origin) return unless uri = Addressable::URI.parse(target_origin)
if uri.host =~ /\A(.+\.)?travis-ci\.(com|org)\Z/ if uri.host =~ /\A(.+\.)?travis-ci\.(com|org)\Z/
uri.scheme == 'https' uri.scheme == 'https'
elsif uri.host =~ /\A(.+\.)?travis-lite\.com\Z/
uri.scheme == 'https'
elsif uri.host == 'localhost' or uri.host == '127.0.0.1' elsif uri.host == 'localhost' or uri.host == '127.0.0.1'
uri.port > 1023 uri.port > 1023
end end

4
spec/integration/v1/repositories_spec.rb
View File

@ -42,7 +42,7 @@ describe 'v1 repos' do
describe 'GET /svenfuchs/minimal.png' do describe 'GET /svenfuchs/minimal.png' do
it '"unknown" when it only has one build that is not finished' do it '"unknown" when it only has one build that is not finished' do
Build.delete_all Build.delete_all
Factory(:build, repository: repo, state: :created, result: nil) Factory(:build, repository: repo, state: :created)
repo.builds.update_all(state: 'started') repo.builds.update_all(state: 'started')
get('/svenfuchs/minimal.png').should deliver_result_image_for('unknown') get('/svenfuchs/minimal.png').should deliver_result_image_for('unknown')
end end
@ -58,7 +58,7 @@ describe 'v1 repos' do
end end
it '"passing" when there is a running build but the previous one has passed' do it '"passing" when there is a running build but the previous one has passed' do
Factory(:build, repository: repo, state: :finished, result: nil, previous_result: 0) Factory(:build, repository: repo, state: :passed, previous_state: :passed)
repo.update_attributes!(last_build_state: 'started') repo.update_attributes!(last_build_state: 'started')
get('/svenfuchs/minimal.png').should deliver_result_image_for('passing') get('/svenfuchs/minimal.png').should deliver_result_image_for('passing')
end end

21
travis-api.gemspec
View File

@ -12,29 +12,32 @@ Gem::Specification.new do |s|
"Sven Fuchs", "Sven Fuchs",
"Konstantin Haase", "Konstantin Haase",
"Piotr Sarnacki", "Piotr Sarnacki",
"Josh Kalderimis",
"Henrik Hodne", "Henrik Hodne",
"Mathias Meyer", "Mathias Meyer",
"Josh Kalderimis",
"Andre Arko", "Andre Arko",
"Erik Michaels-Ober", "Erik Michaels-Ober",
"Steve Richert", "Steve Richert",
"Brian Ford", "Brian Ford",
"Nick Schonning" "Nick Schonning",
"James Dennes"
] ]
s.email = [ s.email = [
"me@svenfuchs.com", "me@svenfuchs.com",
"konstantin.mailinglists@googlemail.com", "konstantin.mailinglists@googlemail.com",
"drogus@gmail.com", "drogus@gmail.com",
"meyer@paperplanes.de",
"me@henrikhodne.com",
"svenfuchs@artweb-design.de",
"josh.kalderimis@gmail.com", "josh.kalderimis@gmail.com",
"me@henrikhodne.com",
"meyer@paperplanes.de",
"svenfuchs@artweb-design.de",
"andre@arko.net", "andre@arko.net",
"sferik@gmail.com", "sferik@gmail.com",
"steve.richert@gmail.com", "steve.richert@gmail.com",
"bford@engineyard.com", "bford@engineyard.com",
"nschonni@gmail.com" "jdennes@gmail.com",
"nschonni@gmail.com",
"konstantin.haase@gmail.com"
] ]
s.files = [ s.files = [
@ -48,6 +51,7 @@ Gem::Specification.new do |s|
"config/unicorn.rb", "config/unicorn.rb",
"docs/00_overview.md", "docs/00_overview.md",
"docs/01_cross_origin.md", "docs/01_cross_origin.md",
"lib/tasks/build_update_branch.rake",
"lib/tasks/build_update_pull_request_data.rake", "lib/tasks/build_update_pull_request_data.rake",
"lib/travis/api/app.rb", "lib/travis/api/app.rb",
"lib/travis/api/app/access_token.rb", "lib/travis/api/app/access_token.rb",
@ -111,6 +115,7 @@ Gem::Specification.new do |s|
"lib/travis/api/app/helpers.rb", "lib/travis/api/app/helpers.rb",
"lib/travis/api/app/helpers/accept.rb", "lib/travis/api/app/helpers/accept.rb",
"lib/travis/api/app/helpers/current_user.rb", "lib/travis/api/app/helpers/current_user.rb",
"lib/travis/api/app/helpers/db_follower.rb",
"lib/travis/api/app/helpers/flash.rb", "lib/travis/api/app/helpers/flash.rb",
"lib/travis/api/app/helpers/mime_types.rb", "lib/travis/api/app/helpers/mime_types.rb",
"lib/travis/api/app/helpers/respond_with.rb", "lib/travis/api/app/helpers/respond_with.rb",
@ -134,7 +139,9 @@ Gem::Specification.new do |s|
"script/console", "script/console",
"script/server", "script/server",
"spec/integration/formats_handling_spec.rb", "spec/integration/formats_handling_spec.rb",
"spec/integration/responders_spec.rb",
"spec/integration/routes.backup.rb", "spec/integration/routes.backup.rb",
"spec/integration/scopes_spec.rb",
"spec/integration/v1/branches_spec.rb", "spec/integration/v1/branches_spec.rb",
"spec/integration/v1/builds_spec.rb", "spec/integration/v1/builds_spec.rb",
"spec/integration/v1/hooks_spec.rb", "spec/integration/v1/hooks_spec.rb",
@ -153,6 +160,7 @@ Gem::Specification.new do |s|
"spec/integration/version_spec.rb", "spec/integration/version_spec.rb",
"spec/spec_helper.rb", "spec/spec_helper.rb",
"spec/support/matchers.rb", "spec/support/matchers.rb",
"spec/unit/access_token_spec.rb",
"spec/unit/app_spec.rb", "spec/unit/app_spec.rb",
"spec/unit/cors_spec.rb", "spec/unit/cors_spec.rb",
"spec/unit/default_spec.rb", "spec/unit/default_spec.rb",
@ -186,7 +194,6 @@ Gem::Specification.new do |s|
s.add_dependency 'travis-support' s.add_dependency 'travis-support'
s.add_dependency 'travis-core' s.add_dependency 'travis-core'
s.add_dependency 'hubble', '~> 0.1'
s.add_dependency 'backports', '~> 2.5' s.add_dependency 'backports', '~> 2.5'
s.add_dependency 'pg', '~> 0.13.2' s.add_dependency 'pg', '~> 0.13.2'
s.add_dependency 'newrelic_rpm', '~> 3.6.1.88' s.add_dependency 'newrelic_rpm', '~> 3.6.1.88'