From 986ae0ef9725b822454d147e2fb2cecb1fc05b30 Mon Sep 17 00:00:00 2001 From: carlad Date: Mon, 21 Sep 2015 16:26:01 +0200 Subject: [PATCH 1/7] add branch to build minimal rep --- lib/travis/api/v3/renderer/build.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/renderer/build.rb b/lib/travis/api/v3/renderer/build.rb index 4bca9f68..a24c39d9 100644 --- a/lib/travis/api/v3/renderer/build.rb +++ b/lib/travis/api/v3/renderer/build.rb @@ -2,8 +2,8 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Build < Renderer::ModelRenderer - representation(:minimal, :id, :number, :state, :duration, :event_type, :previous_state, :started_at, :finished_at, :jobs) - representation(:standard, *representations[:minimal], :repository, :branch, :commit) + representation(:minimal, :id, :number, :branch, :state, :duration, :event_type, :previous_state, :started_at, :finished_at, :jobs) + representation(:standard, *representations[:minimal], :repository, :commit) def jobs return model.jobs if include_full_jobs? From 6821cec524bbe23b906195cec5419197fdb499c1 Mon Sep 17 00:00:00 2001 From: carlad Date: Mon, 21 Sep 2015 17:02:38 +0200 Subject: [PATCH 2/7] revert change to build renderer --- lib/travis/api/v3/renderer/build.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/renderer/build.rb b/lib/travis/api/v3/renderer/build.rb index a24c39d9..4bca9f68 100644 --- a/lib/travis/api/v3/renderer/build.rb +++ b/lib/travis/api/v3/renderer/build.rb @@ -2,8 +2,8 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Build < Renderer::ModelRenderer - representation(:minimal, :id, :number, :branch, :state, :duration, :event_type, :previous_state, :started_at, :finished_at, :jobs) - representation(:standard, *representations[:minimal], :repository, :commit) + representation(:minimal, :id, :number, :state, :duration, :event_type, :previous_state, :started_at, :finished_at, :jobs) + representation(:standard, *representations[:minimal], :repository, :branch, :commit) def jobs return model.jobs if include_full_jobs? From af7fdec34027733c37de11ac7167f5c30f220c27 Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Sep 2015 16:16:01 +0200 Subject: [PATCH 3/7] v3 remove :last_build attrubite from repository renderer --- lib/travis/api/v3/renderer/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/api/v3/renderer/repository.rb b/lib/travis/api/v3/renderer/repository.rb index 2bb4a75a..84c06862 100644 --- a/lib/travis/api/v3/renderer/repository.rb +++ b/lib/travis/api/v3/renderer/repository.rb @@ -3,7 +3,7 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Repository < Renderer::ModelRenderer representation(:minimal, :id, :slug, :default_branch) - representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :last_build, :default_branch) + representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :default_branch) def active !!model.active From 866ed28641357d64ef2017235206a2803553d624 Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Sep 2015 16:23:26 +0200 Subject: [PATCH 4/7] v3 revert removal of :last_build from repo renderer --- lib/travis/api/v3/renderer/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/api/v3/renderer/repository.rb b/lib/travis/api/v3/renderer/repository.rb index 84c06862..2bb4a75a 100644 --- a/lib/travis/api/v3/renderer/repository.rb +++ b/lib/travis/api/v3/renderer/repository.rb @@ -3,7 +3,7 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Repository < Renderer::ModelRenderer representation(:minimal, :id, :slug, :default_branch) - representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :default_branch) + representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :last_build, :default_branch) def active !!model.active From ab979e235651e991a4d06d898b1fe5882f4ede28 Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 23 Sep 2015 15:32:15 +0200 Subject: [PATCH 5/7] add category to broadcasts renderer --- lib/travis/api/v3/renderer/broadcast.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/renderer/broadcast.rb b/lib/travis/api/v3/renderer/broadcast.rb index 90b42776..da0c528e 100644 --- a/lib/travis/api/v3/renderer/broadcast.rb +++ b/lib/travis/api/v3/renderer/broadcast.rb @@ -2,7 +2,7 @@ require 'travis/api/v3/renderer/model_renderer' module Travis::API::V3 class Renderer::Broadcast < Renderer::ModelRenderer - representation(:minimal, :id, :recipient_id, :message, :created_at) - representation(:standard, :id, :recipient_id, :recipient_type, :kind, :message, :expired, :created_at, :updated_at) + representation(:minimal, :id, :recipient_id, :message, :created_at, :category) + representation(:standard, :id, :recipient_id, :recipient_type, :category, :kind, :message, :expired, :created_at, :updated_at) end end From 4e2d33995a156f11f1323a65925595ce4a1adb2f Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 23 Sep 2015 15:44:37 +0200 Subject: [PATCH 6/7] update broadcasts spec --- spec/v3/services/broadcasts/for_current_user_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/v3/services/broadcasts/for_current_user_spec.rb b/spec/v3/services/broadcasts/for_current_user_spec.rb index 78f1bdd6..64659ead 100644 --- a/spec/v3/services/broadcasts/for_current_user_spec.rb +++ b/spec/v3/services/broadcasts/for_current_user_spec.rb @@ -36,6 +36,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do "id" => broadcasts[0].id, "recipient_id" => broadcasts[0].recipient_id, "recipient_type" => broadcasts[0].recipient_type, + "category" => broadcasts[0].category, "kind" => nil, "message" => broadcasts[0].message, "expired" => nil, @@ -47,6 +48,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do "id" => broadcasts[1].id, "recipient_id" => broadcasts[1].recipient_id, "recipient_type" => broadcasts[1].recipient_type, + "category" => broadcasts[1].category, "kind" => nil, "message" => broadcasts[1].message, "expired" => nil, @@ -58,6 +60,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do "id" => broadcasts[2].id, "recipient_id" => broadcasts[2].recipient_id, "recipient_type" => broadcasts[2].recipient_type, + "category" => broadcasts[2].category, "kind" => nil, "message" => broadcasts[2].message, "expired" => nil, @@ -69,6 +72,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do "id" => broadcasts[3].id, "recipient_id" => broadcasts[3].recipient_id, "recipient_type" => broadcasts[3].recipient_type, + "category" => broadcasts[3].category, "kind" => nil, "message" => broadcasts[3].message, "expired" => nil, From 6187c2a9c18cb682677556cbf3ac99316593b7ba Mon Sep 17 00:00:00 2001 From: carlad Date: Wed, 23 Sep 2015 15:51:26 +0200 Subject: [PATCH 7/7] bump travis-core --- Gemfile.lock | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1f0bb5af..6d06db8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: d76e7aa7bac71737553fe127fe825981b8a2bbf6 + revision: c70ff174e2ceddebcf28a1b4fd92de5c52d6c74e specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -145,7 +145,7 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - backports (3.6.5) + backports (3.6.6) builder (3.0.4) bunny (0.8.0) celluloid (0.16.0) @@ -186,7 +186,7 @@ GEM net-http-pipeline hashr (0.0.22) hike (1.2.3) - hitimes (1.2.2) + hitimes (1.2.3) httpclient (2.6.0.1) i18n (0.7.0) ice_nine (0.11.1) @@ -310,7 +310,7 @@ GEM timers (4.0.1) hitimes tool (0.2.3) - travis-config (0.1.0) + travis-config (0.1.4) hashr (~> 0.0) treetop (1.4.15) polyglot @@ -369,3 +369,6 @@ DEPENDENCIES travis-yaml! unicorn yard-sinatra! + +BUNDLED WITH + 1.10.6