motion_blender 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f4f266de541f71f053210f9b089eb7a56fb77b
-  data.tar.gz: f30217e63c3c013a07862c1ea6f4413b749f6b26
+  metadata.gz: 4453bab74e26706478046e31503f168eb4f7ea9a
+  data.tar.gz: 50a4811dd59a01f165228252ee61ebccb4131f20
 SHA512:
-  metadata.gz: 8bbca25180fa862d2cdf18dc13589a6dfe8260b6972c19c4be497e25a48519571afe21537281111553f24a6114961262fe5c622b9cd344f7c5d1c918ca2db2f1
-  data.tar.gz: dc18bde83fe86c28bdd3e4fbbaf38ea7e8fc0c5a04c92acb3b51ef6ba843918b524d97af251ee98fcb46a8de404d284bfce475fab8cb5bd9d0ce2e703a5aabbe
+  metadata.gz: d6d3128e4e23934d58f79e0e11ebf371f283255b531e3083ad91158f4cbc854e381ab2a0a112ac2165961f207d30651f538024ca841a45dd41663aa41017bf9c
+  data.tar.gz: 2ef7abbf5bd66df5c2b26800fa811b189c4cf29ef320dd7406307c7ca116803e6ab83855a153be00cda5933941c857ce7b642998e59804345843472af1c712d3

data/lib/motion_blender/analyzer/parser.rb

@@ -24,7 +24,7 @@ module MotionBlender
 
       def traverse ast, stack = []
         @exclude_files ||= Set.new
-        if ast.type == :send && require_command?(ast)
+        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)
@@ -33,7 +33,7 @@ module MotionBlender
             req.trace = @last_trace
             @requires << req
           end
-        else
+        elsif !raketime_block?(ast)
           ast.children
             .select { |node| node.is_a?(::Parser::AST::Node) }
             .each { |node| traverse node, [*stack, ast] }
@@ -41,7 +41,12 @@ module MotionBlender
       end
 
       def require_command? ast
-        REQUIREMENT_TOKENS.include?(ast.children[1])
+        (ast.type == :send) && REQUIREMENT_TOKENS.include?(ast.children[1])
+      end
+
+      def raketime_block? ast
+        (ast.type == :block) &&
+          (ast.children.first.loc.expression.source == 'MotionBlender.raketime')
       end
 
       def trace_for ast

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/motion_blender.rb

@@ -34,7 +34,15 @@ module MotionBlender
   def use_motion_dir dir = nil
     return unless motion?
 
-    dir ||= File.expand_path('../../motion', caller.first.split(':', 2).first)
+    unless dir
+      file = caller.first.split(':', 2).first
+      Pathname.new(file).dirname.ascend do |path|
+        if $LOAD_PATH.include?(path.to_s)
+          dir = path.dirname.join('motion').to_s
+          break
+        end
+      end
+    end
     $LOAD_PATH.delete dir
     $LOAD_PATH.unshift dir
   end
@@ -43,11 +51,18 @@ module MotionBlender
     defined?(Motion::Project::Config)
   end
 
+  def raketime &proc
+    proc.call
+  end
+
+  def runtime &_
+  end
+
   def ext_file
     File.expand_path('../../motion/ext.rb', __FILE__)
   end
 
   def builtin_features
-    %w(bigdecimal date thread)
+    %w(bigdecimal rational date thread)
   end
 end

data/motion/ext.rb

@@ -23,4 +23,11 @@ module MotionBlender
   def motion?
     true
   end
+
+  def raketime &_
+  end
+
+  def runtime &proc
+    proc.call
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser