Merge branch '3.x'

nebhale · nebhale · commit 62932dd07186 · 2017-05-31T09:44:19.000-07:00
diff --git a/ci/versions-markdown.sh b/ci/versions-markdown.sh
@@ -24,5 +24,5 @@ eval "$(rbenv init -)"
 
 pushd java-buildpack
   bundle install --quiet
-  bundle exec rake versions:json
+  bundle exec rake versions:markdown
 popd
diff --git a/ci/versions-markdown.yml b/ci/versions-markdown.yml
@@ -24,4 +24,4 @@ inputs:
 - name: java-buildpack
 
 run:
-  path: java-buildpack/ci/versions-json.sh
+  path: java-buildpack/ci/versions-markdown.sh
diff --git a/ci/versions-pivotal-network.sh b/ci/versions-pivotal-network.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Cloud Foundry Java Buildpack
+# Copyright 2013-2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+eval "$(rbenv init -)"
+
+pushd java-buildpack
+  bundle install --quiet
+  bundle exec rake versions:pivotal_network
+popd
diff --git a/ci/versions-pivotal-network.yml b/ci/versions-pivotal-network.yml
@@ -0,0 +1,27 @@
+# Cloud Foundry Java Buildpack
+# Copyright 2013-2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+platform: linux
+
+image_resource:
+  type: docker-image
+  source:
+    repository: cfje/java-buildpack
+
+inputs:
+- name: java-buildpack
+
+run:
+  path: java-buildpack/ci/versions-pivotal-network.sh
diff --git a/rakelib/versions_task.rb b/rakelib/versions_task.rb
@@ -19,7 +19,6 @@
 require 'java_buildpack/repository/version_resolver'
 require 'java_buildpack/util/configuration_utils'
 require 'java_buildpack/util/cache/download_cache'
-require 'json'
 require 'rake/tasklib'
 require 'rakelib/package'
 require 'terminal-table'
@@ -36,7 +35,8 @@ def initialize
       version_task
 
       namespace 'versions' do
-        version_json_task
+        version_markdown_task
+        version_pivotal_network_task
         version_yaml_task
       end
     end
@@ -210,20 +210,31 @@ def version(configuration, index)
     def version_task
       desc 'Display the versions of buildpack dependencies in human readable form'
       task versions: [] do
-        v    = versions
+        v = versions
 
         rows = v['dependencies']
-               .sort_by { |dependency| dependency['name'].downcase }
-               .map { |dependency| [dependency['name'], dependency['version']] }
+                 .sort_by { |dependency| dependency['name'].downcase }
+                 .map { |dependency| [dependency['name'], dependency['version']] }
 
         puts Terminal::Table.new title: "Java Buildpack #{v['buildpack']}", rows: rows
       end
     end
 
-    def version_json_task
-      desc 'Display the versions of buildpack dependencies in JSON form'
-      task json: [] do
-        puts JSON.pretty_generate(versions)
+    def version_markdown_task
+      desc 'Display the versions of buildpack dependencies in Markdown form'
+      task markdown: [] do
+        versions['dependencies']
+          .sort_by { |dependency| dependency['name'].downcase }
+          .each { |dependency| puts "| #{dependency['name']} | `#{dependency['version']}` |" }
+      end
+    end
+
+    def version_pivotal_network_task
+      desc 'Display the versions of buildpack dependencies in Pivotal Network form'
+      task pivotal_network: [] do
+        versions['dependencies']
+          .sort_by { |dependency| dependency['name'].downcase }
+          .each { |dependency| puts "#{dependency['name']} #{dependency['version']}" }
       end
     end
 
