js2coffee 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53a754ff9dcb798a2ce162249d437bc0932fc57
-  data.tar.gz: eeffa4c0603253e26904a505342e61c6cb002dad
+  metadata.gz: d3f5e8fc3d77c373dcb01d744ea74329e228d736
+  data.tar.gz: df3c643915d6bc2593ceb7a54257cefbb96efa6d
 SHA512:
-  metadata.gz: 1427aa2a01f083a0cc80cbe1b4c3568a3d35ec67474b959736c72da9b5160111fc2cf2d467fcdfdbbf9ea3f8795c091ce234be7b8fd75362637823665b95b546
-  data.tar.gz: a1d3817734a7269e5b67bafb15c95432991693a54cc61313c000d318552714ab29b7202d594d6ade5d923b3d2afdbaee711a1bb58e28911167020f8a0c324471
+  metadata.gz: 806ef54442e0857e080458dbe798d3446185019b29039a86219e1c3684d03e00c2a5295d53a7254fab0615051e1e3d0d5f8920a90d2274d0ef81e73c835be63f
+  data.tar.gz: 27cd6718bb81eac9e2841865050b4c3faf3d0d13e6cbec55cb822d9608bb5f37b67e9af5069df805c927044aed98306f29b43dc0c8744e3a891a3d87d959eba4

data/bin/js2coffee

@@ -51,7 +51,7 @@ if filename.any?
   else
     filename.each do |file|
       unless File.exist? file
-        puts "cannot open \`\033[0;33m#{file}\033[0m' for reading: No such file or directory, Skipping"
+        puts "Can't open \`\033[0;33m#{file}\033[0m' for reading: No such file or directory, Skipping"
         next
       end
       Js2coffee.compile_file(file, bare: true, sourceMap: true)

data/lib/js2coffee/coffee_compiler.rb

@@ -8,7 +8,7 @@ require 'js2coffee/compiler'
 
 module Js2coffee
   class CoffeeCompiler < Compiler
-    self.source = 'coffee-script'
+    self.source = 'coffee-script.js'
 
     class << self
       def wrapper
@@ -32,7 +32,7 @@ WRAPPER
       def watch_file(file)
         file_path = Pathname(file)
         source_code = file_path.read
-        target_file, target_map = Js2coffee::PathHelper.new(file_path).create_js_path!
+        target_file, target_map = Js2coffee::PathHelper.new(file_path).create_target_path!
         # generate js and SourceMap.
         result = compiler.call(wrapper, source_code, bare: false, sourceMap: true,
                                sourceFiles: [file_path.relative_path_from(target_file.dirname).to_s],

data/lib/js2coffee/compiler.rb

@@ -13,7 +13,7 @@ module Js2coffee
       end
 
       def source=(new_source)
-        @source = File.read(File.expand_path("../compiler/#{new_source}.js", __FILE__))
+        @source = File.read(File.expand_path("../compiler/#{new_source}", __FILE__))
       end
 
       def wrapper

data/lib/js2coffee/js_compiler.rb

@@ -3,7 +3,7 @@
 
 module Js2coffee
   class JsCompiler < Compiler
-    self.source = 'js2coffee'
+    self.source = 'js2coffee.js'
 
     class << self
       def wrapper
@@ -31,7 +31,7 @@ WRAPPER
       def watch_file(file)
         file_path = Pathname(file)
         source_code = file_path.read
-        target_file, target_map = Js2coffee::PathHelper.new(file_path).create_coffee_path!
+        target_file, target_map = Js2coffee::PathHelper.new(file_path).create_target_path!
         # generate coffee and SourceMap.
         result = compiler.call(wrapper, source_code)
         target_file.write(result['code'])

data/lib/js2coffee/path_helper.rb

@@ -6,44 +6,28 @@ module Js2coffee
       @path = Pathname(path)
     end
 
-    def create_js_path!
+    def create_target_path!
       # if find `coffee' in descend path, will create js directory at the same level.
-      path.descend do |x|
-        if x.basename.to_s == 'coffee'
-          js_path = path.sub('/coffee/', '/js/').sub_ext('.js')
-          map_path = path.sub('/coffee/', '/.map/').sub_ext('.js.map')
-
-          FileUtils.mkdir_p([js_path.dirname, map_path.dirname])
-
-          return [js_path, map_path]
-        end
-      end
+      ext = path.extname[1..-1]
+      target = ext == 'js' ? 'coffee' : 'js'
 
-      # else, just save in the same path with new extname.
-      js_path = path.sub_ext('.js')
-      map_path = path.sub_ext('.js.map').sub(/\/([^\/]+)$/, '/.\1')
-      fail 'filename extension must .coffee!' if path == js_path
-
-      [js_path, map_path]
-    end
-
-    def create_coffee_path!
       path.descend do |x|
-        if x.basename.to_s == 'js'
-          js_path = path.sub('/js/', '/coffee/').sub_ext('.coffee')
-          map_path = path.sub('/js/', '/.map/').sub_ext('.js.map')
+        if x.basename.to_s == ext
+          target_path = path.sub("/#{ext}/", "/#{target}/").sub_ext(".#{target}")
+          map_path = path.sub("/#{ext}/", '/.map/').sub_ext('.js.map')
 
-          FileUtils.mkdir_p([js_path.dirname, map_path.dirname])
+          FileUtils.mkdir_p([target_path.dirname, map_path.dirname])
 
-          return [js_path, map_path]
+          return [target_path, map_path]
         end
       end
 
-      js_path = path.sub_ext('.coffee')
-      map_path = path.sub_ext('.js.map').sub(/\/([^\/]+)$/, '/.\1')
-      fail 'filename extension must .js!' if path == js_path
+      # else, just save in the same path with new extname.
+      target_path = path.sub_ext(".#{target}")
+      map_path = path.sub_ext('.js.map').sub(%r{/([^/]+)$}, '/.\1')
+      fail "filename extension must .#{ext}!" if path == target_path
 
-      [js_path, map_path]
+      [target_path, map_path]
     end
   end
 end

data/lib/js2coffee/version.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 module Js2coffee
-  VERSION = [1, 0, 2]
+  VERSION = [1, 0, 3]
 
   class << VERSION
     def to_s

data/lib/js2coffee/watcher.rb

@@ -31,6 +31,8 @@ module Js2coffee
       puts 'Watcher is started.'
     end
 
+    private
+
     # watch all exist files modify event.
     def start_watch_files
       watched_files.each do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js2coffee
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Billy.Zheng(zw963)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs