Skip to content

Commit dfb00dd

Browse files
committed
Merge branch 'versions-improvements' into 3.x
2 parents a8838f9 + dbf9a90 commit dfb00dd

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ eval "$(rbenv init -)"
2525

2626
pushd java-buildpack
2727
bundle install --quiet
28-
bundle exec rake versions:pivotal_network
28+
bundle exec rake versions:json
2929
popd
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ caches:
2727
- path: gems
2828

2929
run:
30-
path: java-buildpack/ci/versions-pivotal-network.sh
30+
path: java-buildpack/ci/versions-json.sh

rakelib/versions_task.rb

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
require 'java_buildpack/repository/version_resolver'
2020
require 'java_buildpack/util/configuration_utils'
2121
require 'java_buildpack/util/cache/download_cache'
22+
require 'json'
2223
require 'rake/tasklib'
2324
require 'rakelib/package'
2425
require 'terminal-table'
@@ -35,8 +36,8 @@ def initialize
3536
version_task
3637

3738
namespace 'versions' do
39+
version_json_task
3840
version_markdown_task
39-
version_pivotal_network_task
4041
version_yaml_task
4142
end
4243
end
@@ -221,21 +222,24 @@ def version_task
221222
end
222223
end
223224

224-
def version_markdown_task
225-
desc 'Display the versions of buildpack dependencies in Markdown form'
226-
task markdown: [] do
227-
versions['dependencies']
225+
def version_json_task
226+
desc 'Display the versions of buildpack dependencies in JSON form'
227+
task json: [] do
228+
puts JSON.pretty_generate(versions['dependencies']
228229
.sort_by { |dependency| dependency['name'].downcase }
229-
.each { |dependency| puts "| #{dependency['name']} | `#{dependency['version']}` |" }
230+
.map { |dependency| "#{dependency['name']} #{dependency['version']}" })
230231
end
231232
end
232233

233-
def version_pivotal_network_task
234-
desc 'Display the versions of buildpack dependencies in Pivotal Network form'
235-
task pivotal_network: [] do
234+
def version_markdown_task
235+
desc 'Display the versions of buildpack dependencies in Markdown form'
236+
task markdown: [] do
237+
puts '| Dependency | Version |'
238+
puts '| ---------- | ------- |'
239+
236240
versions['dependencies']
237241
.sort_by { |dependency| dependency['name'].downcase }
238-
.each { |dependency| puts "#{dependency['name']} #{dependency['version']}" }
242+
.each { |dependency| puts "| #{dependency['name']} | `#{dependency['version']}` |" }
239243
end
240244
end
241245

0 commit comments

Comments
 (0)