guard-coffeescript 0.2.3 → 0.2.4

data/README.md

@@ -77,20 +77,20 @@ In addition to the standard configuration, this Guard has a short notation for c
 directory. This notation creates a watcher from the `:input` parameter that matches all CoffeeScript files under the given directory
 and you don't have to specify a watch regular expression.
 
-### Standard ruby gem
+### Standard Ruby gem
 
     guard 'coffeescript', :input => 'coffeescripts', :output => 'javascripts'
 
-### Rails app
+### Rails 3.1 app
 
-    guard 'coffeescript', :input => 'app/coffeescripts', :output => 'public/javascripts/compiled'
+    guard 'coffeescript', :input => 'app/assets/javascripts'
 
 ## Options
 
 There following options can be passed to Guard::CoffeeScript:
 
     :input => 'coffeescripts'           # Relative path to the input directory, default: nil
-    :output => 'javascripts'            # Relative path to the output directory, default: nil
+    :output => 'javascripts'            # Relative path to the output directory, default: input directory
     :bare => true                       # Compile without the top-level function wrapper, default: false
     :shallow => true                    # Do not create nested output directories, default: false
     :hide_success => true               # Disable successful compilation messages, default: false

data/lib/guard/coffeescript.rb

@@ -11,13 +11,18 @@ module Guard
 
     def initialize(watchers = [], options = {})
       watchers = [] if !watchers
-      watchers << ::Guard::Watcher.new(%r{#{ options.delete(:input) }/(.+\.coffee)}) if options[:input]
-
-      super(watchers, {
+      defaults = {
           :bare => false,
           :shallow => false,
           :hide_success => false,
-      }.merge(options))
+      }
+
+      if options[:input]
+        defaults.merge!({ :output => options[:input] })
+        watchers << ::Guard::Watcher.new(%r{#{ options.delete(:input) }/(.+\.coffee)})
+      end
+
+      super(watchers, defaults.merge(options))
     end
 
     def run_all

data/lib/guard/coffeescript.rbc

@@ -308,7 +308,7 @@ x
 10
 initialize
 i
-165
+197
 23
 0
 10
@@ -344,147 +344,179 @@ i
 19
 0
 15
-20
+44
+43
+0
+4
+3
+49
 1
+1
+13
+7
+2
+3
+49
+3
+2
+15
+13
 7
+4
+3
+49
+3
 2
+15
+13
+7
+5
+3
 49
 3
+2
+15
+19
+2
+15
+20
+1
+7
+6
+49
+7
+1
+9
+181
+20
+2
+44
+43
+0
+79
+49
+1
+1
+13
+7
+8
+20
+1
+7
+6
+49
+7
 1
+49
+3
+2
+15
+49
 9
-119
+1
+15
 20
 0
 44
 43
-4
+10
 43
-5
+11
 13
 71
-6
+12
 47
 9
-90
+152
 47
 49
-7
+13
 0
 13
 44
 43
-8
+14
 20
 1
 7
-2
+6
 49
-9
+15
 1
 47
 101
-10
+16
 7
-11
+17
 63
 2
 78
 49
-6
+12
 2
 47
 49
-12
+18
 1
 15
 8
-114
+176
 44
 43
-8
+14
 20
 1
 7
-2
+6
 49
-9
+15
 1
 47
 101
-10
+16
 7
-11
+17
 63
 2
 78
 49
-6
+12
 2
 49
-6
+12
 1
 49
-13
+19
 1
 8
-120
+182
 1
 15
 20
 0
-44
-43
-0
-4
-3
-49
-1
-1
-13
-7
-14
-3
-49
-15
-2
-15
-13
-7
-16
-3
-49
-15
-2
-15
-13
-7
-17
-3
-49
-15
+20
 2
-15
 20
 1
 49
-18
+20
 1
 54
 52
-12
+18
 2
 11
 I
-8
+9
 I
-2
+3
 I
 0
 I
 2
 n
 p
-19
+21
 x
 4
 Hash
@@ -492,12 +524,30 @@ x
 16
 new_from_literal
 x
+4
+bare
+x
+3
+[]=
+x
+7
+shallow
+x
+12
+hide_success
+x
 5
 input
 x
 2
 []
 x
+6
+output
+x
+6
+merge!
+x
 5
 Guard
 x
@@ -528,22 +578,10 @@ x
 2
 <<
 x
-4
-bare
-x
-3
-[]=
-x
-7
-shallow
-x
-12
-hide_success
-x
 5
 merge
 p
-19
+25
 I
 -1
 I
@@ -555,38 +593,50 @@ d
 I
 23
 I
-e
+12
 I
-79
+2c
 I
-10
+f
 I
-7b
+34
 I
-14
+10
 I
-84
+3c
 I
 11
 I
-8c
+43
+I
+e
 I
-12
+46
 I
-94
+14
 I
-13
+4f
+I
+15
 I
-9b
+6a
+I
+16
+I
+b5
 I
 14
 I
-a5
+b7
+I
+19
+I
+c5
 x
 70
 /Users/michi/Repositories/guard-coffeescript/lib/guard/coffeescript.rb
 p
-2
+3
 x
 8
 watchers
@@ -594,6 +644,9 @@ x
 7
 options
 x
+8
+defaults
+x
 17
 method_visibility
 x
@@ -688,11 +741,11 @@ p
 I
 -1
 I
-17
+1c
 I
 0
 I
-18
+1d
 I
 1f
 x
@@ -782,15 +835,15 @@ p
 I
 -1
 I
-1b
+20
 I
 0
 I
-1c
+21
 I
 17
 I
-1d
+22
 I
 1f
 x
@@ -927,15 +980,15 @@ p
 I
 0
 I
-23
+28
 I
 4
 I
-24
+29
 I
 12
 I
-25
+2a
 I
 24
 x
@@ -957,11 +1010,11 @@ p
 I
 -1
 I
-22
+27
 I
 0
 I
-23
+28
 I
 c
 x
@@ -993,19 +1046,19 @@ c
 I
 31
 I
-17
+1c
 I
 3f
 I
-1b
+20
 I
 4d
 I
-20
+25
 I
 51
 I
-22
+27
 I
 5f
 x

data/lib/guard/coffeescript/runner.rb

@@ -49,7 +49,7 @@ module Guard
 
         def process_compile_result(content, file, directory)
           FileUtils.mkdir_p(File.expand_path(directory)) if !File.directory?(directory)
-          filename = File.join(directory, File.basename(file.gsub(/coffee$/, 'js')))
+          filename = File.join(directory, File.basename(file.gsub(/(js\.coffee|coffee)$/, 'js')))
           File.open(File.expand_path(filename), 'w') { |f| f.write(content) }
 
           filename

data/lib/guard/coffeescript/runner.rbc

@@ -1418,8 +1418,8 @@ x
 6
 Regexp
 s
-7
-coffee$
+20
+(js\.coffee|coffee)$
 x
 3
 new

data/lib/guard/coffeescript/templates/Guardfile

@@ -1 +1 @@
-guard 'coffeescript', :input => 'app/coffeescripts', :output => 'public/javascripts/compiled'
+guard 'coffeescript', :input => 'app/assets/javascripts'

data/lib/guard/coffeescript/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module CoffeeScriptVersion
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: guard-coffeescript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Michael Kessler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +02:00
+date: 2011-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency