merging package_names

Author: jashkenas

lib/jammit.rb

@@ -186,11 +186,6 @@ def self.warn(message)
     message = "Jammit Warning: #{message}"
     $stderr.puts message
   end
-  
-  def self.log(message)
-    message = "Jammit: #{message}"
-    $stdout.puts message
-  end
 
   # Clone of active_support's symbolize_keys, so that we don't have to depend
   # on active_support in any fashion. Converts a hash's keys to all symbols.

lib/jammit/command_line.rb

@@ -64,7 +64,7 @@ def parse_options
           @options[:force] = force
         end
         opts.on('-p', '--packages PACKAGE_NAMES', 'comma-separated list of packages (ex: "core,embed", default: all packages)') do |package_names|
-          @options[:package_names] = package_names.split(',').map {|n| n.to_sym }
+          @options[:package_names] = package_names.split(/,\s*/).map {|n| n.to_sym }
         end
         opts.on_tail('-v', '--version', 'display Jammit version') do
           puts "Jammit version #{Jammit::VERSION}"

lib/jammit/packager.rb

@@ -18,9 +18,9 @@ class Packager
     # Jammit.configuration. When assets.yml is being changed on the fly,
     # create a new Packager.
     def initialize
-      @compressor = Compressor.new
-      @force = false
-      @package_names = nil
+      @compressor     = Compressor.new
+      @force          = false
+      @package_names  = nil
       @config = {
         :css => (Jammit.configuration[:stylesheets] || {}),
         :js  => (Jammit.configuration[:javascripts] || {})
@@ -111,11 +111,8 @@ def glob_files(glob)
     # or whose source files have changed since the last package build.
     def cacheable(extension, output_dir)
       names = @packages[extension].keys
+      names = names.select {|n| @package_names.include? n } if @package_names
       config_mtime = File.mtime(Jammit.config_path)
-      if @package_names
-        names = names.select {|n| @package_names.include? n }
-        Jammit.log("Only packaging: #{names.inspect}")
-      end
       return names if @force
       return names.select do |name|
         pack        = package_for(name, extension)