motion_blender 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5702d8540efa7410bdfbdeb2310dabba7669002b
-  data.tar.gz: 65874dc4ed3a275906aeee85b8200ce82f5ad254
+  metadata.gz: 4e0a26f4930010d2e1105308d10fb471cc3e3892
+  data.tar.gz: f537cd46e5096820fc007f634aa127384a7d9bfe
 SHA512:
-  metadata.gz: 23937538ee2436fdc637771e9f51f4f087f841c7d859c68fc7efbd65863d1f8da363484a9131823b7f1f2bdd3c32a65e3052ec6c30f6fcae93c177c3493b4fd3
-  data.tar.gz: fb2e5bab0da21a3f99070c8e280994cea6e75b53373d3d232c61aaa07b8440d50765f64f30211f8fadbf642dea5005a8e9aca86e122809c577449510f9346a54
+  metadata.gz: bafb18c7858a0d59a7c341ebc1ed6ae809622b3b86c99d9435e0992cc36cead2e819251249798fbca5db20b162363bb01c45d16332fe150c9cdf463d76fb6a0f
+  data.tar.gz: 9948b5186e33231b7d286d6b6b9cd013a3ae3c7a008e6954c4cc4ab13a70bb15a5475d14c64bf572088c416524fe0a3fd0ddd8c55c617b42290d468940e2841f

data/.rubocop.yml

@@ -7,14 +7,15 @@ AllCops:
     - 'db/**/*'
     - 'config/**/*'
 
-Lint/Eval:
-  Exclude:
-    - 'lib/motion_blender/analyzer/parser.rb'
-
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 20
 
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/**/*'
+
 Metrics/AbcSize:
   Max: 25
 
@@ -64,7 +65,6 @@ Style/MethodDefParentheses:
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MethodName:
   Exclude:
-    - 'lib/motion_blender/analyzer/evaluator.rb'
     - 'motion/motion_blender/**/*.rb'
 
 # Cop supports --auto-correct.

data/.travis.yml

@@ -1,4 +1,8 @@
+os: osx
 language: ruby
 rvm:
   - 2.2.3
-before_install: gem install bundler -v 1.10.6
+before_install:
+  - gem install bundler -v 1.10.6
+  - brew update
+  - brew install graphviz --with-gts

data/lib/motion_blender/analyzer/evaluator.rb

@@ -1,6 +1,4 @@
-require 'motion_blender/analyzer/source'
-require 'motion_blender/analyzer/require'
-require 'motion_blender/analyzer/original_finder'
+require 'motion_blender/collector'
 
 module MotionBlender
   class Analyzer
@@ -19,11 +17,9 @@ module MotionBlender
 
       def run
         return if @source.evaluated?
-
         @source.evaluated!
-        extractor = Extractor.new(@source.file)
-        extractor.instance_eval(@source.code, @source.file, @source.line)
-        @requires = extractor.instance_variable_get(:@_args) || []
+
+        @requires = Collector.collect_requires(@source)
         @requires.each do |req|
           req.trace = @trace
         end
@@ -39,26 +35,6 @@ module MotionBlender
         @dynamic = true
         run
       end
-
-      class Extractor
-        def initialize file
-          @_file = file
-        end
-
-        Require::TOKENS.each do |method|
-          define_method method do |arg|
-            req = Require.new(@_file, method, arg)
-            unless req.excluded?
-              @_args ||= []
-              @_args << req
-            end
-          end
-        end
-
-        def __ORIGINAL__
-          OriginalFinder.new(@_file).find
-        end
-      end
     end
   end
 end

data/lib/motion_blender/analyzer/parser.rb

@@ -1,10 +1,8 @@
-require 'parser/current'
 require 'active_support'
 require 'active_support/callbacks'
 
-require 'motion_blender/analyzer/source'
+require 'motion_blender/analyzer/cache'
 require 'motion_blender/analyzer/evaluator'
-require 'motion_blender/analyzer/require'
 
 module MotionBlender
   class Analyzer
@@ -22,8 +20,7 @@ module MotionBlender
       def parse
         srcs = cache.fetch do
           run_callbacks :parse do
-            ast = ::Parser::CurrentRuby.parse_file(@file)
-            ast && traverse(Source.new(ast: ast))
+            traverse(Source.parse_file(@file))
             @evaluators.map(&:source).map(&:attributes)
           end
         end
@@ -40,9 +37,9 @@ module MotionBlender
       end
 
       def traverse source
-        if require_command?(source)
+        if Collector.requirable?(source)
           evaluate source
-        elsif !raketime_block?(source)
+        elsif Collector.acceptable?(source)
           source.children.each { |src| traverse src }
         end
       end
@@ -59,15 +56,6 @@ module MotionBlender
       def last_trace
         @evaluators.last.try :trace
       end
-
-      def require_command? source
-        source.type.send? && Require.acceptable?(source.method)
-      end
-
-      def raketime_block? source
-        source.type.block? &&
-          (source.children.first.code == 'MotionBlender.raketime')
-      end
     end
   end
 end

data/lib/motion_blender/analyzer.rb

@@ -1,11 +1,11 @@
 require 'set'
 require 'pathname'
+require 'motion_blender/interpreters'
 require 'motion_blender/analyzer/parser'
-require 'motion_blender/analyzer/cache'
 
 module MotionBlender
   class Analyzer
-    attr_reader :files, :dependencies, :cache
+    attr_reader :files, :dependencies
 
     def initialize
       @analyzed_files = Set.new

data/lib/motion_blender/callbacks.rb

@@ -11,7 +11,7 @@ module MotionBlender
     def on_require file = nil, &proc
       filters = {}
       filters[:if] = -> { match? file } if file
-      Analyzer::Require.set_callback(:require, filters, &proc)
+      Require.set_callback(:require, filters, &proc)
     end
   end
 

data/lib/motion_blender/collector.rb

@@ -0,0 +1,76 @@
+require 'motion_blender/source'
+require 'motion_blender/require'
+
+module MotionBlender
+  class Collector
+    class << self
+      def interpreters
+        @interpreters ||= []
+      end
+
+      def register interpreter
+        interpreters << interpreter
+        interpreter
+      end
+
+      def requirable? source
+        interpreters.each_with_object(source).any?(&:requirable?)
+      end
+
+      def acceptable? source
+        !source.type.block? ||
+          (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
+        end
+        Object.new.instance_eval(source.code, source.file, source.line)
+        collector.requires
+      ensure
+        clear_refinements
+      end
+
+      private
+
+      def refinements
+        @refinements ||= {}
+      end
+
+      def get_refinement_for klass
+        refinements[klass] ||=
+          begin
+            Module.new do
+              klass.prepend self
+            end
+          end
+      end
+
+      def clear_refinements
+        refinements.each do |_, mod|
+          mod.module_eval do
+            instance_methods.each do |m|
+              remove_method m
+            end
+          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 = []
+    end
+  end
+end

data/lib/motion_blender/config.rb

@@ -10,7 +10,7 @@ module MotionBlender
       @incepted_files = []
       @excepted_files = Set.new
       @motion_dirs = []
-      @builtin_features = Set.new %w(bigdecimal rational date thread)
+      @builtin_features = Set.new %w(bigdecimal rational date)
       @cache_dir = Pathname.new('build/analyze')
     end
   end

data/lib/motion_blender/dependency_graph.rb

@@ -0,0 +1,13 @@
+require 'tsort'
+
+module MotionBlender
+  class DependencyGraph < Hash
+    include TSort
+
+    alias_method :tsort_each_node, :each_key
+
+    def tsort_each_child node, &block
+      (self[node] || []).each(&block)
+    end
+  end
+end

data/lib/motion_blender/ext/runtime.rb

@@ -0,0 +1,4 @@
+MotionBlender.incept
+MotionBlender.use_motion_dir
+
+require 'motion_blender/ext'

data/lib/motion_blender/ext.rb

@@ -1,4 +1,2 @@
-MotionBlender.incept
-MotionBlender.use_motion_dir
-
-require 'motion_blender/ext'
+require 'motion_blender/ext/raketime'
+require 'motion_blender/ext/runtime'

data/lib/motion_blender/flag_attribute.rb

@@ -0,0 +1,23 @@
+module MotionBlender
+  module FlagAttribute
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def flag_attribute *args
+        args.each do |attr|
+          define_method "#{attr}?" do
+            !!instance_variable_get("@#{attr}")
+          end
+
+          define_method "#{attr}!" do
+            instance_variable_set "@#{attr}", true
+          end
+
+          define_method "reset_#{attr}!" do
+            instance_variable_set "@#{attr}", false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/motion_blender/interpreters/base.rb

@@ -0,0 +1,34 @@
+require 'motion_blender/collector'
+
+module MotionBlender
+  module Interpreters
+    class Base
+      class << self
+        attr_reader :method, :receiver
+
+        def interprets method, options = {}
+          @method = method
+          @receiver = options[:receiver] || Object
+          Collector.register self
+        end
+
+        def key
+          [@receiver, @method]
+        end
+
+        def requirable? _
+          false
+        end
+      end
+
+      attr_reader :collector
+      delegate :method, :receiver, to: :class
+      delegate :source, :requires, to: :collector
+      delegate :file, to: :source
+
+      def initialize collector
+        @collector = collector
+      end
+    end
+  end
+end

data/lib/motion_blender/interpreters/original_interpreter.rb

@@ -0,0 +1,28 @@
+require 'motion_blender/interpreters/base'
+
+module MotionBlender
+  module Interpreters
+    class OriginalInterpreter < Base
+      interprets :__ORIGINAL__
+
+      attr_reader :original
+
+      def interpret
+        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
+
+      private
+
+      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/interpreters/requirable.rb

@@ -0,0 +1,45 @@
+module MotionBlender
+  module Interpreters
+    module Requirable
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def requirable? source
+          source.type.send? && (source.method == method)
+        end
+      end
+
+      def find_require arg
+        return if excluded_arg? arg
+
+        req = Require.new(file, method, arg)
+        req.file = resolve_path req.arg
+        return if excluded_file? req.file
+
+        yield req
+        true
+      end
+
+      def resolve_path arg
+        path = candidates(arg).find(&:file?)
+        fail LoadError, "not found `#{arg}'" unless path
+        explicit_relative path
+      end
+
+      private
+
+      def excluded_arg? arg
+        MotionBlender.config.builtin_features.include?(arg) ||
+          MotionBlender.config.excepted_files.include?(arg)
+      end
+
+      def excluded_file? file
+        MotionBlender.config.excepted_files.include?(file)
+      end
+
+      def explicit_relative path
+        path.to_s.sub(%r{^(?![\./])}, './')
+      end
+    end
+  end
+end

data/lib/motion_blender/interpreters/require_interpreter.rb

@@ -0,0 +1,34 @@
+require 'motion_blender/interpreters/base'
+require 'motion_blender/interpreters/requirable'
+
+module MotionBlender
+  module Interpreters
+    class RequireInterpreter < Base
+      include Requirable
+      interprets :require
+
+      def interpret arg
+        find_require(arg) do |req|
+          requires << req
+        end
+      end
+
+      def candidates arg
+        path = Pathname.new(arg)
+        dirs = 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
+
+      private
+
+      def load_path
+        MotionBlender.config.motion_dirs + $LOAD_PATH
+      end
+    end
+  end
+end

data/lib/motion_blender/interpreters/require_relative_interpreter.rb

@@ -0,0 +1,26 @@
+require 'motion_blender/interpreters/base'
+
+module MotionBlender
+  module Interpreters
+    class RequireRelativeInterpreter < Base
+      include Requirable
+      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'] : ['']
+        Enumerator.new do |y|
+          exts.each do |ext|
+            y << Pathname.new("#{path}#{ext}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/motion_blender/interpreters.rb

@@ -0,0 +1 @@
+Dir[File.expand_path('../interpreters/*.rb', __FILE__)].each { |f| require f }

data/lib/motion_blender/rake_tasks.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'motion_blender/config'
 require 'motion_blender/analyzer'
 require 'motion_blender/graph_maker'
+require 'motion_blender/dependency_graph'
 
 module MotionBlender
   class RakeTasks
@@ -21,6 +22,7 @@ module MotionBlender
 
     def apply
       analyzer = analyze
+      verify_dependencies analyzer.dependencies
       Motion::Project::App.setup do |app|
         new_files = analyzer.files - app.files
         app.exclude_from_detect_dependencies += new_files
@@ -42,6 +44,12 @@ module MotionBlender
       graph_maker.build
       Motion::Project::App.info('Create', graph_maker.output)
     end
+
+    private
+
+    def verify_dependencies hash
+      DependencyGraph[hash].tsort
+    end
   end
 end
 

data/lib/motion_blender/require.rb

@@ -0,0 +1,22 @@
+require 'active_support'
+require 'active_support/callbacks'
+
+module MotionBlender
+  class Require
+    include ActiveSupport::Callbacks
+    define_callbacks :require
+
+    attr_reader :loader, :method, :arg
+    attr_accessor :trace, :file
+
+    def initialize loader, method, arg
+      @loader = loader
+      @method = method
+      @arg = arg
+    end
+
+    def match? arg_or_file
+      [arg, file].compact.include?(arg_or_file)
+    end
+  end
+end

data/lib/motion_blender/source.rb

@@ -0,0 +1,64 @@
+require 'parser/current'
+require 'motion_blender/flag_attribute'
+
+module MotionBlender
+  class Source
+    def self.parse code, attrs = {}
+      attrs[:ast] = ::Parser::CurrentRuby.parse(code)
+      new(attrs)
+    end
+
+    def self.parse_file file
+      ast = ::Parser::CurrentRuby.parse_file(file)
+      new(ast: ast)
+    end
+
+    include FlagAttribute
+
+    attr_reader :code, :file, :line, :parent, :type, :method, :ast
+    flag_attribute :evaluated
+
+    def initialize attrs = {}
+      @evaluated = false
+      ast = attrs.delete :ast
+      if ast
+        @code = ast.loc.expression.try(:source)
+        @file = ast.loc.expression.try(:source_buffer).try(:name)
+        @line = ast.loc.expression.try(:line)
+        @type = ast.type.to_s.inquiry
+        @method = @type.send? ? ast.children[1] : nil
+        @ast = ast
+      end
+      attrs.each do |k, v|
+        instance_variable_set "@#{k}", v
+      end
+      @type = @type.to_s.inquiry
+      @method = @method.try(:to_sym)
+    end
+
+    def to_s
+      "#{file}:#{line}:in `#{method || type}'"
+    end
+
+    def children
+      @children ||=
+        if @ast
+          @ast.children.grep(::Parser::AST::Node).map do |ast|
+            Source.new(ast: ast, parent: self)
+          end
+        else
+          []
+        end
+    end
+
+    def attributes
+      {
+        'code' => @code,
+        'file' => @file,
+        'line' => @line,
+        'type' => @type.to_s,
+        'method' => @method.try(:to_s)
+      }
+    end
+  end
+end

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/motion_blender.rb

@@ -4,7 +4,6 @@ require 'active_support/core_ext'
 require 'motion_blender/version'
 require 'motion_blender/rake_tasks'
 require 'motion_blender/callbacks'
-require 'motion_blender/ext/raketime'
 require 'motion_blender/ext'
 
 MotionBlender.except

data/motion/motion_blender/ext/suppressors.rb

@@ -0,0 +1,10 @@
+class Object
+  def require *_
+  end
+
+  def require_relative *_
+  end
+
+  def __ORIGINAL__ *_
+  end
+end

data/motion/motion_blender/ext.rb

@@ -1,2 +1,2 @@
 require 'motion_blender/ext/runtime'
-require 'motion_blender/ext/require_suppressor'
+require 'motion_blender/ext/suppressors'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -257,20 +257,29 @@ files:
 - lib/motion_blender/analyzer.rb
 - lib/motion_blender/analyzer/cache.rb
 - lib/motion_blender/analyzer/evaluator.rb
-- lib/motion_blender/analyzer/original_finder.rb
 - lib/motion_blender/analyzer/parser.rb
-- lib/motion_blender/analyzer/require.rb
-- lib/motion_blender/analyzer/source.rb
 - lib/motion_blender/callbacks.rb
+- lib/motion_blender/collector.rb
 - lib/motion_blender/config.rb
+- lib/motion_blender/dependency_graph.rb
 - lib/motion_blender/ext.rb
 - lib/motion_blender/ext/raketime.rb
+- lib/motion_blender/ext/runtime.rb
+- lib/motion_blender/flag_attribute.rb
 - lib/motion_blender/graph_maker.rb
+- lib/motion_blender/interpreters.rb
+- lib/motion_blender/interpreters/base.rb
+- lib/motion_blender/interpreters/original_interpreter.rb
+- lib/motion_blender/interpreters/requirable.rb
+- lib/motion_blender/interpreters/require_interpreter.rb
+- lib/motion_blender/interpreters/require_relative_interpreter.rb
 - lib/motion_blender/rake_tasks.rb
+- lib/motion_blender/require.rb
+- lib/motion_blender/source.rb
 - lib/motion_blender/version.rb
 - motion/motion_blender/ext.rb
-- motion/motion_blender/ext/require_suppressor.rb
 - motion/motion_blender/ext/runtime.rb
+- motion/motion_blender/ext/suppressors.rb
 - motion_blender.gemspec
 homepage: https://github.com/kayhide/motion_blender
 licenses:

data/lib/motion_blender/analyzer/original_finder.rb

@@ -1,26 +0,0 @@
-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/require.rb

@@ -1,75 +0,0 @@
-require 'active_support'
-require 'active_support/callbacks'
-
-module MotionBlender
-  class Analyzer
-    class Require
-      include ActiveSupport::Callbacks
-      define_callbacks :require
-
-      TOKENS = %i(motion_require require_relative 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 = 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
-
-      def load_path
-        if uses_load_path?
-          MotionBlender.config.motion_dirs + $LOAD_PATH
-        end
-      end
-
-      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?(arg) ||
-          MotionBlender.config.excepted_files.include?(file)
-      end
-
-      def self.acceptable? method
-        TOKENS.include?(method)
-      end
-    end
-  end
-end

data/lib/motion_blender/analyzer/source.rb

@@ -1,52 +0,0 @@
-module MotionBlender
-  class Analyzer
-    class Source
-      attr_reader :code, :file, :line, :parent, :type, :method, :ast
-      attr_reader :evaluated
-      alias_method :evaluated?, :evaluated
-
-      def initialize attrs = {}
-        @evaluated = false
-        ast = attrs.delete :ast
-        if ast
-          @code = ast.loc.expression.try(:source)
-          @file = ast.loc.expression.try(:source_buffer).try(:name)
-          @line = ast.loc.expression.try(:line)
-          @type = ast.type.to_s.inquiry
-          @method = @type.send? ? ast.children[1] : nil
-          @ast = ast
-        end
-        attrs.each do |k, v|
-          instance_variable_set "@#{k}", v
-        end
-        @type = @type.to_s.inquiry
-        @method = @method.try(:to_sym)
-      end
-
-      def evaluated!
-        @evaluated = true
-      end
-
-      def children
-        @children ||=
-          if @ast
-            @ast.children.grep(::Parser::AST::Node).map do |ast|
-              Source.new(ast: ast, parent: self)
-            end
-          else
-            []
-          end
-      end
-
-      def attributes
-        {
-          'code' => @code,
-          'file' => @file,
-          'line' => @line,
-          'type' => @type.to_s,
-          'method' => @method.try(:to_s)
-        }
-      end
-    end
-  end
-end

data/motion/motion_blender/ext/require_suppressor.rb

@@ -1,15 +0,0 @@
-Module.new do
-  def require _
-  end
-
-  def require_relative _
-  end
-
-  def motion_require _
-  end
-
-  def __ORIGINAL__
-  end
-
-  Object.send :include, self
-end