motion_blender 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79ace285044eed0c6934798cf46c9a66db611fb3
-  data.tar.gz: b2175ea70d081ad8b0e84889ce2b29caee909e09
+  metadata.gz: 79e7438cc7769076e46b9ad288b4f54fa75c53d5
+  data.tar.gz: f3e27ca0d88e10e203e4144ba61dc89a5aeffc58
 SHA512:
-  metadata.gz: af125da568d66fb81fb615b94b562ce9aef8142e1f052a063247f1f057237e4ec086e1351629ec1986317e22d08d9ab3231e5bd4889c0a15ae984a7e722c8204
-  data.tar.gz: eb3e1d7da01a76ae13bcb9421ca9d6ff36113dbca25a2516cda1bd25420de5572145412f76167942fdd9c60ac2322f6017dc0bb832854a295ae48e10530ec2f9
+  metadata.gz: 3578fd948e8db4018cf866376c90aa1ad0bbf23533d85591f75711e4862e8492d741dd42265c9c00dc8982bf0f31db7ca37b2ba0e40a520de528a88cfa9c6aaf
+  data.tar.gz: 0099a52ca69ddfbd9b3c24aadf2bb4760eb02cfd2b4f07550e212bad14f2bbbacb838812dfb05e5480bc07fd09f8a7e74c70fa48245d8756615965c5e7a4d6e9

data/.rubocop.yml

@@ -61,6 +61,11 @@ Style/Lambda:
 Style/MethodDefParentheses:
   EnforcedStyle: require_no_parentheses
 
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodName:
+  Exclude:
+    - 'motion/motion_blender/**/*.rb'
+
 # Cop supports --auto-correct.
 Style/MultilineBlockLayout:
   Exclude:

data/README.md

@@ -82,11 +82,11 @@ To require this *motion_hoge* makes an application or a gem to load functionalit
 `motion_blender` itself is excepted for analyzing,
 so don't worry to require `motion_blender` in *incept*-ed files.
 
-### Limitation
+### Parsing
 
-Currently, `require` has some limitation because of the way how to analyze the code.
+It parses `require` statements properly in almost all the common cases.
 
-The argument must be a string or an eval-able expression:
+Argument can be a string or an eval-able expression:
 
 ```ruby
 # Good
@@ -103,10 +103,10 @@ Dir.glob('lib/**/*.rb').each { |path| require path }
 Dir[File.dirname(__FILE__) + '/lib/*.rb'].each { |file| require file }
 ```
 
-Required files must exist:
+Takes care of rescue clause:
 
 ```ruby
-# Bad
+# Good
 begin
   require 'may_not_exist'
 rescue LoadError
@@ -118,9 +118,9 @@ end
 
 In the RubyMotion application's Rakefile, `motion_blender` is to be required, typically via `Bundler.require`.
 Then it hooks `build` tasks.
-You can hit `rake -P` and see `motion_blender:analyze` task is hooked.
+You can hit `rake -P` and see `motion_blender:apply` task is hooked.
 
-At the analyze task, MotionBlender runs analyzer on all `Motion::Project::Config#files`.
+In apply task, MotionBlender runs analyzer on all `Motion::Project::Config#files`.
 It uses [parser](https://github.com/whitequark/parser) and follows all `require` and `require_relative`.
 After that, add the newly encountered files to the head of `Motion::Project::Config#files` and put file dependencies to `Motion::Project::Config#dependencies`.
 

data/lib/motion_blender/analyzer.rb

@@ -5,17 +5,15 @@ require 'motion_blender/analyzer/parser'
 module MotionBlender
   class Analyzer
     attr_reader :files, :dependencies
-    attr_accessor :exclude_files
 
     def initialize
       @analyzed_files = Set.new
-      @exclude_files = Set.new
       @files = []
       @dependencies = {}
     end
 
     def analyze file, backtrace = []
-      return if @exclude_files.include? file
+      return if MotionBlender.config.excepted_files.include? file
       return if @analyzed_files.include? file
       @analyzed_files << file
 
@@ -33,7 +31,6 @@ module MotionBlender
 
     def parse file, backtrace
       parser = Parser.new file
-      parser.exclude_files = @exclude_files
       begin
         parser.run_callbacks :parse do
           parser.parse

data/lib/motion_blender/analyzer/evaluator.rb

@@ -1,3 +1,6 @@
+require 'motion_blender/analyzer/require'
+require 'motion_blender/analyzer/original_finder'
+
 module MotionBlender
   class Analyzer
     class Evaluator
@@ -13,23 +16,53 @@ module MotionBlender
       def parse_args
         extractor = create_extractor
         extractor.instance_eval(@ast.loc.expression.source, @file)
-        extractor.instance_eval { @args || [] }
-      rescue
-        if stack.any?
+        extractor.instance_eval { @_args || [] }
+      rescue ScriptError => err
+        recover_from_script_error err
+      rescue StandardError => err
+        recover_from_standard_error err
+      end
+
+      def recover_from_script_error err
+        i = @stack.find_index { |ast| ast.type == :rescue }
+        if i && i > 0
+          stack = @stack[0..(i - 1)]
           Evaluator.new(@file, stack.last, stack[0..-2], @method).parse_args
         else
-          exp = @ast.loc.expression.source
-          raise LoadError, "failed to parse `#{exp}'"
+          fail LoadError, err.message
+        end
+      end
+
+      def recover_from_standard_error err
+        if @stack.any?
+          Evaluator.new(@file, @stack.last, @stack[0..-2], @method).parse_args
+        else
+          fail LoadError, err.message
         end
       end
 
       def create_extractor
-        obj = Object.new
-        obj.define_singleton_method @method do |arg|
-          @args ||= []
-          @args << arg
+        file = @file
+        extractor = Evaluator.extractor_for(@method).new
+        extractor.instance_eval { @_file = file }
+        extractor
+      end
+
+      def self.extractor_for method
+        @extractor_classes ||= {}
+        @extractor_classes[method] ||= Class.new do
+          define_method method do |arg|
+            req = Require.new(@_file, method, arg)
+            unless req.excluded?
+              @_args ||= []
+              @_args << req
+            end
+          end
+
+          define_method :__ORIGINAL__ do
+            OriginalFinder.new(@_file).find
+          end
         end
-        obj
       end
     end
   end

data/lib/motion_blender/analyzer/original_finder.rb

@@ -0,0 +1,26 @@
+module MotionBlender
+  class Analyzer
+    class OriginalFinder
+      attr_reader :file, :original
+
+      def initialize file
+        @file = file
+      end
+
+      def find
+        dir = MotionBlender.config.motion_dirs.find { |d| @file.start_with? d }
+        fail 'not found in motion_dirs' unless dir
+        arg = Pathname.new(@file).relative_path_from(Pathname.new(dir))
+        @original = candidates_for(arg).find(&:file?).try(&:to_s)
+      end
+
+      def candidates_for arg
+        Enumerator.new do |y|
+          $LOAD_PATH.each do |dir|
+            y << Pathname.new(dir).join(arg)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/motion_blender/analyzer/parser.rb

@@ -3,7 +3,6 @@ require 'active_support'
 require 'active_support/callbacks'
 
 require 'motion_blender/analyzer/evaluator'
-require 'motion_blender/analyzer/require'
 
 module MotionBlender
   class Analyzer
@@ -14,7 +13,6 @@ module MotionBlender
       REQUIREMENT_TOKENS = %i(motion_require require_relative require)
 
       attr_reader :file, :requires, :last_trace
-      attr_accessor :exclude_files
 
       def initialize file
         @file = file.to_s
@@ -27,16 +25,8 @@ module MotionBlender
       end
 
       def traverse ast, stack = []
-        @exclude_files ||= Set.new
         if 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)
-            next if @exclude_files.include? req.arg
-            next if @exclude_files.include? req.file
-            req.trace = @last_trace
-            @requires << req
-          end
+          evaluate ast, stack
         elsif !raketime_block?(ast)
           ast.children
             .select { |node| node.is_a?(::Parser::AST::Node) }
@@ -44,6 +34,14 @@ module MotionBlender
         end
       end
 
+      def evaluate ast, stack
+        @last_trace = trace_for ast
+        Evaluator.new(@file, ast, stack).parse_args.each do |req|
+          req.trace = @last_trace
+          @requires << req
+        end
+      end
+
       def require_command? ast
         (ast.type == :send) && REQUIREMENT_TOKENS.include?(ast.children[1])
       end

