Merge branch 'cgfrost-master'

[resolves #58]

Author: nebhale

bin/detect

@@ -30,5 +30,6 @@ end.compact
 if components.empty?
   abort
 else
-  puts components.join(' ')
+  str = components.join(' ')
+  puts str.length > 255 ? str.slice(0..251) + '...' : str
 end

spec/bin/detect_spec.rb

@@ -23,12 +23,27 @@
   it 'should return zero if success',
      app_fixture: 'integration_valid' do
 
-    run("bin/detect #{app_dir}") { |status| expect(status).to be_success }
+    run("bin/detect #{app_dir}") do |status|
+      expect(status).to be_success
+      expect(stdout.string.rstrip.length).to be < 255
+    end
   end
 
   it 'should fail to detect when no containers detect' do
     run("bin/detect #{app_dir}") do |status|
       expect(status).not_to be_success
+      expect(stdout.string).to be_empty
+    end
+  end
+
+  it 'should truncate long detect strings',
+     app_fixture: 'integration_valid',
+     buildpack_fixture: 'integration_long_detect_tag' do
+
+    run("bin/detect #{app_dir}") do |status|
+      expect(status).to be_success
+      expect(stdout.string.rstrip.length).to eq 255
+      expect(stdout.string.rstrip).to end_with '...'
     end
   end
 

spec/fixtures/integration_long_detect_tag/config/components.yml

@@ -0,0 +1,27 @@
+# Cloud Foundry Java Buildpack
+# Copyright (c) 2013 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.
+
+# Configuration for components to use in the buildpack
+---
+containers:
+  - "JavaBuildpack::Container::LongDetectTags"
+
+# In order to use Oracle JREs instead of OpenJDK, you must comment out the OpenJDK line and uncomment the Oracle line.
+# Please see the documentation for more detail.
+jres:
+  - "JavaBuildpack::Jre::OpenJdkJRE"
+# - "JavaBuildpack::Jre::OracleJRE"
+
+frameworks: []

spec/fixtures/integration_long_detect_tag/lib/java_buildpack/container/long_detect_tags.rb

@@ -0,0 +1,42 @@
+# Encoding: utf-8
+# Cloud Foundry Java Buildpack
+# Copyright 2013 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.
+
+require 'java_buildpack/component/base_component'
+require 'java_buildpack/container'
+
+module JavaBuildpack
+  module Container
+
+    # Encapsulates the functionality for contributing really long detect tags.
+    class LongDetectTags < JavaBuildpack::Component::BaseComponent
+
+      # (see JavaBuildpack::Component::BaseComponent#detect)
+      def detect
+        [[].fill(0, 300) { 'A' }.join]
+      end
+
+      # (see JavaBuildpack::Component::BaseComponent#compile)
+      def compile
+      end
+
+      # (see JavaBuildpack::Component::BaseComponent#release)
+      def release
+      end
+
+    end
+
+  end
+end

spec/integration_helper.rb

@@ -25,8 +25,25 @@
   include_context 'console_helper'
   include_context 'logging_helper'
 
+  let(:buildpack_dir) { Pathname.new Dir.mktmpdir }
+
+  before do
+    FileUtils.mkdir_p buildpack_dir
+  end
+
+  before do |example|
+    %w(bin config lib resources).each { |dir| FileUtils.cp_r dir, buildpack_dir }
+
+    buildpack_fixture = example.metadata[:buildpack_fixture]
+    FileUtils.cp_r "spec/fixtures/#{buildpack_fixture.chomp}/.", buildpack_dir if buildpack_fixture
+  end
+
+  after do
+    FileUtils.rm_rf buildpack_dir
+  end
+
   def run(command)
-    Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
+    Open3.popen3(command, chdir: buildpack_dir) do |_stdin, stdout, stderr, wait_thr|
       capture_output stdout, stderr
       yield wait_thr.value if block_given?
     end