kitno 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9e5c80a235a015ab9fd4acf29e558ae0df2dd3
-  data.tar.gz: 78af6b928b8b3f63e880f0b80f5a8aaf30781bd2
+  metadata.gz: 0182ca456b67db9aef0b2d288f91a9831812f92c
+  data.tar.gz: a31cd4382e83eb54af37203dce277aa865a9f652
 SHA512:
-  metadata.gz: b08b22e68d5ba1dac9f0329dab9663c731464afc59b1364a9902077c1a82acb563a4719053c36e6dd004d824a1e521dca4b8a9f650f4880adfc21301e3a63855
-  data.tar.gz: 824c6e8fa04ae791a52ad55bc42fb733daa92b2956a0167a0e52252d7e334b1968d386f8f5aa44b3102e98af1a93e29f6563f6a0e3c3d9829b1e2ce329d64737
+  metadata.gz: 947235f8f92df0cd5a39cd557ab433a4af874c7a0a9932e5a5ebc71b232d162ef6030cba53e9096fe4f7a74690cc589cdc3168058a9229951056d491036d24b0
+  data.tar.gz: 7d233c1f21cd1e6620ee4c550b887db69807861e3f9106863d7e3dee15714fdc9b6e53338ef42e0e74315525b65b779e94333d0295c035559cff390967d36169

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+test/fixtures/output/

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.3.1

data/Gemfile.lock

@@ -1,17 +1,36 @@
 PATH
   remote: .
   specs:
-    kitno (0.1.3)
-      awesome_print (>= 1.7.0)
+    kitno (0.1.4)
+      awesome_print (~> 1.7.0, >= 1.7.0)
       thor (~> 0.19.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ansi (1.5.0)
     awesome_print (1.7.0)
+    builder (3.2.2)
+    byebug (9.0.5)
+    coderay (1.1.1)
     gem-release (0.7.4)
+    method_source (0.8.2)
     minitest (5.9.0)
+    minitest-reporters (1.1.9)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rake (10.5.0)
+    ruby-progressbar (1.8.1)
+    slop (3.6.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -19,9 +38,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.12)
+  byebug (~> 9.0, >= 0.0.5)
   gem-release (~> 0.7.4)
   kitno!
   minitest (~> 5.0)
+  minitest-reporters (~> 1.1, >= 1.1.9)
+  pry (~> 0.10.3)
+  pry-byebug (~> 3.4, >= 3.4.0)
   rake (~> 10.0)
 
 BUNDLED WITH

data/kitno.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'bin'
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = ['kitno']
   spec.require_paths = ['lib']
 
   spec.add_dependency 'thor', '~> 0.19.1'
@@ -28,5 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.1', '>= 1.1.9'
+  spec.add_development_dependency 'pry', '~> 0.10.3'
+  spec.add_development_dependency 'byebug', '~> 9.0', '>= 0.0.5'
+  spec.add_development_dependency 'pry-byebug', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'gem-release', '~> 0.7.4'
 end

data/lib/kitno.rb

@@ -3,19 +3,27 @@ require 'kitno/cli'
 
 require 'find'
 require 'fileutils'
-require 'awesome_print'
 
 module Kitno
   class KillingInTheNamespaceOf
     CLASS_EXPRESSION = /^class\s(?:@)?([A-Z][\w\.]*)/
-    REQUIRE_TEMPLATE = "%{short_name} = require '%{path}'"
+    REQUIRE_TEMPLATE = "%{short_name} = require('%{path}')"
 
     def initialize(options = {})
-      @namespace, @directory = options.values_at(:namespace, :directory)
+      @namespace, @directory, @output, globals, externals = options.values_at(
+        :namespace,
+        :directory,
+        :output,
+        :globals,
+        :externals
+      )
 
       @class_map = {}
       @files = []
 
+      @globals = parse_mappings(globals) if globals && globals.length > 0
+      @externals = parse_mappings(externals) if externals && externals.length > 0
+
       @dependency_expression = /^(?!(\s\*|#)).*(?:new|extends)\s(#{Regexp.escape(@namespace)}[\w\.]*)/
     end
 
@@ -23,18 +31,23 @@ module Kitno
       enumerate_files
 
       @class_map.each_value do |descriptor|
-        path = descriptor[:path]
+        path, output_path = descriptor[:path]
 
         require_dependencies!(path, descriptor[:dependencies])
 
-        FileUtils.mv "#{path}.module", path
+        if @output
+          output_path = Pathname.new(path).sub(@directory, @output)
+          FileUtils.mkdir_p output_path.dirname.to_s
+        end
+
+        FileUtils.mv "#{path}.module", output_path.to_s
       end
     end
 
     def enumerate
       enumerate_files
 
-      ap @class_map
+      @class_map
     end
 
     private
@@ -64,6 +77,14 @@ module Kitno
       end
     end
 
+    def parse_mappings(mappings)
+      mappings.split(',').reduce({}) do |map, mapping|
+        constructor, dependency = mapping.split(':')
+        map[constructor] = dependency
+        map
+      end
+    end
+
     def parse_class_name(contents)
       match = CLASS_EXPRESSION.match(contents)
 
@@ -71,7 +92,25 @@ module Kitno
     end
 
     def parse_dependencies(contents)
-      contents.scan(@dependency_expression).flatten.compact
+      dependencies = []
+
+      if @globals && !@globals.empty?
+        @globals.each do |global, dependency|
+          dependencies << dependency if contents.scan(get_dependency_expression(global)).length > 0
+        end
+      end
+
+      if @externals && !@externals.empty?
+        @externals.each do |external, dependency|
+          dependencies << dependency if contents.scan(get_dependency_expression(external)).length > 0
+        end
+      end
+
+      (dependencies += contents.scan(@dependency_expression).flatten).compact
+    end
+
+    def get_dependency_expression(search)
+      /[\s\(](#{Regexp.escape(search)}[\.\(])|^_[\.\(]/
     end
 
     def get_descriptor(class_name)
@@ -96,15 +135,24 @@ module Kitno
       return relative_path, short_name
     end
 
+    def is_external_or_global(dependency)
+      @globals.values.include?(dependency) || @externals.values.include?(dependency)
+    end
+
     def require_dependencies!(filename, dependencies)
       File.open("#{filename}.module", 'w') do |file|
         dependencies.each do |dependency|
-          relative_path, short_name = get_module_mappings(filename, get_descriptor(dependency))
+          if is_external_or_global(dependency)
+            path = dependency
+            short_name = @globals.invert[dependency] || @externals.invert[dependency]
+          else
+            path, short_name = get_module_mappings(filename, get_descriptor(dependency))
+          end
 
-          file.puts REQUIRE_TEMPLATE % { short_name: short_name, path: relative_path }
+          file.puts REQUIRE_TEMPLATE % { short_name: short_name, path: path }
         end
 
-        file.puts "\n\n"
+        file.puts "\n"
 
         short_class_name = @class_map[filename][:class_name].split('.').last
 
@@ -112,9 +160,11 @@ module Kitno
           line.gsub!(CLASS_EXPRESSION, "class #{short_class_name}")
 
           dependencies.each do |dependency|
+            next if is_external_or_global(dependency)
+
             descriptor = get_descriptor(dependency)
             class_name = descriptor[:class_name]
-            relative_path, short_name = get_module_mappings(filename, descriptor)
+            _, short_name = get_module_mappings(filename, descriptor)
 
             line.gsub!(class_name, short_name)
           end

data/lib/kitno/cli.rb

@@ -1,15 +1,32 @@
 require 'thor'
+require 'awesome_print'
 
 module Kitno
   class CLI < Thor
-    desc 'enumerate', 'Enumrate files that will be transformed'
-    long_desc <<-ENUMERATE
-    ENUMERATE
+    desc 'transform', 'Transform directory of modules from namespace convention to CommonJS modules'
+    long_desc <<-TRANSFORM
+    TRANSFORM
 
+    option :dry, aliases: '-d', type: :boolean, default: false
     option :namespace, aliases: '-n', type: :string, required: true, desc: 'Base namespace to migrate from'
     option :directory, aliases: '-d', type: :string, default: '.', desc: 'Directory to target for transformation'
-    def enumerate
-      KillingInTheNamespaceOf.new(options).enumerate
+    option :output, aliases: '-o', type: :string, default: './output', desc: 'Directory to output transformed modules'
+    option :globals, aliases: '-g', type: :string, desc: <<-GLOBALS
+      A comma separated list of global methods in the form of `global:dependency`.
+      Example: '_:underscore,$:jquery'
+    GLOBALS
+    option :externals, aliases: '-e', type: :string, desc: <<-EXTERNALS
+      A comma separated list of external dependencies in the form of `constructor:dependency`.
+      Example: 'Module.Dependency:module#Dependency,Module.Foo.Dependency:module/foo#Dependency'
+    EXTERNALS
+    def transform
+      kitno = KillingInTheNamespaceOf.new(options)
+
+      if options[:dry]
+        ap kitno.enumerate
+      else
+        kitno.run
+      end
     end
   end
 end

data/lib/kitno/version.rb

@@ -1,3 +1,3 @@
 module Kitno
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitno
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Rolfs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,6 +88,80 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -108,14 +182,13 @@ email:
 - alan@mavenlink.com
 - celkamada@gmail.com
 executables:
-- console
 - kitno
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt