coffee_without_nodejs 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407dd2497ac983b5ed976b70c0b8c0913e6bcbe0
-  data.tar.gz: 68a2b3e2ee186259bef433ab597dc2661664d4f4
+  metadata.gz: 61de08829c462bf882db9eff690eb2c6beb92b82
+  data.tar.gz: 6575e27221ed2c3a518d01979fc817a34db62e7c
 SHA512:
-  metadata.gz: 4ddca2d3dbb495c368ab7b736f8c9d0c6cac6be305e1c73d15334887611205e6199c0577c2a5c2014bc74fbe87d3613c75c37cdae76d2b56eed9b5c5cca0d781
-  data.tar.gz: 9e4afe04aa6ef6c2aebafaf15b500750c2bbbee13592242b698e5eaa75dfd3c249294f1cfd999b98d28a850e05943c4ea7ca99154feab16e8e8e7a9e0121e851
+  metadata.gz: 00275f2bf31c659e3f94ae43c575004d06d7d153484f29cfaf661cc64af3f81a440117363fa20fb560a042fbfdc5848d811f854aa893bab045d5a8c5b6d70656
+  data.tar.gz: 0a5b166a5028434dd1ee0b1165d0f893c671f6bb2788753592ac944c26282822d25cfd5ae08a081d0c5a5c887e2277b4cd6c79398deae658a8e6639f4cc3c74d

data/bin/coff

@@ -2,25 +2,24 @@
 # -*- coding: utf-8 -*-
 
 require 'coffee_without_nodejs'
+require 'coderay'
 
 if ARGV.first == '-e'
   ARGV.shift
-  content = CoffeeWithoutNodejs.compile(ARGV.first)
-  system "echo \"#{content}\" |coderay -js" unless content.empty?
+  content = CoffeeWithoutNodejs.compile(ARGV.first).to_s
+  print CodeRay.scan(content, :js).terminal unless content.empty?
 else
   if ARGV.empty?
     `notify-send 'Starting coffee compiler.' -t 1000` if system 'which notify-send &>/dev/null'
     CoffeeWithoutNodejs.watch!
+  elsif test 'd', ARGV.first
+    Dir.chdir(ARGV.first) { CoffeeWithoutNodejs.watch! }
   else
     ARGV.each do |file|
       fail "`#{file}' is not valid filename." unless File.exist? file
 
-      if test ?d, file
-        Dir.chdir(file) { CoffeeWithoutNodejs.watch! }
-      else
-        js_file = CoffeeWithoutNodejs.compile(file).to_s
-        system "coderay -js \"#{js_file}\"" unless js_file.empty?
-      end
+      content = CoffeeWithoutNodejs.compile(file).to_s
+      print CodeRay.scan(content, :js).terminal unless content.empty?
     end
   end
 end

data/lib/coffee_without_nodejs.rb

@@ -5,9 +5,9 @@ require 'coffee_without_nodejs/compiler'
 require 'coffee_without_nodejs/watcher'
 
 module CoffeeWithoutNodejs
-  def self.compile(coffee, bare=true)
+  def self.compile(coffee, bare=true, create_target_jsfile=false)
     if File.file?(coffee)
-      CoffeeCompiler.compile_file(coffee, bare)
+      CoffeeCompiler.compile_file(coffee, bare, create_target_jsfile)
     else
       CoffeeCompiler.compile(coffee, bare)
     end

data/lib/coffee_without_nodejs/compiler.rb

@@ -14,7 +14,7 @@ module CoffeeWithoutNodejs
       end
 
       def wrapper
-        wrapper = <<-WRAPPER
+        <<-WRAPPER
 (function(script, options) {
     try {
         return CoffeeScript.compile(script, options);
@@ -35,33 +35,41 @@ WRAPPER
 
       def compile(script, bare=true)
         compiler.call(wrapper, script, bare: bare)
+      rescue ExecJS::RuntimeError
+        puts $!.message
       end
 
-      def compile_file(file, bare=true)
+      def compile_file(file, bare=true, create_target_jsfile=false)
         root_dir = Pathname(Dir.pwd)
         file_path = Pathname(File.expand_path(file))
         source_code = file_path.read
 
-        js_path, map_path = create_js_path_from(file_path)
+        target_js_content = compiler.call(wrapper, source_code, bare: bare)
 
-        source_files = file_path.relative_path_from(js_path.dirname).to_s
-        generated_file = js_path.relative_path_from(js_path.dirname).to_s
-        relative_map_path = map_path.relative_path_from(js_path.dirname).to_s
+        if create_target_jsfile
+          js_path, map_path = create_js_path_from(file_path)
+          source_files = file_path.relative_path_from(js_path.dirname).to_s
+          generated_file = js_path.relative_path_from(js_path.dirname).to_s
+          relative_map_path = map_path.relative_path_from(js_path.dirname).to_s
 
-        File.open(js_path, 'wb') do |f|
-          f.print "#{ENV['JS_SHEBANG']}\n\n" if ENV['JS_SHEBANG']
-          f.print compiler.call(wrapper, source_code, bare: bare), "\n//# sourceMappingURL=#{relative_map_path}"
-        end
-        File.open(map_path, 'wb') do |f|
-          f.print compiler.call(wrapper, source_code,
-            sourceMap: true,
-            sourceFiles: [source_files],
-            generatedFile: generated_file)["v3SourceMap"]
-        end
+          File.open(js_path, 'wb') do |f|
+            f.print "#{ENV['JS_SHEBANG']}\n\n" if ENV['JS_SHEBANG']
+            f.print target_js_content, "\n//# sourceMappingURL=#{relative_map_path}"
+          end
 
-        puts "==> #{js_path.relative_path_from(root_dir)}"
+          File.open(map_path, 'wb') do |f|
+            f.print compiler.call(wrapper, source_code,
+                                  sourceMap: true,
+                                  sourceFiles: [source_files],
+                                  generatedFile: generated_file)['v3SourceMap']
+          end
 
-        js_path
+          puts "==> #{js_path.relative_path_from(root_dir)}"
+          js_path
+        else
+          puts "==> #{file_path}"
+          target_js_content
+        end
       rescue ExecJS::RuntimeError
         error_msg = "[#{file_path.relative_path_from(root_dir)}]: #{$!.message}"
         `notify-send "#{error_msg}" -t 5000` if system 'which notify-send &>/dev/null'
@@ -87,7 +95,12 @@ WRAPPER
         # if not in coffee directory, rename it.
         js_path = path.sub(/\.js\.coffee$|\.coffee$/, '.js')
         map_path = js_path.sub_ext('.js.map').sub(/\/([^\/]+)$/, '/.\1')
-        return [js_path, map_path]
+
+        if path == js_path
+          warn 'filename extension is .coffee or .js.coffee?'
+          exit
+        end
+        [js_path, map_path]
       end
     end
   end

data/lib/coffee_without_nodejs/version.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 module CoffeeWithoutNodejs
-  VERSION = [0, 4, 0]
+  VERSION = [0, 5, 0]
 
   class << VERSION
     def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffee_without_nodejs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Billy.Zheng(zw963)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs