fix broken tests

1) mtime was not being modified when `--force` was set on command line
This has now been fixed - the force option now overrides Jammit's mtime
niceties

2) newlines for JSTs were improperly described in the tests - the JS
file, including templates and the JST definition, have all literal
newlines stripped, but newlines inside of strings (in the templates
themselves) are not stripped. Since calling jammit on the CLI treats the
whole output as a JS file, the fixture for the `pack_templates` unit
test was not appropriate for the CLI test

Author: alunny

lib/jammit/command_line.rb

@@ -81,4 +81,4 @@ def parse_options
 
   end
 
-end
+end

lib/jammit/dependencies.rb

@@ -49,6 +49,7 @@
 # Jammit Core:
 require 'jsmin'
 require 'cssmin'
+require 'jammit/version'
 require 'jammit/jsmin_compressor'
 require 'jammit/cssmin_compressor'
 require 'jammit/compressor'

lib/jammit/packager.rb

@@ -33,14 +33,21 @@ def initialize
     # changed since their last package build.
     def precache_all(output_dir=nil, base_url=nil)
       output_dir ||= File.join(Jammit.public_root, Jammit.package_path)
-      cacheable(:js, output_dir).each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
+
+      mtime = @force ? Time.now : nil
+
+      cacheable(:js, output_dir).each do |p|
+        cache(p, 'js', pack_javascripts(p), output_dir, nil, mtime)
+      end
+
       cacheable(:css, output_dir).each do |p|
-        cache(p, 'css', pack_stylesheets(p), output_dir)
+        cache(p, 'css', pack_stylesheets(p), output_dir, nil, mtime)
+
         if Jammit.embed_assets
-          cache(p, 'css', pack_stylesheets(p, :datauri), output_dir, :datauri)
+          cache(p, 'css', pack_stylesheets(p, :datauri), output_dir, :datauri, mtime)
           if Jammit.mhtml_enabled
             raise MissingConfiguration, "A --base-url option is required in order to generate MHTML." unless base_url
-            mtime = latest_mtime package_for(p, :css)[:paths]
+            mtime = latest_mtime package_for(p, :css)[:paths] unless @force
             asset_url = "#{base_url}#{Jammit.asset_url(p, :css, :mhtml, mtime)}"
             cache(p, 'css', pack_stylesheets(p, :mhtml, asset_url), output_dir, :mhtml, mtime)
           end

test/fixtures/jammed/jst_test_from_cli.js

@@ -28,7 +28,7 @@ def test_jammit_precaching
       File.read('test/fixtures/jammed/css_test-datauri.css')
 
     assert_equal zlib_read('test/precache/jst_test.js.gz'),
-      File.read('test/fixtures/jammed/jst_test.js')
+      File.read('test/fixtures/jammed/jst_test_from_cli.js')
 
     assert_equal zlib_read('test/precache/js_test_with_templates.js.gz'),
       File.read('test/fixtures/jammed/js_test_with_templates.js')
@@ -41,7 +41,9 @@ def test_lazy_precaching
     system("#{ JAMMIT } -c test/config/assets.yml -o test/precache -u http://www.example.com")
     assert_equal File.mtime(PRECACHED_FILES.first), mtime
     system("#{ JAMMIT } -c test/config/assets.yml -o test/precache -u http://www.example.com --force")
-    assert File.mtime(PRECACHED_FILES.first) > mtime
+    new_mtime = File.mtime(PRECACHED_FILES.first)
+    assert new_mtime > mtime,
+      "#{ PRECACHED_FILES.first } mtime - #{ new_mtime } - greater than #{ mtime }"
   end
 
   def zlib_read(filename)