bonethug 0.0.76 → 0.0.77

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.76"
-          BUILD_DATE = "2014-04-05 12:22:32 +1300"
+          VERSION = "0.0.77"
+          BUILD_DATE = "2014-04-05 13:22:33 +1300"
         end
       

data/lib/bonethug/watcher.rb

@@ -58,7 +58,7 @@ module Bonethug
       concat_js = []
       if js_concats = conf.get('watch.concat_js')
         js_concats.each do |index, watch|
-          concat_js.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :concat_js)
+          concat_js.push(src: watch.get('src'), dest: watch.get('dest'), filter: watch.get('filter','Array'), type: :concat_js)
         end
       end
 
@@ -66,7 +66,7 @@ module Bonethug
       concat_css = []
       if css_concats = conf.get('watch.concat_css')
         css_concats.each do |index, watch|
-          concat_css.push(src: watch.get('src','Array'), dest: watch.get('dest'), filter: watch.get('filter'), type: :concat_css)
+          concat_css.push(src: watch.get('src'), dest: watch.get('dest'), filter: watch.get('filter','Array'), type: :concat_css)
         end
       end
 
@@ -95,7 +95,7 @@ module Bonethug
       end
 
       # combine the watches
-      watches = coffee + sass + uglify + erb + slim
+      watches = coffee + sass + concat_js + concat_css + uglify + erb + slim
 
       # Generate Guardfile
       puts 'Generating Guardfile...'
@@ -110,11 +110,17 @@ module Bonethug
           watch_val = "'#{watch[:filter]}'"
         when 'Regexp'
           watch_val = watch[:filter].inspect
+        when 'Array'
+          watch_val = "%w(#{watch[:filter].join(' ')})"
         else
           raise "invalid filter type: " + watch[:filter].class.name
         end
 
-        filter = watch[:filter] ? "watch #{watch_val}" : ""
+        if watch[:filter].class.name == 'Array'
+          filter = watch_val
+        else
+          filter = watch[:filter] ? "watch #{watch_val}" : ""
+        end
 
         case type
         when 'sprockets'
@@ -138,11 +144,11 @@ module Bonethug
             "
           elsif watch[:type] == :concat_css
             guardfile_content += "
-              guard :concat, :output => '#{watch[:dest]}', :input_dir => #{watch[:src].to_s}, :type => 'css', :files => #{watch[:filter]}
+              guard :concat, :output => '#{watch[:dest]}', :input_dir => '#{watch[:src]}', :type => 'css', :files => #{filter}
             "
           elsif watch[:type] == :concat_js
             guardfile_content += "
-              guard :concat, :output => '#{watch[:dest]}', :input_dir => #{watch[:src].to_s}, :type => 'js', :files => #{watch[:filter]}
+              guard :concat, :output => '#{watch[:dest]}', :input_dir => '#{watch[:src]}', :type => 'js', :files => #{filter}
             "
           elsif watch[:type] == :uglify
             guardfile_content += "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.76
+  version: 0.0.77
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -556,7 +556,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 737569970789649436
+      hash: 964366539695014773
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -565,7 +565,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 737569970789649436
+      hash: 964366539695014773
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23