Include Java Buildpack version in detect output

nebhale · nebhale · commit 0909e8a74f8f · 2014-03-28T13:27:11.000Z
This change adds the version of the Java Buildpack to the output of
the detect command in the case that the buildpack is going to return
truthy.

[#68436710]
diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb
@@ -43,7 +43,8 @@ def detect
       tags = tag_detection('container', @containers, true)
       tags.concat tag_detection('JRE', @jres, true) unless tags.empty?
       tags.concat tag_detection('framework', @frameworks, false) unless tags.empty?
-      tags = tags.flatten.compact
+      tags << "java-buildpack=#{@buildpack_version.to_s false}" unless tags.empty?
+      tags = tags.flatten.compact.sort
 
       @logger.debug { "Detection Tags: #{tags}" }
       tags
diff --git a/lib/java_buildpack/buildpack_version.rb b/lib/java_buildpack/buildpack_version.rb
@@ -45,15 +45,18 @@ def initialize
     # +abcde | https://github.com/cloudfoundry/java-buildpack.git#abcde+ (default version number, online buildpack)
     # +https://github.com/cloudfoundry/java-buildpack#12345+ (cloned buildpack)
     # +unknown+ (un-packaged, un-cloned)
-    def to_s
+    #
+    # @param [Boolean] human_readable whether the output should be human readable or machine readable
+    # @return [String] a +String+ representation of the version
+    def to_s(human_readable = true)
       s = []
       s << @version if @version
-      s << '(offline)' if @offline
-      s << '|' if @version
+      s << (human_readable ? '(offline)' : 'offline') if @offline
+      s << '|' if @version && human_readable
       s << "#{@remote}##{@hash}" if @remote && @hash
       s << 'unknown' if s.empty?
 
-      s.join ' '
+      s.join(human_readable ? ' ' : '-')
     end
 
     private
diff --git a/spec/java_buildpack/buildpack_version_spec.rb b/spec/java_buildpack/buildpack_version_spec.rb
@@ -35,6 +35,7 @@
                       'remote' => 'test-remote', 'version' => 'test-version' } do
 
     expect(buildpack_version.to_s).to match(/test-version (offline) | test-remote#test-hash/)
+    expect(buildpack_version.to_s(false)).to match(/test-version-offline-test-remote#test-hash/)
     expect(stderr.string).to match(/test-version (offline) | test-remote#test-hash/)
   end
 
@@ -44,6 +45,7 @@
                       'remote' => 'test-remote', 'version' => 'test-version' } do
 
     expect(buildpack_version.to_s).to match(/test-version | test-remote#test-hash/)
+    expect(buildpack_version.to_s(false)).to match(/test-version-test-remote#test-hash/)
     expect(stderr.string).to match(/test-version | test-remote#test-hash/)
   end
 
@@ -63,6 +65,7 @@
                                               .and_return('test-remote')
 
     expect(buildpack_version.to_s).to match(/test-remote#test-hash/)
+    expect(buildpack_version.to_s(false)).to match(/test-remote#test-hash/)
     expect(stderr.string).to match(/test-remote#test-hash/)
   end
 
@@ -72,6 +75,7 @@
     allow_any_instance_of(described_class).to receive(:system).with('which git > /dev/null').and_return(false)
 
     expect(buildpack_version.to_s).to match(/unknown/)
+    expect(buildpack_version.to_s(false)).to match(/unknown/)
     expect(stderr.string).to match(/unknown/)
   end
 