data/lib/motion_blender/analyzer/require.rb

@@ -58,6 +58,11 @@ module MotionBlender
       def match? arg_or_file
         arg == arg_or_file || file == arg_or_file
       end
+
+      def excluded?
+        MotionBlender.config.builtin_features.include?(arg) ||
+          MotionBlender.config.excepted_files.include?(file)
+      end
     end
   end
 end

data/lib/motion_blender/config.rb

@@ -1,11 +1,15 @@
+require 'set'
+
 module MotionBlender
   class Config
     attr_reader :incepted_files, :excepted_files, :motion_dirs
+    attr_reader :builtin_features
 
     def initialize
       @incepted_files = []
-      @excepted_files = []
+      @excepted_files = Set.new
       @motion_dirs = []
+      @builtin_features = Set.new %w(bigdecimal rational date thread)
     end
   end
 

data/lib/motion_blender/rake_tasks.rb

@@ -1,4 +1,5 @@
 require 'rake'
+require 'yaml'
 require 'motion_blender/config'
 require 'motion_blender/analyzer'
 
@@ -10,16 +11,15 @@ module MotionBlender
 
     def analyze
       analyzer = Analyzer.new
-      analyzer.exclude_files += builtin_features + config.excepted_files
-
       files = config.incepted_files + Motion::Project::App.config.files
       files.flatten.each do |file|
         analyzer.analyze file
       end
-      apply analyzer
+      analyzer
     end
 
-    def apply analyzer
+    def apply
+      analyzer = analyze
       Motion::Project::App.setup do |app|
         new_files = analyzer.files - app.files
         app.exclude_from_detect_dependencies += new_files
@@ -29,21 +29,27 @@ module MotionBlender
       end
     end
 
-    def builtin_features
-      %w(bigdecimal rational date thread)
+    def dump
+      analyzer = analyze
+      YAML.dump %w(files dependencies).map { |k| [k, analyzer.send(k)] }.to_h
     end
   end
 end
 
 namespace :motion_blender do
-  task :analyze do
+  task :apply do
     MotionBlender.on_parse do |parser|
       Motion::Project::App.info('Analyze', parser.file)
     end
-    MotionBlender::RakeTasks.new.analyze
+    MotionBlender::RakeTasks.new.apply
+  end
+
+  desc 'Dump analyzed files and dependencies'
+  task :dump do
+    puts MotionBlender::RakeTasks.new.dump
   end
 end
 
 %w(build:simulator build:device).each do |t|
-  task t => 'motion_blender:analyze'
+  task t => 'motion_blender:apply'
 end

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/motion/motion_blender/ext/require_suppressor.rb

@@ -8,5 +8,8 @@ Module.new do
   def motion_require _
   end
 
+  def __ORIGINAL__
+  end
+
   Object.send :include, self
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -228,7 +228,7 @@ files:
 - lib/motion_blender.rb
 - lib/motion_blender/analyzer.rb
 - lib/motion_blender/analyzer/evaluator.rb
-- lib/motion_blender/analyzer/hooker.rb
+- lib/motion_blender/analyzer/original_finder.rb
 - lib/motion_blender/analyzer/parser.rb
 - lib/motion_blender/analyzer/require.rb
 - lib/motion_blender/callbacks.rb

data/lib/motion_blender/analyzer/hooker.rb

@@ -1,41 +0,0 @@
-module MotionBlender
-  class Analyzer
-    module Hooker
-      module_function
-
-      def active?
-        !!@active
-      end
-
-      def activate
-        @active = true
-      end
-
-      def deactivate
-        @active = false
-      end
-
-      def requires
-        @requires ||= Hash.new { |hash, key| hash[key] = [] }
-      end
-
-      def clear
-        requires.clear
-      end
-    end
-
-    module Hooks
-      def require feature
-        if Hooker.active?
-          super
-          src = caller.first.split(':', 2).first
-          Hooker.requires[src] << feature
-        else
-          super
-        end
-      end
-    end
-  end
-end
-
-Object.send :include, MotionBlender::Analyzer::Hooks