motion_blender 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7121d843e2bcddd5273bebf2813494d561a19bcb
-  data.tar.gz: c73a06ece8cc6fbd6abd0c4ea66a0d5042fd6b89
+  metadata.gz: d31c71624cf252cc727b8d45cf2a4bce2528f72d
+  data.tar.gz: 95f5637cd49eae8454f43a6c86dd76b8a23cd55a
 SHA512:
-  metadata.gz: 15e84edf8cc830f2ba39332cca4c690e883a352c2bd4437ef567274ce55ec33ba2691262aca1dbaba758c11f47cf375a10fcb96171b4ea18cf6e236fca355db3
-  data.tar.gz: e7fac9a8ea4c72eba203912e77ee78f51b3bf4346cd4a3767ee059a2439984fbd0a0bec74919cc8d5215f3e1c7f566b7de6d4991cc641b3eefb6c769acd798de
+  metadata.gz: 96d95574e04d3a78e216b2342ac79883805c5536321da913e8d24f4f5873d9794fd46402f59b18c136106c2f0551525bb5e4e158453ea77ce6172349d5299ace
+  data.tar.gz: 600d2675e5ea75eedd6b6e8cd55742b124837862de5abd5f00d6ba2e1e64c03f22a60fa77d21459172b6a2a4b57d2e544cd80689bdff1746b99df21ae69389e5

data/.rubocop.yml

@@ -64,6 +64,7 @@ Style/MethodDefParentheses:
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MethodName:
   Exclude:
+    - 'lib/motion_blender/analyzer/evaluator.rb'
     - 'motion/motion_blender/**/*.rb'
 
 # Cop supports --auto-correct.

data/lib/motion_blender.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 require 'motion_blender/version'
 require 'motion_blender/rake_tasks'
 require 'motion_blender/callbacks'

data/lib/motion_blender/analyzer.rb

@@ -11,7 +11,6 @@ module MotionBlender
       @analyzed_files = Set.new
       @files = []
       @dependencies = {}
-      @cache = Cache.new
     end
 
     def analyze file, backtrace = []
@@ -19,11 +18,9 @@ module MotionBlender
       return if @analyzed_files.include? file
       @analyzed_files << file
 
-      requires = @cache.fetch(file) do
-        parse file, backtrace
-      end
+      requires = parse file, backtrace
 
-      if requires.any?
+      if requires.present?
         @dependencies[file] = requires.map(&:file)
         @files = [*@files, file, *@dependencies[file]].uniq
         requires.each do |req|

data/lib/motion_blender/analyzer/cache.rb

@@ -1,45 +1,61 @@
 module MotionBlender
   class Analyzer
     class Cache
+      attr_reader :file, :hit
+      alias_method :hit?, :hit
+
+      def initialize file
+        @file = Pathname.new(file)
+      end
+
       def dir
         MotionBlender.config.cache_dir
       end
 
-      def fetch file
+      def fetch
         return yield unless dir
-        file = Pathname.new(file)
-        cache = cache_file_for(file)
-        if valid_cache?(file, cache)
-          read cache
+
+        @hit = valid?
+        if @hit
+          read
         else
           content = yield
-          write cache, content
+          write content
         end
       rescue YAML::Exception
-        if cache.exist?
-          cache.delete
-          retry
-        end
+        retry if delete
         raise
       end
 
-      def read file
-        YAML.load_file file
+      def read
+        YAML.load_file cache_file
       end
 
-      def write file, content
-        file.dirname.mkpath
-        file.write YAML.dump(content)
+      def write content
+        if content.nil?
+          delete
+        else
+          cache_file.dirname.mkpath
+          cache_file.write YAML.dump(content)
+        end
         content
       end
 
-      def valid_cache? file, cache
-        cache.file? && file.mtime < cache.mtime
+      def delete
+        cache_file.exist? && cache_file.delete
+      end
+
+      def valid?
+        cache_file.file? && @file.mtime < cache_file.mtime
       end
 
-      def cache_file_for file
-        file = file.relative_path_from(Pathname.new('/')) if file.absolute?
-        dir.join(file.to_s + '.yml')
+      def cache_file
+        @cache_file ||=
+          begin
+            path = @file
+            path = path.relative_path_from(Pathname.new('/')) if path.absolute?
+            dir.join(path.to_s + '.yml')
+          end
       end
     end
   end

data/lib/motion_blender/analyzer/evaluator.rb

@@ -1,22 +1,33 @@
+require 'motion_blender/analyzer/source'
 require 'motion_blender/analyzer/require'
 require 'motion_blender/analyzer/original_finder'
 
 module MotionBlender
   class Analyzer
     class Evaluator
-      attr_reader :file, :ast, :stack
+      attr_reader :source
+      attr_reader :trace, :requires
+      attr_reader :dynamic
+      alias_method :dynamic?, :dynamic
 
-      def initialize file, ast, stack = [], method = nil
-        @file = file
-        @ast = ast
-        @stack = stack
-        @method = method || @ast.children[1]
+      def initialize source
+        @source = source
+        @trace = "#{source.file}:#{source.line}:in `#{source.method}'"
+        @requires = []
+        @dynamic = false
       end
 
-      def parse_args
-        extractor = create_extractor
-        extractor.instance_eval(@ast.loc.expression.source, @file)
-        extractor.instance_eval { @_args || [] }
+      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.each do |req|
+          req.trace = @trace
+        end
+        self
       rescue ScriptError => err
         recover_from_script_error err
       rescue StandardError => err
@@ -24,33 +35,26 @@ module MotionBlender
       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
-          fail LoadError, err.message
-        end
+        @source = @source.parent while @source && !@source.type.rescue?
+        @source &&= @source.parent
+        fail LoadError, err.message unless @source
+        @dynamic = true
+        run
       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
+        @source = @source.parent
+        fail LoadError, err.message unless @source
+        @dynamic = true
+        run
       end
 
-      def create_extractor
-        file = @file
-        extractor = Evaluator.extractor_for(@method).new
-        extractor.instance_eval { @_file = file }
-        extractor
-      end
+      class Extractor
+        def initialize file
+          @_file = file
+        end
 
-      def self.extractor_for method
-        @extractor_classes ||= {}
-        @extractor_classes[method] ||= Class.new do
+        Require::TOKENS.each do |method|
           define_method method do |arg|
             req = Require.new(@_file, method, arg)
             unless req.excluded?
@@ -58,10 +62,10 @@ module MotionBlender
               @_args << req
             end
           end
+        end
 
-          define_method :__ORIGINAL__ do
-            OriginalFinder.new(@_file).find
-          end
+        def __ORIGINAL__
+          OriginalFinder.new(@_file).find
         end
       end
     end

data/lib/motion_blender/analyzer/parser.rb

@@ -2,7 +2,9 @@ require 'parser/current'
 require 'active_support'
 require 'active_support/callbacks'
 
+require 'motion_blender/analyzer/source'
 require 'motion_blender/analyzer/evaluator'
+require 'motion_blender/analyzer/require'
 
 module MotionBlender
   class Analyzer
@@ -10,49 +12,61 @@ module MotionBlender
       include ActiveSupport::Callbacks
       define_callbacks :parse
 
-      REQUIREMENT_TOKENS = %i(motion_require require_relative require)
-
-      attr_reader :file, :requires, :last_trace
+      attr_reader :file, :evaluators, :cache
 
       def initialize file
         @file = file.to_s
-        @requires = []
+        @evaluators = []
       end
 
       def parse
-        ast = ::Parser::CurrentRuby.parse(File.read(@file))
-        traverse ast if ast
+        srcs = cache.fetch do
+          ast = ::Parser::CurrentRuby.parse_file(@file)
+          ast && traverse(Source.new(ast: ast))
+          if @evaluators.present? && @evaluators.none?(&:dynamic?)
+            @evaluators.map(&:source).map(&:attributes)
+          end
+        end
+        if srcs && cache.hit?
+          srcs.each do |attrs|
+            evaluate Source.new(attrs)
+          end
+        end
+        self
       end
 
-      def traverse ast, stack = []
-        if require_command?(ast)
-          evaluate ast, stack
-        elsif !raketime_block?(ast)
-          ast.children
-            .select { |node| node.is_a?(::Parser::AST::Node) }
-            .each { |node| traverse node, [*stack, ast] }
-        end
+      def cache
+        @cache ||= Cache.new @file
       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
+      def traverse source
+        if require_command?(source)
+          evaluate source
+        elsif !raketime_block?(source)
+          source.children.each { |src| traverse src }
         end
       end
 
-      def require_command? ast
-        (ast.type == :send) && REQUIREMENT_TOKENS.include?(ast.children[1])
+      def evaluate source
+        @evaluators << Evaluator.new(source)
+        @evaluators.last.run
+      end
+
+      def requires
+        @evaluators.map(&:requires).flatten
+      end
+
+      def last_trace
+        @evaluators.last.try :trace
       end
 
-      def raketime_block? ast
-        (ast.type == :block) &&
-          (ast.children.first.loc.expression.source == 'MotionBlender.raketime')
+      def require_command? source
+        source.type.send? && Require.acceptable?(source.method)
       end
 
-      def trace_for ast
-        "#{@file}:#{ast.loc.line}:in `#{ast.children[1]}'"
+      def raketime_block? source
+        source.type.block? &&
+          (source.children.first.code == 'MotionBlender.raketime')
       end
     end
   end

data/lib/motion_blender/analyzer/require.rb

@@ -7,6 +7,8 @@ module MotionBlender
       include ActiveSupport::Callbacks
       define_callbacks :require
 
+      TOKENS = %i(motion_require require_relative require)
+
       attr_accessor :loader, :method, :arg, :trace
 
       def initialize loader, method, arg
@@ -63,6 +65,10 @@ module MotionBlender
         MotionBlender.config.builtin_features.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

@@ -0,0 +1,46 @@
+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
+      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
+        %w(code file line type method).map do |k|
+          [k, instance_variable_get("@#{k}")]
+        end.to_h.as_json
+      end
+    end
+  end
+end

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/motion_blender.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'parser'
+  spec.add_runtime_dependency 'activesupport', '~> 4.2'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
@@ -32,5 +33,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-gem-profile'
-  spec.add_development_dependency 'activesupport', '~> 4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 description: MotionBlender loads ruby gems for RubyMotion
 email:
 - kayhide@gmail.com
@@ -232,6 +232,7 @@ files:
 - 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/config.rb
 - lib/motion_blender/ext.rb