guard-coffeescript 0.1.5 → 0.1.6

data/README.rdoc

@@ -20,11 +20,29 @@ Add guard definition to your Guardfile by running this command:
 
     guard init coffeescript
 
-== Dependencies
+== CoffeeScript
 
-Since CoffeeScripts is no more a Ruby gem it cannot be installed with Bundler, so you have to install it on your own.
-Please consult the {CoffeeScript documentation}[http://jashkenas.github.com/coffee-script/] for more information about
-how to install the latest CoffeeScript version.
+Guard::CoffeeScript uses {Ruby CoffeeScript}[http://github.com/josh/ruby-coffee-script/] to compile the CoffeeScripts.
+This enables the guard to compile the CoffeeScripts with node.js, JavaScript Core or V8
+
+=== node.js
+
+Please refer to the {CoffeeScript documentation}[http://jashkenas.github.com/coffee-script/] for more information about
+how to install the latest CoffeeScript version on node.js.
+
+=== JavaScript Core
+
+JavaScript Core is only available on Mac OS X. To use JavaScript Core you don't have to install anything, because
+JavaScript Core is packaged with Mac OS X.
+
+=== V8
+
+To use CoffeeScript on V8, simple add `therubyracer` to your Gemfile. The Ruby Racer acts as a bridge between Ruby
+and the V8 engine, that will be automatically installed by the Ruby Racer.
+
+    group :development do
+      gem 'therubyracer'
+    end
 
 == Usage
 
@@ -38,13 +56,13 @@ Please read {guard doc}[http://github.com/guard/guard#readme] for more info abou
 === Standard ruby gems
 
     guard 'coffeescript' do
-      watch('^coffeescripts/(.*)\.coffee')
+      watch(%r{coffeescripts/.+\.coffee})
     end
 
 === Rails app
 
     guard 'coffeescript', :output => 'public/javascripts/compiled' do
-      watch('^app/coffeescripts/(.*)\.coffee')
+      watch(%r{app/coffeescripts/.+\.coffee})
     end
 
 == Options
@@ -65,7 +83,7 @@ A file
 
 that has been detected by the watch
 
-    watch('^app/coffeescripts/(.*)\.coffee')
+    watch(%r{app/coffeescripts/.+\.coffee})
 
 with an output directory of
 
@@ -75,7 +93,7 @@ will be compiled to
 
     public/javascripts/compiled/ui/buttons/toggle_button.js
 
-This behaviour can be switched off by passing the option ':shallow => true' to the guard, so that all JavaScripts will
+This behaviour can be switched off by passing the option `:shallow => true` to the guard, so that all JavaScripts will
 be compiled directly to the output directory.
 
 == Development

data/lib/guard/coffeescript.rb

@@ -3,7 +3,7 @@ require 'guard/guard'
 require 'guard/watcher'
 
 module Guard
-  class CoffeeScript < Guard
+  class CoffeeScriptGuard < Guard
 
     autoload :Inspector, 'guard/coffeescript/inspector'
     autoload :Runner, 'guard/coffeescript/runner'

data/lib/guard/coffeescript/inspector.rb

@@ -1,5 +1,5 @@
 module Guard
-  class CoffeeScript
+  class CoffeeScriptGuard
     module Inspector
       class << self
 

data/lib/guard/coffeescript/runner.rb

@@ -1,5 +1,7 @@
+require 'coffee_script'
+
 module Guard
-  class CoffeeScript
+  class CoffeeScriptGuard
     module Runner
       class << self
 
@@ -9,8 +11,8 @@ module Guard
           notify_result(changed_files, errors)
 
           changed_files
-        rescue LoadError
-          ::Guard::UI.error "Command 'coffee' not found. Please install CoffeeScript."    
+        rescue CoffeeScript::EngineError => e
+          ::Guard::UI.error "CoffeeScript engine error: " + e.message
         end
 
       private
@@ -27,9 +29,14 @@ module Guard
 
           directories.each do |directory, scripts|
             scripts.each do |file|
-              content, success = compile(file, options)
-              changed_file = process_compile_result(content, file, directory, errors, success)
-              changed_files << changed_file
+              begin
+                content = compile(file, options)
+                changed_files << process_compile_result(content, file, directory)
+              rescue CoffeeScript::CompilationError => e
+                error_message = file + ': ' + e.message
+                errors << error_message
+                ::Guard::UI.error(error_message)
+              end
             end
           end
 
@@ -37,23 +44,15 @@ module Guard
         end
 
         def compile(file, options)
-          content = Compiler.compile(File.open(file), options)
-          [content, $?.success?]
+          CoffeeScript.compile(File.read(file), options)
         end
 
-        def process_compile_result(content, file, directory, errors, success)
-          if success
-            FileUtils.mkdir_p(File.expand_path(directory)) if !File.directory?(directory)
-            filename = File.join(directory, File.basename(file.gsub(/coffee$/, 'js')))
-            File.open(File.expand_path(filename), 'w') { |f| f.write(content) }
+        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')))
+          File.open(File.expand_path(filename), 'w') { |f| f.write(content) }
 
-            filename
-          else
-            errors << file + ': ' + content.split("\n").select { |line| line =~ /^Error:/ }.join("\n")
-            ::Guard::UI.error(content)
-
-            nil
-          end
+          filename
         end
 
         def detect_nested_directories(watchers, files, options)
@@ -63,7 +62,7 @@ module Guard
 
           watchers.product(files).each do |watcher, file|
             if matches = file.match(watcher.pattern)
-              target = File.join(options[:output], File.dirname(matches[1])).gsub(/\/\.$/, '')
+              target = matches[1] ? File.join(options[:output], File.dirname(matches[1])).gsub(/\/\.$/, '') : options[:output]
               if directories[target]
                 directories[target] << file
               else

data/lib/guard/coffeescript/templates/Guardfile

@@ -1,3 +1,3 @@
 guard 'coffeescript', :output => 'public/javascripts/compiled' do
-  watch('^app/coffeescripts/(.*)\.coffee')
+  watch(%r{app/coffeescripts/.+\.coffee})
 end

data/lib/guard/coffeescript/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module CoffeeScriptVersion
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: guard-coffeescript
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Michael Kessler
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +01:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -35,35 +33,33 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: coffee-script
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
-        - 1
-        - 0
         - 2
-        version: 1.0.2
-  type: :development
+        - 1
+        - 1
+        version: 2.1.1
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 2
-        - 0
         - 1
-        version: 2.0.1
+        - 0
+        - 7
+        version: 1.0.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,14 +70,28 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 9
+        version: 0.1.9
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :development
+  version_requirements: *id005
 description: Guard::CoffeeScript automatically generates your JavaScripts from your CoffeeScripts
 email: 
 - michi@netzpiraten.ch
@@ -92,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/guard/coffeescript/compiler.rb
 - lib/guard/coffeescript/inspector.rb
 - lib/guard/coffeescript/runner.rb
 - lib/guard/coffeescript/templates/Guardfile
@@ -114,7 +123,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -123,7 +131,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3

data/lib/guard/coffeescript/compiler.rb

@@ -1,75 +0,0 @@
-module Guard
-  class CoffeeScript
-
-    # This has been kindly borrowed from https://github.com/josh/ruby-coffee-script/raw/master/lib/coffee_script.rb
-    # due to namespace conflicts with the guards own CoffeeScript class
-    #
-    # The only change to the original file is to redirect stderr to stdout when executing the compiler,
-    # so that the error messages can easily be parsed and sent to the Growl notifier.
-    #
-    module Compiler
-      class << self
-        def locate_coffee_bin
-          out = `which coffee`
-          if $?.success?
-            out.chomp
-          else
-            raise LoadError, "could not find `coffee` in PATH"
-          end
-        end
-
-        def coffee_bin
-          @@coffee_bin ||= locate_coffee_bin
-        end
-
-        def coffee_bin=(path)
-          @@coffee_bin = path
-        end
-
-        def version
-          `#{coffee_bin} --version`[/(\d|\.)+/]
-        end
-
-        # Compile a script (String or IO) to JavaScript.
-        def compile(script, options = {})
-          args = "-sp"
-
-          if options[:wrap] == false ||
-              options.key?(:bare) ||
-              options.key?(:no_wrap)
-            args += " --#{no_wrap_flag}"
-          end
-
-          execute_coffee(script, args)
-        end
-
-        # Evaluate a script (String or IO) and return the stdout.
-        # Note: the first argument will be process.argv[3], the second
-        # process.argv[4], etc.
-        def evaluate(script, *args)
-          execute_coffee(script, "-s #{args.join(' ')}")
-        end
-
-        private
-          def execute_coffee(script, args)
-            command = "#{coffee_bin} #{args} 2>&1"
-            script  = script.read if script.respond_to?(:read)
-
-            IO.popen(command, "w+") do |f|
-              f << script
-              f.close_write
-              f.read
-            end
-          end
-
-          def no_wrap_flag
-            if `#{coffee_bin} --help`.lines.grep(/--no-wrap/).any?
-              'no-wrap'
-            else
-              'bare'
-            end
-          end
-      end
-    end
-  end
-end