motion_blender 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0a26f4930010d2e1105308d10fb471cc3e3892
-  data.tar.gz: f537cd46e5096820fc007f634aa127384a7d9bfe
+  metadata.gz: 96d8bca0eabd7579ef143fb1d513f19f3107b96d
+  data.tar.gz: 0400cc6dc5ed4eddf57120ddcdc4a444ac0ce710
 SHA512:
-  metadata.gz: bafb18c7858a0d59a7c341ebc1ed6ae809622b3b86c99d9435e0992cc36cead2e819251249798fbca5db20b162363bb01c45d16332fe150c9cdf463d76fb6a0f
-  data.tar.gz: 9948b5186e33231b7d286d6b6b9cd013a3ae3c7a008e6954c4cc4ab13a70bb15a5475d14c64bf572088c416524fe0a3fd0ddd8c55c617b42290d468940e2841f
+  metadata.gz: 48421b7fba3cb60c261a3958d60c439b0b43fe9bfadc3fb6f297b567ef647d56cb549de3fa3c367f3436034f068ec1c099cad027c4455cd55296aacf73a88463
+  data.tar.gz: b5f0a8a4a50c58bcea1e487d4b4d40d5e4999cc4d57e48a95f760f12ddfe8006d7375900938d66d489c49396fccde30c36f492a71fdd0bb5bf82d6648e96c14f

data/.rubocop.yml

@@ -19,6 +19,11 @@ Metrics/ModuleLength:
 Metrics/AbcSize:
   Max: 25
 
+# Cop supports --auto-correct.
+Performance/RedundantBlockCall:
+  Exclude:
+    - 'motion/**/*'
+
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 Style/BlockDelimiters:
   Exclude:
@@ -73,7 +78,7 @@ Style/MultilineBlockLayout:
     - 'spec/**/*'
 
 # Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 
 # Cop supports --auto-correct.

data/.travis.yml

@@ -1,8 +1,10 @@
-os: osx
 language: ruby
-rvm:
-  - 2.2.3
+matrix:
+  include:
+    - rvm: 2.2.5
+      os: osx
+      osx_image: xcode7.3 # OSX 10.11
 before_install:
-  - gem install bundler -v 1.10.6
+  - gem install bundler
   - brew update
   - brew install graphviz --with-gts

data/lib/motion_blender/analyzer.rb

@@ -11,24 +11,48 @@ module MotionBlender
       @analyzed_files = Set.new
       @files = []
       @dependencies = {}
+      @autoloads = {}
+      @file_stack = []
     end
 
     def analyze file, backtrace = []
+      @file_stack.push file
+
       return if MotionBlender.config.excepted_files.include? file
       return if @analyzed_files.include? file
       @analyzed_files << file
 
-      requires = parse file, backtrace
-
-      if requires.present?
-        @dependencies[file] = requires.map(&:file)
-        @files = [*@files, file, *@dependencies[file]].uniq
-        requires.each do |req|
-          req.run_callbacks :require do
-            analyze req.file, [req.trace, *backtrace]
-          end
+      parser = parse file, backtrace
+      requires = merge parser
+      requires.each do |req|
+        req.run_callbacks :require do
+          analyze req.file, [req.trace, *backtrace]
         end
       end
+    ensure
+      @file_stack.pop
+    end
+
+    def pick_autoloads parser
+      parser.requires.select(&:autoload?).each do |req|
+        @autoloads[req.autoload_const_name] ||= []
+        @autoloads[req.autoload_const_name] << req
+      end
+    end
+
+    def merge parser
+      pick_autoloads parser
+
+      reqs = parser.dependent_requires(autoloads: @autoloads)
+      reqs = reqs.reject { |req| @file_stack.include? req.file }
+      if reqs.present?
+        files = reqs.map(&:file)
+        @dependencies[parser.file] = files
+        @files = [*@files, parser.file, *files].uniq
+        reqs
+      else
+        []
+      end
     end
 
     def parse file, backtrace
@@ -39,7 +63,7 @@ module MotionBlender
         err.set_backtrace [parser.last_trace, *backtrace].compact
         raise err
       end
-      parser.requires
+      parser
     end
   end
 end

data/lib/motion_blender/analyzer/cache.rb

@@ -2,7 +2,7 @@ module MotionBlender
   class Analyzer
     class Cache
       attr_reader :file, :hit
-      alias_method :hit?, :hit
+      alias hit? hit
 
       def initialize file
         @file = Pathname.new(file)

data/lib/motion_blender/analyzer/evaluator.rb

@@ -6,11 +6,13 @@ module MotionBlender
       attr_reader :source
       attr_reader :trace, :requires
       attr_reader :dynamic
-      alias_method :dynamic?, :dynamic
+      alias dynamic? dynamic
+      attr_reader :done
+      alias done? done
 
       def initialize source
         @source = source
-        @trace = "#{source.file}:#{source.line}:in `#{source.method}'"
+        @trace = source.to_s
         @requires = []
         @dynamic = false
       end
@@ -19,19 +21,22 @@ module MotionBlender
         return if @source.evaluated?
         @source.evaluated!
 
-        @requires = Collector.collect_requires(@source)
+        @requires = Collector.new(@source).collect_requires
         @requires.each do |req|
           req.trace = @trace
         end
+        @done = true
         self
       rescue StandardError, ScriptError => err
         recover_from_error err
       end
 
+      private
+
       def recover_from_error err
         @source = @source.parent
         @source = @source.parent if @source && @source.type.rescue?
-        fail LoadError, err.message unless @source
+        raise LoadError, err.message unless @source
         @dynamic = true
         run
       end

data/lib/motion_blender/analyzer/parser.rb

@@ -10,7 +10,7 @@ module MotionBlender
       include ActiveSupport::Callbacks
       define_callbacks :parse
 
-      attr_reader :file, :evaluators, :cache
+      attr_reader :file, :evaluators, :cache, :referring_constants
 
       def initialize file
         @file = file.to_s
@@ -18,17 +18,22 @@ module MotionBlender
       end
 
       def parse
-        srcs = cache.fetch do
+        cached = cache.fetch do
           run_callbacks :parse do
-            traverse(Source.parse_file(@file))
-            @evaluators.map(&:source).map(&:attributes)
+            root = Source.parse_file(@file)
+            traverse(root)
+            {
+              sources: processed_sources.map(&:attributes),
+              referring_constants: root.referring_constants
+            }
           end
         end
-        if srcs && cache.hit?
-          srcs.each do |attrs|
+        if cached && cache.hit?
+          cached[:sources].each do |attrs|
             evaluate Source.new(attrs)
           end
         end
+        @referring_constants = cached[:referring_constants]
         self
       end
 
@@ -40,7 +45,7 @@ module MotionBlender
         if Collector.requirable?(source)
           evaluate source
         elsif Collector.acceptable?(source)
-          source.children.each { |src| traverse src }
+          source.children.compact.each { |src| traverse src }
         end
       end
 
@@ -53,9 +58,31 @@ module MotionBlender
         @evaluators.map(&:requires).flatten
       end
 
+      def processed_sources
+        @evaluators.select(&:done?).map(&:source)
+      end
+
       def last_trace
         @evaluators.last.try :trace
       end
+
+      def autoloads_with autoloads
+        referring_constants.map do |mods, const|
+          key =
+            mods
+            .length.downto(0)
+            .map { |i| [*mods.take(i), const].join('::') }
+            .find { |k| autoloads.key?(k) }
+          autoloads[key]
+        end.flatten.compact
+      end
+
+      def dependent_requires opts = {}
+        autoloads = opts[:autoloads]
+        reqs = requires.reject(&:autoload?)
+        reqs += autoloads_with(autoloads) if autoloads
+        reqs.uniq(&:file)
+      end
     end
   end
 end

data/lib/motion_blender/collector.rb

@@ -22,55 +22,81 @@ module MotionBlender
           (source.children.first.code != 'MotionBlender.raketime')
       end
 
