Merge pull request #105 from fredericksgary/master

Pick executables deterministically and warn when doing so
jruby · Jan 31, 2013 · e5e41e8 · e5e41e8
2 parents 7a7b62b + d2fbbdb
commit e5e41e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/warbler/traits/gemspec.rb b/lib/warbler/traits/gemspec.rb
@@ -49,7 +49,7 @@ def default_executable
         if !@spec.executables.empty?
           "bin/#{@spec.executables.first}"
         else
-          exe = Dir['bin/*'].first
+          exe = Dir['bin/*'].sort.first
           raise "No executable script found" unless exe
           warn "No default executable found in #{@spec_file}, using #{exe}"
           exe

diff --git a/lib/warbler/traits/nogemspec.rb b/lib/warbler/traits/nogemspec.rb
@@ -33,8 +33,13 @@ def update_archive(jar)
       end
 
       def default_executable
-        exes = Dir['bin/*']
-        exe = exes.grep(/#{config.jar_name}/).first || exes.first
+        exes = Dir['bin/*'].sort
+        unless(exe = exes.grep(/#{config.jar_name}/).first)
+          exe = exes.first
+          if exe
+            warn "No executable matching config.jar_name found, using #{exe}"
+          end
+        end
         raise "No executable script found" unless exe
         exe
       end