Allow hidden remote git url

This commit avoids displaying the characters | and # during buildpack
detect if there is no remote git url value to be displayed. The remote
git url isn't displayed when the version.yml is configured to hide the
url by setting the hash and remote values to be an empty string

[resolves #99]

Author: Sinee Paungam

lib/java_buildpack/buildpack_version.rb

@@ -1,6 +1,6 @@
 # Encoding: utf-8
 # Cloud Foundry Java Buildpack
-# Copyright 2013 the original author or authors.
+# Copyright 2013-2015 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.
@@ -86,10 +86,13 @@ def to_s(human_readable = true)
       s = []
       s << @version 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?
 
+      if remote_string
+        s << '|' if @version && human_readable
+        s << remote_string
+      end
+
+      s << 'unknown' if s.empty?
       s.join(human_readable ? ' ' : '-')
     end
 
@@ -99,6 +102,10 @@ def to_s(human_readable = true)
 
     private_constant :GIT_DIR
 
+    def remote_string
+      "#{@remote}##{@hash}" if @remote && !@remote.empty? && @hash && !@hash.empty?
+    end
+
     def git(command)
       `git --git-dir=#{GIT_DIR} #{command}`.chomp if git? && git_dir?
     end

spec/java_buildpack/buildpack_version_spec.rb

@@ -1,6 +1,6 @@
 # Encoding: utf-8
 # Cloud Foundry Java Buildpack
-# Copyright 2013 the original author or authors.
+# Copyright 2013-2015 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.
@@ -96,6 +96,28 @@
     expect(buildpack_version.to_hash).to eq({})
   end
 
+  it 'excludes remote string when remote and hash values from config/version.yml are empty',
+     configuration: { 'hash' => '', 'remote' => '', 'version' => 'test-version' } do
+    expect(buildpack_version.to_s).to eq('test-version')
+  end
+
+  it 'includes remote string when remote and hash values from config/version.yml are missing',
+     configuration: { 'version' => 'test-version' } do
+
+    git_dir = Pathname.new('.git').expand_path
+    allow_any_instance_of(described_class).to receive(:system)
+                                              .with('which git > /dev/null')
+                                              .and_return(true)
+    allow_any_instance_of(described_class).to receive(:`)
+                                              .with("git --git-dir=#{git_dir} rev-parse --short HEAD")
+                                              .and_return('test-hash')
+    allow_any_instance_of(described_class).to receive(:`)
+                                              .with("git --git-dir=#{git_dir} config --get remote.origin.url")
+                                              .and_return('test-remote')
+
+    expect(buildpack_version.to_s).to eq('test-version | test-remote#test-hash')
+  end
+
   context do
 
     let(:environment) { { 'OFFLINE' => 'true' } }