lib/jammit/packager.rb in jammit-ebtd-0.6.8 vs lib/jammit/packager.rb in jammit-ebtd-0.6.9
- old
+ new
@@ -103,11 +103,11 @@
# Print a warning if no files were found that match the glob.
def glob_files(glob)
absolute = Pathname.new(glob).absolute?
paths = Dir[absolute ? glob : File.join(ASSET_ROOT, glob)]
#Jammit.warn("No assets match '#{glob}'") if paths.empty?
- paths
+ paths.sort
end
# In Rails, the difference between a path and an asset URL is "public".
def path_to_url
@path_to_url ||= /\A#{Regexp.escape(ASSET_ROOT)}(\/?#{Regexp.escape(Jammit.public_root.sub(ASSET_ROOT, ''))})?/
@@ -178,10 +178,10 @@
private
def get_file_list(globs)
paths = []
globs.each do |glob|
if String === glob
- paths.concat glob_files(glob)
+ paths += glob_files(glob)
elsif Hash === glob
paths = exclude_paths(paths, glob['exclude']) if glob['exclude']
#puts exclude_paths(paths, glob['exclude']).to_s
end
end