sidekick 0.6.5 → 0.7.0

data/.sidekick

@@ -13,5 +13,7 @@ auto_compile 'test/fixtures/*.sass', 'test/output/:name.css'
 
 auto_compile 'test/fixtures/*.coffee', 'test/output/:name.js'
 
+auto_compress 'test/output/package.js', 'test/output/site.js'
+
 
 # vim:ft=ruby

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.7.0

data/lib/sidekick/actions/compile.rb

@@ -2,21 +2,42 @@
 
 module Sidekick::Actions::Compile
 
-  # Compiles one template using the `tilt` gem.
+  # write a file to disk
+  def write_file(path, data)
+    File.open(path, 'w') {|f| f.write(data) }
+  end
 
+  # Compile a template using the `tilt` gem.
   def compile(source, target)
     needs 'tilt', 'to compile templates'
     handling Exception, source do
-      File.open(target, 'w') do |f|
-        f.write(Tilt.new(source).render)
+      write_file target, Tilt.new(source).render
+    end
+  end
+
+  # compress a file using a suitable compressor for that
+  # file type.
+  def compress(source, target, opts={})
+    handling Exception, source do
+      case fmt = source.match(/\.[^\.]+$/).to_s
+        when '.js'
+          needs 'uglifier', 'to compress javascript'
+          write_file target, Uglifier.new(opts).compile(File.read(source))
+        else raise "Does not know how to compress #{fmt} files."
       end
     end
   end
 
+  # Concatenate a bunch of files, preserving order
+  def concat(target, *sources)
+    write_file target, sources.map {|p| File.read(p) }.join("\n")
+  end
+
 
-  # watches for changes matching the `source` glob, and compiles to `target`, replacing ':name' in `target` with the basename of the changed file.
+  # watches for changes matching the `source` glob, and compiles to
+  # `target`, replacing ':name' in `target` with the basename of the
+  # changed file.
   def auto_compile(source, target)
-
     watch(source) do |files|
       files.each do |file|
         if File.exists?(file)
@@ -28,4 +49,20 @@ module Sidekick::Actions::Compile
     end
   end
 
+
+
+  # Watch for changes to several source files, concatenating to `target_base.concat.type`
+  # and then compressing as per file type.
+  def auto_compress(target, *sources)
+    fmt      = target.match(/\.[^\.]+$/).to_s
+    cat_path = target.sub(/#{fmt}$/, '.concat' + fmt)
+
+    watch(*sources) do |files|
+      concat(cat_path, *sources)
+      compress(cat_path, target)
+      log "compress => #{target}"
+    end
+  end
+
+
 end

data/lib/sidekick/actions/triggers.rb

@@ -3,12 +3,12 @@
 module Sidekick::Actions::Triggers
 
 
-  def watch(glob)
+  def watch(*globs)
     needs 'em-dir-watcher', 'to watch file changes'
 
     EMDirWatcher.watch(
       File.expand_path('.'),
-      :include_only => [glob],
+      :include_only => globs,
       :grace_period => 0.2
       ) do |paths|
       log_trigger "watch #{paths.inspect}"

data/lib/sidekick/template

@@ -22,6 +22,11 @@ stop "File generated. Now please fill it in."
 # auto_compile 'assets/css/*.sass', 'public/css/:name.css'
 # auto_compile 'assets/js/*.coffee', 'public/js/:name.js'
 
+# auto_compress( 'public/package.js',
+#   'public/vendor/jquery.js',
+#   'public/js/*.js'
+#   )
+
 # passenger_server 3002
 
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jostein Berre Eliassen,
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: sidekick
 dependencies: 
 - !ruby/object:Gem::Dependency