Bug and CodeClimate fixes

nebhale · nebhale · commit 3affa05fb3de · 2013-12-13T12:47:17.000Z
Some bugs have cropped up when running on Travis.  These changes fix
some of those bugs and eliminate some duplication highlighted by
CodeClimate.

[#61738342]
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 ---
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.0.0-p353
+  - 1.9.3-p484
 before_script: "if [[ $TRAVIS_RUBY_VERSION != '1.9.3' || $TRAVIS_SECURE_ENV_VARS != 'true' ]]; then unset CODECLIMATE_REPO_TOKEN; fi"
 install: bundle install --deployment --without debug
 notifications:
diff --git a/lib/java_buildpack/util/play/base.rb b/lib/java_buildpack/util/play/base.rb
@@ -73,6 +73,14 @@ def augment_classpath
       fail "Method 'augment_classpath' must be defined"
     end
 
+    # Find the single directory in the root of the droplet
+    #
+    # @return [Pathname, nil] the single directory in the root of the droplet, otherwise +nil+
+    def find_single_directory
+      roots = (@droplet.root + '*').glob.select { |child| child.directory? }
+      roots.size == 1 ? roots.first : nil
+    end
+
     # Returns the +JAVA_OPTS+ in the form that they need to be added to the command line
     #
     # @return [Array<String>] the +JAVA_OPTS+ in the form that they need to be added to the command line
diff --git a/lib/java_buildpack/util/play/post22.rb b/lib/java_buildpack/util/play/post22.rb
@@ -25,7 +25,7 @@ class Post22 < Base
     protected
 
     def augment_classpath
-      additional_classpath = @droplet.additional_libraries.map do |additional_library|
+      additional_classpath = @droplet.additional_libraries.sort.map do |additional_library|
         "$app_home/#{additional_library.relative_path_from(start_script.dirname)}"
       end
 
diff --git a/lib/java_buildpack/util/play/post22_dist.rb b/lib/java_buildpack/util/play/post22_dist.rb
@@ -23,10 +23,7 @@ class Post22Dist < Post22
 
     protected
 
-    def root
-      roots = (@droplet.root + '*').glob.select { |child| child.directory? }
-      roots.size == 1 ? roots.first : nil
-    end
+    alias_method :root, :find_single_directory
 
   end
 
diff --git a/lib/java_buildpack/util/play/pre22_dist.rb b/lib/java_buildpack/util/play/pre22_dist.rb
@@ -43,10 +43,7 @@ def lib_dir
       root + 'lib'
     end
 
-    def root
-      roots = (@droplet.root + '*').glob.select { |child| child.directory? }
-      roots.size == 1 ? roots.first : nil
-    end
+    alias_method :root, :find_single_directory
 
   end
 
