Merge 53781773-groovy-detection-fix to master

Glyn Normington · Glyn Normington · commit 4b80a4d1cfdf · 2013-07-22T16:07:45.000+01:00
[Completes #53781773]
diff --git a/lib/java_buildpack/container/groovy.rb b/lib/java_buildpack/container/groovy.rb
@@ -128,7 +128,7 @@ def self.find_groovy(app_dir, configuration)
 
     def self.groovy_files(root)
       root_directory = Pathname.new(root)
-      Dir[File.join root, GROOVY_FILE_PATTERN] .map { |file| Pathname.new(file).relative_path_from(root_directory).to_s }
+      Dir[File.join root, GROOVY_FILE_PATTERN] .reject{ |file| File.directory? file } .map { |file| Pathname.new(file).relative_path_from(root_directory).to_s }
     end
 
     def groovy_home
diff --git a/spec/fixtures/dot_groovy/x/y.groovy/.gitignore b/spec/fixtures/dot_groovy/x/y.groovy/.gitignore
diff --git a/spec/java_buildpack/container/groovy_spec.rb b/spec/java_buildpack/container/groovy_spec.rb
@@ -41,6 +41,16 @@ module JavaBuildpack::Container
       expect(detected).to be_nil
     end
 
+    it 'should not detect a .groovy directory' do
+      JavaBuildpack::Repository::ConfiguredItem.stub(:find_item) { |&block| block.call(VERSION) if block }
+      .and_return(DETAILS)
+      detected = Groovy.new(
+          :app_dir => 'spec/fixtures/dot_groovy',
+          :configuration => {}).detect
+
+      expect(detected).to be_nil
+    end
+
     it 'should detect a single Groovy file' do
       JavaBuildpack::Repository::ConfiguredItem.stub(:find_item) { |&block| block.call(VERSION) if block }
         .and_return(DETAILS)