-      def collect_requires source
-        collector = new(source, interpreters)
-        interpreters.each do |interpreter|
-          get_refinement_for(interpreter.receiver).module_eval do
-            define_method interpreter.method do |*args, &proc|
-              collector.interpreters[interpreter.key].interpret(*args, &proc)
-            end
-          end
+      def refinements
+        @refinements ||= Hash.new do |hash, key|
+          hash[key] = Module.new { key.prepend self }
         end
-        Object.new.instance_eval(source.code, source.file, source.line)
-        collector.requires
-      ensure
-        clear_refinements
       end
+    end
 
-      private
+    attr_accessor :source, :interpreters, :requires
 
-      def refinements
-        @refinements ||= {}
+    def initialize source
+      @source = source
+      @interpreters = self.class.interpreters.map do |interpreter|
+        [interpreter.key, interpreter.new(self)]
+      end.to_h
+      @requires = []
+    end
+
+    def collect_requires
+      obj = evaluating_object
+      if obj.is_a? Module
+        with_refinements do
+          obj.module_eval(source.code, source.file, source.line)
+        end
+      else
+        with_refinements do
+          obj.instance_eval(source.code, source.file, source.line)
+        end
       end
+      requires
+    end
 
-      def get_refinement_for klass
-        refinements[klass] ||=
-          begin
-            Module.new do
-              klass.prepend self
-            end
-          end
+    private
+
+    delegate :refinements, to: :class
+
+    def evaluating_object
+      obj = Object.new
+      constants = @source.global_constants.select do |c|
+        Object.const_defined? c.to_sym
       end
+      constants.each { |c| obj.instance_eval "#{c} = ::#{c}" }
+      if @source.wrapping_modules.present?
+        ms = @source.wrapping_modules.map { |p| p.join(' ') }
+        s = [*ms, 'self', *Array.new(ms.length, 'end')].join(';')
+        obj = obj.instance_eval s
+      end
+      obj
+    end
 
-      def clear_refinements
-        refinements.each do |_, mod|
-          mod.module_eval do
-            instance_methods.each do |m|
-              remove_method m
-            end
+    def with_refinements
+      apply_refinements
+      yield
+    ensure
+      clear_refinements
+    end
+
+    def apply_refinements
+      interpreters.each do |_, interpreter|
+        refinements[interpreter.receiver].module_eval do
+          define_method interpreter.method do |*args, &proc|
+            interpreter.object = self
+            interpreter.interpret(*args, &proc)
           end
         end
       end
     end
 
-    attr_accessor :source, :interpreters, :requires
-
-    def initialize source, interpreters
-      @source = source
-      @interpreters = interpreters.map do |interpreter|
-        [interpreter.key, interpreter.new(self)]
-      end.to_h
-      @requires = []
+    def clear_refinements
+      refinements.each do |_, mod|
+        mod.module_eval do
+          instance_methods.each do |m|
+            remove_method m
+          end
+        end
+      end
     end
   end
 end

data/lib/motion_blender/dependency_graph.rb

@@ -4,7 +4,7 @@ module MotionBlender
   class DependencyGraph < Hash
     include TSort
 
-    alias_method :tsort_each_node, :each_key
+    alias tsort_each_node each_key
 
     def tsort_each_child node, &block
       (self[node] || []).each(&block)

data/lib/motion_blender/interpreters/autoload_interpreter.rb

@@ -0,0 +1,23 @@
+require 'motion_blender/interpreters/require_interpreter'
+
+module MotionBlender
+  module Interpreters
+    class AutoloadInterpreter < RequireInterpreter
+      interprets :autoload
+
+      def interpret const_name, arg
+        req = super arg
+        req.autoload_const_name =
+          if object.is_a? Module
+            [*object.name.sub(/^#<.+?>::/, ''), const_name].join('::')
+          else
+            const_name.to_s
+          end
+      end
+    end
+
+    class ModuleAutoloadInterpreter < AutoloadInterpreter
+      interprets :autoload, receiver: Module
+    end
+  end
+end

data/lib/motion_blender/interpreters/base.rb

@@ -22,6 +22,7 @@ module MotionBlender
       end
 
       attr_reader :collector
+      attr_accessor :object
       delegate :method, :receiver, to: :class
       delegate :source, :requires, to: :collector
       delegate :file, to: :source

data/lib/motion_blender/interpreters/original_interpreter.rb

@@ -9,7 +9,7 @@ module MotionBlender
 
       def interpret
         dir = MotionBlender.config.motion_dirs.find { |d| file.start_with? d }
-        fail 'not found in motion_dirs' unless dir
+        raise '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

data/lib/motion_blender/interpreters/requirable.rb

@@ -16,13 +16,12 @@ module MotionBlender
         req.file = resolve_path req.arg
         return if excluded_file? req.file
 
-        yield req
-        true
+        req
       end
 
       def resolve_path arg
         path = candidates(arg).find(&:file?)
-        fail LoadError, "not found `#{arg}'" unless path
+        raise LoadError, "not found `#{arg}'" unless path
         explicit_relative path
       end
 

data/lib/motion_blender/interpreters/require_interpreter.rb

@@ -8,8 +8,10 @@ module MotionBlender
       interprets :require
 
       def interpret arg
-        find_require(arg) do |req|
+        req = find_require(arg)
+        if req
           requires << req
+          req
         end
       end
 

data/lib/motion_blender/interpreters/require_relative_interpreter.rb

@@ -1,17 +1,10 @@
-require 'motion_blender/interpreters/base'
+require 'motion_blender/interpreters/require_interpreter'
 
 module MotionBlender
   module Interpreters
-    class RequireRelativeInterpreter < Base
-      include Requirable
+    class RequireRelativeInterpreter < RequireInterpreter
       interprets :require_relative
 
-      def interpret arg
-        find_require(arg) do |req|
-          requires << req
-        end
-      end
-
       def candidates arg
         path = Pathname.new(file).dirname.join(arg)
         exts = path.extname.empty? ? ['', '.rb'] : ['']

data/lib/motion_blender/require.rb

@@ -7,7 +7,7 @@ module MotionBlender
     define_callbacks :require
 
     attr_reader :loader, :method, :arg
-    attr_accessor :trace, :file
+    attr_accessor :trace, :file, :autoload_const_name
 
     def initialize loader, method, arg
       @loader = loader
@@ -18,5 +18,9 @@ module MotionBlender
     def match? arg_or_file
       [arg, file].compact.include?(arg_or_file)
     end
+
+    def autoload?
+      method == :autoload
+    end
   end
 end

data/lib/motion_blender/source.rb

@@ -1,8 +1,16 @@
 require 'parser/current'
 require 'motion_blender/flag_attribute'
+require 'motion_blender/source/wrapping_modules'
+require 'motion_blender/source/global_constants'
+require 'motion_blender/source/referring_constants'
 
 module MotionBlender
   class Source
+    include FlagAttribute
+    include WrappingModules
+    include GlobalConstants
+    include ReferringConstants
+
     def self.parse code, attrs = {}
       attrs[:ast] = ::Parser::CurrentRuby.parse(code)
       new(attrs)
@@ -13,8 +21,6 @@ module MotionBlender
       new(ast: ast)
     end
 
-    include FlagAttribute
-
     attr_reader :code, :file, :line, :parent, :type, :method, :ast
     flag_attribute :evaluated
 
@@ -42,13 +48,31 @@ module MotionBlender
 
     def children
       @children ||=
-        if @ast
-          @ast.children.grep(::Parser::AST::Node).map do |ast|
-            Source.new(ast: ast, parent: self)
-          end
-        else
-          []
-        end
+        @ast
+        .try(:children).to_a
+        .select { |ast| ast.nil? || ast.is_a?(::Parser::AST::Node) }
+        .map { |ast| Source.new(ast: ast, parent: self) }
+    end
+
+    def child_at *args
+      i = args.shift
+      args.present? ? children[i].child_at(*args) : children[i]
+    end
+
+    def root?
+      parent.nil?
+    end
+
+    def root
+      root? ? self : parent.root
+    end
+
+    def ancestors
+      root? ? [self] : [self, *parent.ancestors]
+    end
+
+    def like_module?
+      type.module? || type.class?
     end
 
     def attributes
@@ -57,7 +81,9 @@ module MotionBlender
         'file' => @file,
         'line' => @line,
         'type' => @type.to_s,
-        'method' => @method.try(:to_s)
+        'method' => @method.try(:to_s),
+        'global_constants' => global_constants,
+        'wrapping_modules' => wrapping_modules
       }
     end
   end

data/lib/motion_blender/source/global_constants.rb

@@ -0,0 +1,24 @@
+module MotionBlender
+  class Source
+    module GlobalConstants
+      def global_constants
+        @global_constants ||=
+          if root?
+            Array.wrap(find_global_constants).flatten.compact.uniq
+          else
+            root.global_constants
+          end
+      end
+
+      def find_global_constants
+        if like_module?
+          if children.first.type.const?
+            children.first.code.split('::', 2).first
+          end
+        else
+          children.compact.map(&:find_global_constants)
+        end
+      end
+    end
+  end
+end

data/lib/motion_blender/source/referring_constants.rb

@@ -0,0 +1,22 @@
+module MotionBlender
+  class Source
+    module ReferringConstants
+      def referring_constants
+        @referring_constants ||=
+          begin
+            child_constants =
+              children.map(&:referring_constants).inject(&:+).to_a
+            if referring_constant?
+              child_constants + [[wrapping_modules.map(&:last), code]]
+            else
+              child_constants.dup
+            end
+          end
+      end
+
+      def referring_constant?
+        type.const?
+      end
+    end
+  end
+end

data/lib/motion_blender/source/wrapping_modules.rb

@@ -0,0 +1,24 @@
+module MotionBlender
+  class Source
+    module WrappingModules
+      def wrapping_modules
+        @wrapping_modules ||=
+          [*parent.try(:wrapping_modules), parent_module].compact
+      end
+
+      def parent_module
+        if module_content? || class_content?
+          [parent.type.to_s, parent.children.first.code]
+        end
+      end
+
+      def module_content?
+        parent && parent.type.module? && (parent.children[1] == self)
+      end
+
+      def class_content?
+        parent && parent.type.class? && (parent.children[2] == self)
+      end
+    end
+  end
+end

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'.freeze
 end

data/motion/motion_blender/ext/suppressors.rb

@@ -5,6 +5,14 @@ class Object
   def require_relative *_
   end
 
+  def autoload *_
+  end
+
   def __ORIGINAL__ *_
   end
 end
+
+class Module
+  def autoload *_
+  end
+end

data/motion_blender.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'parser'
+  spec.add_runtime_dependency 'parser', '~> 2.3.1'
   spec.add_runtime_dependency 'activesupport', '~> 4.2'
   spec.add_runtime_dependency 'colorable', '~> 0.2'
   spec.add_runtime_dependency 'ruby-graphviz', '~> 1.2'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,7 @@ files:
 - lib/motion_blender/flag_attribute.rb
 - lib/motion_blender/graph_maker.rb
 - lib/motion_blender/interpreters.rb
+- lib/motion_blender/interpreters/autoload_interpreter.rb
 - lib/motion_blender/interpreters/base.rb
 - lib/motion_blender/interpreters/original_interpreter.rb
 - lib/motion_blender/interpreters/requirable.rb
@@ -276,6 +277,9 @@ files:
 - lib/motion_blender/rake_tasks.rb
 - lib/motion_blender/require.rb
 - lib/motion_blender/source.rb
+- lib/motion_blender/source/global_constants.rb
+- lib/motion_blender/source/referring_constants.rb
+- lib/motion_blender/source/wrapping_modules.rb
 - lib/motion_blender/version.rb
 - motion/motion_blender/ext.rb
 - motion/motion_blender/ext/runtime.rb