kitno 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6743068a4a2aa39ed5cda838235fcf54f82a10a6
-  data.tar.gz: fedb90dd7b5005bcb7ea5ef1dfb1ebd4484cd447
+  metadata.gz: ab085b539426621ac48086d58caa69f25329ba76
+  data.tar.gz: 290782c86dd862c6ce3dc0895a7ba9dfe9c05f03
 SHA512:
-  metadata.gz: db7509f277d58a834a044afb2963d9093831a15e868b9c63845f29f74e7197435eb9c85626bb45654ee0deb7593e1cb52bdaa762717f29aa25e835c302047972
-  data.tar.gz: 1cfa149cf88c4167ea04a69ea9115e37e560ba581dc4082be4bc365cc96d04101750d71c2b939278cbe6145a24bb0a81145f4493daaaebcded9dcd9d751f3d79
+  metadata.gz: b301798c4f59f421a715f75bf094bea72fb89700e347e71aa45a058fceab0475a579c1ff1d0b9eb97b3f523a8e84b457e1d2c176aabbb6c800c0cfa5c6915b46
+  data.tar.gz: 1ce1902d3d129607ed8daf62b1da08512dc80d702de27884ba270cc0a024264e0417a67b80e67c58771b37546b34cc4df60ef259a93e87139de44c29bc65e1b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kitno (0.2.0)
+    kitno (0.2.2)
       awesome_print (~> 1.7.0, >= 1.7.0)
       thor (~> 0.19.1)
 

data/lib/kitno/version.rb

@@ -1,3 +1,3 @@
 module Kitno
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/kitno.rb

@@ -3,6 +3,7 @@ require 'kitno/cli'
 
 require 'find'
 require 'fileutils'
+require 'pathname'
 
 module Kitno
   class KillingInTheNamespaceOf
@@ -21,10 +22,10 @@ module Kitno
       @class_map = {}
       @files = []
 
-      @globals = parse_mappings(globals) if globals && globals.length > 0
-      @externals = parse_mappings(externals) if externals && externals.length > 0
+      @globals = globals && globals.length > 0 ? parse_mappings(globals) : {}
+      @externals = externals && externals.length > 0 ? parse_mappings(externals) : {}
 
-      @dependency_expression = /^(?!(\s\*|#)).*(?:new|extends)\s(#{Regexp.escape(@namespace)}[\w\.]*)/
+      @dependency_expression = /^(?!(\s\*|#)).*(?:new|extends|=|\:)\s(#{Regexp.escape(@namespace)}[\w\.]*)/
     end
 
     def run
@@ -67,7 +68,7 @@ module Kitno
         class_name = parse_class_name contents
         dependencies = parse_dependencies contents
 
-        unless class_name.nil?
+        unless class_name.nil? && dependencies.nil?
           @class_map[path] = {
             path: path,
             class_name: class_name,
@@ -106,7 +107,7 @@ module Kitno
         end
       end
 
-      (dependencies += contents.scan(@dependency_expression).flatten).compact
+      dependencies += contents.scan(@dependency_expression).flatten.uniq.compact
     end
 
     def get_dependency_expression(search)
@@ -145,6 +146,8 @@ module Kitno
           if is_external_or_global(dependency)
             path = dependency
             short_name = @globals.invert[dependency] || @externals.invert[dependency]
+          elsif get_descriptor(dependency).nil?
+            next
           else
             path, short_name = get_module_mappings(filename, get_descriptor(dependency))
           end
@@ -154,7 +157,7 @@ module Kitno
 
         file.puts "\n"
 
-        short_class_name = @class_map[filename][:class_name].split('.').last
+        short_class_name = @class_map[filename][:class_name]&.split('.')&.last
 
         File.foreach(filename) do |line|
           line.gsub!(CLASS_EXPRESSION, "class #{short_class_name}")
@@ -172,7 +175,7 @@ module Kitno
           file.puts line
         end
 
-        file.puts "\nmodule.exports = #{short_class_name}\n"
+        file.puts "\nmodule.exports = #{short_class_name}\n" if !short_class_name.nil?
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitno
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jamie Rolfs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor