motion_blender 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3d49bb1ba40b2cde3d4fa5bea800c1764ae21f
-  data.tar.gz: c09c5e5c2d743614f290936de33a8ecc84c5761a
+  metadata.gz: 12f4f266de541f71f053210f9b089eb7a56fb77b
+  data.tar.gz: f30217e63c3c013a07862c1ea6f4413b749f6b26
 SHA512:
-  metadata.gz: e3a6dcb4522f542645e24f58e60f8623588303a6c86271b029d573b5c899b8cdb5a4528f9b95f1a3a8dd04ca62be4743d3d9967985449258a594e26d5b5060da
-  data.tar.gz: ac31ed89248e5adeab0b8ead925d030f9870b481d54ccb1def31f955994c4aba585fae1a37039a976ce73593d2124d1c5223d322ad9e3ee4a94222ef83cb8953
+  metadata.gz: 8bbca25180fa862d2cdf18dc13589a6dfe8260b6972c19c4be497e25a48519571afe21537281111553f24a6114961262fe5c622b9cd344f7c5d1c918ca2db2f1
+  data.tar.gz: dc18bde83fe86c28bdd3e4fbbaf38ea7e8fc0c5a04c92acb3b51ef6ba843918b524d97af251ee98fcb46a8de404d284bfce475fab8cb5bd9d0ce2e703a5aabbe

data/README.md

@@ -102,7 +102,7 @@ Dir.glob('lib/**/*.rb').each { |path| require path }
 Dir[File.dirname(__FILE__) + '/lib/*.rb'].each { |file| require file }
 ```
 
-Required Files must exist:
+Required files must exist:
 
 ```ruby
 # Bad

data/lib/motion_blender/analyzer/evaluator.rb

@@ -13,7 +13,7 @@ module MotionBlender
       def parse_args
         extractor = create_extractor
         extractor.instance_eval(@ast.loc.expression.source, @file)
-        extractor.instance_eval { @args }
+        extractor.instance_eval { @args || [] }
       rescue
         if stack.any?
           Evaluator.new(@file, stack.last, stack[0..-2], @method).parse_args

data/lib/motion_blender/analyzer/parser.rb

@@ -2,15 +2,15 @@ require 'parser/current'
 require 'pathname'
 
 require 'motion_blender/analyzer/evaluator'
+require 'motion_blender/analyzer/require'
 
 module MotionBlender
   class Analyzer
     class Parser
       REQUIREMENT_TOKENS = %i(motion_require require_relative require)
 
-      Require = Struct.new(:loader, :method, :arg, :file, :trace)
-
       attr_reader :file, :requires, :last_trace
+      attr_accessor :exclude_files
 
       def initialize file
         @file = file.to_s
@@ -19,19 +19,21 @@ module MotionBlender
 
       def parse
         ast = ::Parser::CurrentRuby.parse(File.read(@file))
-        traverse ast
+        traverse ast if ast
       end
 
       def traverse ast, stack = []
-        if ast && ast.type == :send && require_command?(ast)
+        @exclude_files ||= Set.new
+        if ast.type == :send && require_command?(ast)
           @last_trace = trace_for ast
           Evaluator.new(@file, ast, stack).parse_args.each do |arg|
             req = Require.new(@file, ast.children[1], arg)
-            req.file = resolve_path req.method, req.arg
+            next if @exclude_files.include? req.arg
+            next if @exclude_files.include? req.file
             req.trace = @last_trace
             @requires << req
           end
-        elsif ast
+        else
           ast.children
             .select { |node| node.is_a?(::Parser::AST::Node) }
             .each { |node| traverse node, [*stack, ast] }
@@ -45,30 +47,6 @@ module MotionBlender
       def trace_for ast
         "#{@file}:#{ast.loc.line}:in `#{ast.children[1]}'"
       end
-
-      def resolve_path method, arg
-        if %i(motion_require require_relative).include? method
-          arg = Pathname.new(@file).dirname.join(arg).to_s
-        end
-        path = candidates_for(arg, method == :require).find(&:file?)
-        fail LoadError, "not found `#{arg}'" unless path
-        explicit_relative path
-      end
-
-      def candidates_for feature, uses_load_path
-        path = Pathname.new(feature)
-        dirs = (uses_load_path && path.relative?) ? $LOAD_PATH : ['']
-        exts = path.extname.empty? ? ['', '.rb'] : ['']
-        Enumerator.new do |y|
-          dirs.product(exts).each do |dir, ext|
-            y << Pathname.new(dir).join("#{path}#{ext}")
-          end
-        end
-      end
-
-      def explicit_relative path
-        path.to_s.sub(%r{^(?![\./])}, './')
-      end
     end
   end
 end

data/lib/motion_blender/analyzer/require.rb

@@ -0,0 +1,47 @@
+module MotionBlender
+  class Analyzer
+    class Require
+      attr_accessor :loader, :method, :arg, :trace
+
+      def initialize loader, method, arg
+        @loader = loader
+        @method = method
+        @arg = arg
+      end
+
+      def file
+        @file ||= resolve_path
+      end
+
+      def resolve_path
+        path = candidates.find(&:file?)
+        fail LoadError, "not found `#{arg}'" unless path
+        explicit_relative path
+      end
+
+      def candidates
+        path =
+          if %i(motion_require require_relative).include? method
+            Pathname.new(loader).dirname.join(arg)
+          else
+            Pathname.new(arg)
+          end
+        dirs = (uses_load_path? && path.relative?) ? $LOAD_PATH : ['']
+        exts = path.extname.empty? ? ['', '.rb'] : ['']
+        Enumerator.new do |y|
+          dirs.product(exts).each do |dir, ext|
+            y << Pathname.new(dir).join("#{path}#{ext}")
+          end
+        end
+      end
+
+      def explicit_relative path
+        path.to_s.sub(%r{^(?![\./])}, './')
+      end
+
+      def uses_load_path?
+        method == :require
+      end
+    end
+  end
+end

data/lib/motion_blender/analyzer.rb

@@ -20,19 +20,18 @@ module MotionBlender
       @analyzed_files << file
 
       parser = Parser.new file
+      parser.exclude_files = @exclude_files
       begin
         parser.parse
       rescue LoadError => err
         err.set_backtrace [parser.last_trace, *backtrace].compact
         raise err
       end
-      requires = parser.requires.reject do |req|
-        @exclude_files.include? req.file
-      end
 
+      requires = parser.requires
       if requires.any?
         @dependencies[file] = requires.map(&:file)
-        @files = (@files + [file] + @dependencies[file]).uniq
+        @files = [*@files, file, *@dependencies[file]].uniq
         requires.each do |req|
           analyze req.file, [req.trace, *backtrace]
         end

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/motion_blender.rb

@@ -9,6 +9,7 @@ module MotionBlender
     Motion::Project::App.setup do |app|
       analyzer = Analyzer.new
       analyzer.exclude_files += Dir[File.expand_path('../**/*.rb', __FILE__)]
+      analyzer.exclude_files += builtin_features
       app.files.flatten.each do |file|
         analyzer.analyze file
       end
@@ -21,15 +22,32 @@ module MotionBlender
     end
   end
 
-  def add file
-    if defined?(Motion::Project::Config)
-      Motion::Project::App.setup do |app|
-        app.files.unshift file
-      end
+  def add file = nil
+    return unless motion?
+
+    file ||= caller.first.split(':', 2).first
+    Motion::Project::App.setup do |app|
+      app.files.unshift file
     end
   end
 
+  def use_motion_dir dir = nil
+    return unless motion?
+
+    dir ||= File.expand_path('../../motion', caller.first.split(':', 2).first)
+    $LOAD_PATH.delete dir
+    $LOAD_PATH.unshift dir
+  end
+
+  def motion?
+    defined?(Motion::Project::Config)
+  end
+
   def ext_file
     File.expand_path('../../motion/ext.rb', __FILE__)
   end
+
+  def builtin_features
+    %w(bigdecimal date thread)
+  end
 end

data/motion/ext.rb

@@ -14,6 +14,13 @@ end
 module MotionBlender
   module_function
 
-  def add _
+  def add _ = nil
+  end
+
+  def use_motion_dir _ = nil
+  end
+
+  def motion?
+    true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -230,6 +230,7 @@ files:
 - lib/motion_blender/analyzer/evaluator.rb
 - lib/motion_blender/analyzer/hooker.rb
 - lib/motion_blender/analyzer/parser.rb
+- lib/motion_blender/analyzer/require.rb
 - lib/motion_blender/rake_tasks.rb
 - lib/motion_blender/version.rb
 - motion/ext.rb