motion_blender 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76d8d1b39159de5422acb1a2483f60176b3a245
-  data.tar.gz: 247ea6963b4eb853c80c4660dab0d8e408c69dd0
+  metadata.gz: 592c1d9b0693a9bb79980b54a3ab373366f16fce
+  data.tar.gz: 997a92be2a98a1556d973d2d5b2581862ab6da90
 SHA512:
-  metadata.gz: e8f4329c0066cf08dae85cd5fb4ead5e74588213b829241da88bc42dad9fe4b69dbca2bfb1c59ffc4da9db48dd994a5779eb5f8794b5b051b39654adc9c29c19
-  data.tar.gz: 21c6f104b72287e9c5ae393f1c61d738475eaea0e7ea06ec90f3ddfbe250e7282d86c3c81d19a7c1fb92b37577df86c9adaa9be6db91a7ad2224673d4a7ae2d2
+  metadata.gz: 5dbd81dbda77d22774c9b081af0185b4a9adb9a682f6a8155fffa9594f0a127ec6e83684a07e337d977f728da0287b05ed588e0597b2332f1986d0ac6fb9b43d
+  data.tar.gz: 0d29f833f10aa9c79dc15d693e2b08ef1f090301b8720a1abb3196d24b8506d5c58fd39d93e48db36d8a061c344115fc6400531dfcd16684a572d63d106befcf

data/lib/motion_blender.rb

@@ -1,5 +1,6 @@
 require 'motion_blender/version'
 require 'motion_blender/rake_tasks'
+require 'motion_blender/callbacks'
 require 'motion_blender/ext/raketime'
 require 'motion_blender/ext'
 

data/lib/motion_blender/analyzer.rb

@@ -14,29 +14,35 @@ module MotionBlender
       @dependencies = {}
     end
 
-    def analyze file, backtrace = [], &proc
+    def analyze file, backtrace = []
       return if @exclude_files.include? file
       return if @analyzed_files.include? file
       @analyzed_files << file
-      proc.call file if proc
 
+      requires = parse file, backtrace
+      if requires.any?
+        @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
+        end
+      end
+    end
+
+    def parse file, backtrace
       parser = Parser.new file
       parser.exclude_files = @exclude_files
       begin
-        parser.parse
+        parser.run_callbacks :parse do
+          parser.parse
+        end
       rescue LoadError => err
         err.set_backtrace [parser.last_trace, *backtrace].compact
         raise err
       end
-
-      requires = parser.requires
-      if requires.any?
-        @dependencies[file] = requires.map(&:file)
-        @files = [*@files, file, *@dependencies[file]].uniq
-        requires.each do |req|
-          analyze req.file, [req.trace, *backtrace], &proc
-        end
-      end
+      parser.requires
     end
   end
 end

data/lib/motion_blender/analyzer/parser.rb

@@ -1,5 +1,6 @@
 require 'parser/current'
-require 'pathname'
+require 'active_support'
+require 'active_support/callbacks'
 
 require 'motion_blender/analyzer/evaluator'
 require 'motion_blender/analyzer/require'
@@ -7,6 +8,9 @@ require 'motion_blender/analyzer/require'
 module MotionBlender
   class Analyzer
     class Parser
+      include ActiveSupport::Callbacks
+      define_callbacks :parse
+
       REQUIREMENT_TOKENS = %i(motion_require require_relative require)
 
       attr_reader :file, :requires, :last_trace

data/lib/motion_blender/analyzer/require.rb

@@ -1,6 +1,12 @@
+require 'active_support'
+require 'active_support/callbacks'
+
 module MotionBlender
   class Analyzer
     class Require
+      include ActiveSupport::Callbacks
+      define_callbacks :require
+
       attr_accessor :loader, :method, :arg, :trace
 
       def initialize loader, method, arg
@@ -45,9 +51,13 @@ module MotionBlender
 
       def load_path
         if uses_load_path?
-          $LOAD_PATH
+          MotionBlender.config.motion_dirs + $LOAD_PATH
         end
       end
+
+      def match? arg_or_file
+        arg == arg_or_file || file == arg_or_file
+      end
     end
   end
 end

data/lib/motion_blender/callbacks.rb

@@ -0,0 +1,19 @@
+require 'motion_blender/analyzer'
+
+module MotionBlender
+  module Callbacks
+    def on_parse file = nil, &proc
+      filters = {}
+      filters[:if] = -> { self.file == file } if file
+      Analyzer::Parser.set_callback(:parse, filters, &proc)
+    end
+
+    def on_require file = nil, &proc
+      filters = {}
+      filters[:if] = -> { match? file } if file
+      Analyzer::Require.set_callback(:require, filters, &proc)
+    end
+  end
+
+  extend Callbacks
+end

data/lib/motion_blender/config.rb

@@ -14,4 +14,8 @@ module MotionBlender
   def config
     @config ||= Config.new
   end
+
+  def reset_config
+    @config = nil
+  end
 end

data/lib/motion_blender/ext/raketime.rb

@@ -27,7 +27,6 @@ module MotionBlender
         end
         unless config.motion_dirs.include? dir
           config.motion_dirs << dir
-          $LOAD_PATH.unshift dir
         end
       end
 

data/lib/motion_blender/rake_tasks.rb

@@ -8,28 +8,23 @@ module MotionBlender
       MotionBlender.config
     end
 
-    def analyze &proc
+    def analyze
+      analyzer = Analyzer.new
+      analyzer.exclude_files += builtin_features + config.excepted_files
       Motion::Project::App.setup do |app|
         files = config.incepted_files + app.files
-        analyzer = analyze_files files, &proc
-
-        if analyzer.files.any?
-          new_files = analyzer.files - app.files
-          app.exclude_from_detect_dependencies += new_files
-          app.files = new_files + app.files
-          app.files_dependencies analyzer.dependencies
+        files.flatten.each do |file|
+          analyzer.analyze file
         end
+        apply analyzer, app if analyzer.files.any?
       end
     end
 
-    def analyze_files files, &proc
-      analyzer = Analyzer.new
-      analyzer.exclude_files += [*builtin_features, *config.excepted_files]
-
-      files.flatten.each do |file|
-        analyzer.analyze file, &proc
-      end
-      analyzer
+    def apply analyzer, app
+      new_files = analyzer.files - app.files
+      app.exclude_from_detect_dependencies += new_files
+      app.files = new_files + app.files
+      app.files_dependencies analyzer.dependencies
     end
 
     def builtin_features
@@ -40,10 +35,10 @@ end
 
 namespace :motion_blender do
   task :analyze do
-    tasks = MotionBlender::RakeTasks.new
-    tasks.analyze do |file|
-      Motion::Project::App.info('Analyze', file)
+    MotionBlender.on_parse do |parser|
+      Motion::Project::App.info('Analyze', parser.file)
     end
+    MotionBlender::RakeTasks.new.analyze
   end
 end
 

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -231,6 +231,7 @@ files:
 - lib/motion_blender/analyzer/hooker.rb
 - lib/motion_blender/analyzer/parser.rb
 - lib/motion_blender/analyzer/require.rb
+- lib/motion_blender/callbacks.rb
 - lib/motion_blender/config.rb
 - lib/motion_blender/ext.rb
 - lib/motion_blender/ext/raketime.rb