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

Merge pull request #219 from travis-ci/add_default_branch_info_to_jobs_and_builds

Browse Source 
Add branch_is_default info to commits
This commit is contained in:
Piotr Sarnacki 2016-02-23 15:40:44 +01:00
commit 2b89f7ac30
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/travis/api/v2/http/build.rb
View File

@ -17,7 +17,7 @@ module Travis
def data
{
'build' => build_data(build),
'commit' => commit_data(build.commit),
'commit' => commit_data(build.commit, build.repository),
'jobs' => options[:include_jobs] ? build.matrix.map { |job| job_data(job) } : [],
'annotations' => options[:include_jobs] ? Annotations.new(annotations(build), @options).data["annotations"] : [],
}
@ -44,11 +44,12 @@ module Travis
}
end
def commit_data(commit)
def commit_data(commit, repository)
{
'id' => commit.id,
'sha' => commit.commit,
'branch' => commit.branch,
'branch_is_default' => branch_is_default(commit, repository),
'message' => commit.message,
'committed_at' => format_date(commit.committed_at),
'author_name' => commit.author_name,
@ -78,6 +79,10 @@ module Travis
}
end
def branch_is_default(commit, repository)
repository.default_branch == commit.branch
end
def annotations(build)
build.matrix.map(&:annotations).flatten
end

9
lib/travis/api/v2/http/job.rb
View File

@ -15,7 +15,7 @@ module Travis
def data
{
'job' => job_data(job),
'commit' => commit_data(job.commit),
'commit' => commit_data(job.commit, job.repository),
'annotations' => Annotations.new(job.annotations, @options).data["annotations"],
}
end
@ -42,11 +42,12 @@ module Travis
}
end
def commit_data(commit)
def commit_data(commit, repository)
{
'id' => commit.id,
'sha' => commit.commit,
'branch' => commit.branch,
'branch_is_default' => branch_is_default(commit, repository),
'message' => commit.message,
'committed_at' => format_date(commit.committed_at),
'author_name' => commit.author_name,
@ -56,6 +57,10 @@ module Travis
'compare_url' => commit.compare_url,
}
end
def branch_is_default(commit, repository)
repository.default_branch == commit.branch
end
end
end
end

1
spec/unit/api/v2/http/build_spec.rb
View File

@ -29,6 +29,7 @@ describe Travis::Api::V2::Http::Build do
'id' => 1,
'sha' => '62aae5f70ceee39123ef',
'branch' => 'master',
'branch_is_default' => true,
'message' => 'the commit message',
'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
'committed_at' => json_format_time(Time.now.utc - 1.hour),

1
spec/unit/api/v2/http/job_spec.rb
View File

@ -31,6 +31,7 @@ describe Travis::Api::V2::Http::Job do
'sha' => '62aae5f70ceee39123ef',
'message' => 'the commit message',
'branch' => 'master',
'branch_is_default' => true,
'message' => 'the commit message',
'committed_at' => json_format_time(Time.now.utc - 1.hour),
'committer_name' => 'Sven Fuchs',