motion_blender 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4453bab74e26706478046e31503f168eb4f7ea9a
-  data.tar.gz: 50a4811dd59a01f165228252ee61ebccb4131f20
+  metadata.gz: c76d8d1b39159de5422acb1a2483f60176b3a245
+  data.tar.gz: 247ea6963b4eb853c80c4660dab0d8e408c69dd0
 SHA512:
-  metadata.gz: d6d3128e4e23934d58f79e0e11ebf371f283255b531e3083ad91158f4cbc854e381ab2a0a112ac2165961f207d30651f538024ca841a45dd41663aa41017bf9c
-  data.tar.gz: 2ef7abbf5bd66df5c2b26800fa811b189c4cf29ef320dd7406307c7ca116803e6ab83855a153be00cda5933941c857ce7b642998e59804345843472af1c712d3
+  metadata.gz: e8f4329c0066cf08dae85cd5fb4ead5e74588213b829241da88bc42dad9fe4b69dbca2bfb1c59ffc4da9db48dd994a5779eb5f8794b5b051b39654adc9c29c19
+  data.tar.gz: 21c6f104b72287e9c5ae393f1c61d738475eaea0e7ea06ec90f3ddfbe250e7282d86c3c81d19a7c1fb92b37577df86c9adaa9be6db91a7ad2224673d4a7ae2d2

data/README.md

@@ -58,7 +58,7 @@ Add RubyMotion-compatible gem into your project (may be an application or a gem)
 And just call `require` from anywhare:
 
 ```ruby
-require 'rubymotion_conpatible_gem'
+require 'rubymotion_compatible_gem'
 
 # your code goes on...
 ```
@@ -68,18 +68,19 @@ Writing a gem (*motion_hoge*), this idiom is handy:
 ```ruby
 # in lib/motion_hoge.rb
 require 'motion_blender'
-MotionBlender.add __FILE__
+MotionBlender.incept
 
+require 'motion_hoge/version'
 require 'motion_hoge/simsim'
 require 'motion_hoge/mishmish'
-require 'motion_hoge/version'
 # ...
 ```
 
-This makes an app or a gem which depends on *motion_hoge* to load functionalities properly, even if it is compile-time.
+`MotionBlender.incept` adds this file to RubyMotion's `app.files` and targets for analyzing.
+To require this *motion_hoge* makes an application or a gem to load functionalities properly.
 
-As a default, `motion_blender` lib files themselves are excluded for analyzing.
-So don't worry about requiring `motion_blender` in compile target files.
+`motion_blender` itself is excepted for analyzing,
+so don't worry to require `motion_blender` in *incept*-ed files.
 
 ### Limitation
 

data/lib/motion_blender/analyzer/require.rb

@@ -26,7 +26,7 @@ module MotionBlender
           else
             Pathname.new(arg)
           end
-        dirs = (uses_load_path? && path.relative?) ? $LOAD_PATH : ['']
+        dirs = path.relative? && load_path || ['']
         exts = path.extname.empty? ? ['', '.rb'] : ['']
         Enumerator.new do |y|
           dirs.product(exts).each do |dir, ext|
@@ -42,6 +42,12 @@ module MotionBlender
       def uses_load_path?
         method == :require
       end
+
+      def load_path
+        if uses_load_path?
+          $LOAD_PATH
+        end
+      end
     end
   end
 end

data/lib/motion_blender/analyzer.rb

@@ -14,10 +14,11 @@ module MotionBlender
       @dependencies = {}
     end
 
-    def analyze file, backtrace = []
+    def analyze file, backtrace = [], &proc
       return if @exclude_files.include? file
       return if @analyzed_files.include? file
       @analyzed_files << file
+      proc.call file if proc
 
       parser = Parser.new file
       parser.exclude_files = @exclude_files
@@ -33,7 +34,7 @@ module MotionBlender
         @dependencies[file] = requires.map(&:file)
         @files = [*@files, file, *@dependencies[file]].uniq
         requires.each do |req|
-          analyze req.file, [req.trace, *backtrace]
+          analyze req.file, [req.trace, *backtrace], &proc
         end
       end
     end

data/lib/motion_blender/config.rb

@@ -0,0 +1,17 @@
+module MotionBlender
+  class Config
+    attr_reader :incepted_files, :excepted_files, :motion_dirs
+
+    def initialize
+      @incepted_files = []
+      @excepted_files = []
+      @motion_dirs = []
+    end
+  end
+
+  module_function
+
+  def config
+    @config ||= Config.new
+  end
+end

data/lib/motion_blender/ext/raketime.rb

@@ -0,0 +1,56 @@
+require 'motion_blender/config'
+
+module MotionBlender
+  module Ext
+    module Raketime
+      def incept file = nil
+        file ||= caller.first.split(':', 2).first
+        config.incepted_files << file
+      end
+
+      def except file = nil
+        file ||= caller.first.split(':', 2).first
+        config.excepted_files << file
+      end
+
+      def use_motion_dir dir = nil
+        return unless motion?
+
+        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
+        unless config.motion_dirs.include? dir
+          config.motion_dirs << dir
+          $LOAD_PATH.unshift dir
+        end
+      end
+
+      def motion?
+        !!(defined?(Motion) && defined?(Motion::Project))
+      end
+
+      def raketime?
+        true
+      end
+
+      def runtime?
+        false
+      end
+
+      def raketime
+        yield if motion?
+      end
+
+      def runtime
+      end
+    end
+  end
+
+  extend Ext::Raketime
+end

data/lib/motion_blender/ext/require_suppressor.rb

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

data/lib/motion_blender/ext/runtime.rb

@@ -0,0 +1,35 @@
+module MotionBlender
+  module Ext
+    module Runtime
+      def incept _ = nil
+      end
+
+      def except _ = nil
+      end
+
+      def use_motion_dir _ = nil
+      end
+
+      def motion?
+        true
+      end
+
+      def raketime?
+        false
+      end
+
+      def runtime?
+        true
+      end
+
+      def raketime &_
+      end
+
+      def runtime &proc
+        proc.call
+      end
+    end
+  end
+
+  extend Ext::Runtime
+end

data/lib/motion_blender/ext.rb

@@ -0,0 +1,6 @@
+MotionBlender.incept
+
+MotionBlender.runtime do
+  require 'motion_blender/ext/runtime'
+  require 'motion_blender/ext/require_suppressor'
+end

data/lib/motion_blender/rake_tasks.rb

@@ -1,9 +1,49 @@
 require 'rake'
-require 'motion_blender'
+require 'motion_blender/config'
+require 'motion_blender/analyzer'
+
+module MotionBlender
+  class RakeTasks
+    def config
+      MotionBlender.config
+    end
+
+    def analyze &proc
+      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
+        end
+      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
+    end
+
+    def builtin_features
+      %w(bigdecimal rational date thread)
+    end
+  end
+end
 
 namespace :motion_blender do
   task :analyze do
-    MotionBlender.analyze
+    tasks = MotionBlender::RakeTasks.new
+    tasks.analyze do |file|
+      Motion::Project::App.info('Analyze', file)
+    end
   end
 end
 

data/lib/motion_blender/version.rb

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

data/lib/motion_blender.rb

@@ -1,68 +1,6 @@
 require 'motion_blender/version'
-require 'motion_blender/analyzer'
 require 'motion_blender/rake_tasks'
+require 'motion_blender/ext/raketime'
+require 'motion_blender/ext'
 
-module MotionBlender
-  module_function
-
-  def analyze
-    Motion::Project::App.setup do |app|
-      analyzer = Analyzer.new
-      analyzer.exclude_files += Dir[File.expand_path('../**/*.rb', __FILE__)]
-      analyzer.exclude_files += builtin_features
-      app.files.flatten.each do |file|
-        analyzer.analyze file
-      end
-
-      if analyzer.files.any?
-        app.exclude_from_detect_dependencies += [ext_file, *analyzer.files]
-        app.files = [ext_file, *(analyzer.files - app.files), *app.files]
-        app.files_dependencies analyzer.dependencies
-      end
-    end
-  end
-
-  def add file = nil
-    return unless motion?
-
-    file ||= caller.first.split(':', 2).first
-    Motion::Project::App.setup do |app|
-      app.files.unshift file
-    end
-  end
-
-  def use_motion_dir dir = nil
-    return unless motion?
-
-    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
-
-  def motion?
-    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 rational date thread)
-  end
-end
+MotionBlender.except

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -231,9 +231,13 @@ files:
 - lib/motion_blender/analyzer/hooker.rb
 - lib/motion_blender/analyzer/parser.rb
 - lib/motion_blender/analyzer/require.rb
+- lib/motion_blender/config.rb
+- lib/motion_blender/ext.rb
+- lib/motion_blender/ext/raketime.rb
+- lib/motion_blender/ext/require_suppressor.rb
+- lib/motion_blender/ext/runtime.rb
 - lib/motion_blender/rake_tasks.rb
 - lib/motion_blender/version.rb
-- motion/ext.rb
 - motion_blender.gemspec
 homepage: https://github.com/kayhide/motion_blender
 licenses:

data/motion/ext.rb

@@ -1,33 +0,0 @@
-Module.new do
-  def require _
-  end
-
-  def require_relative _
-  end
-
-  def motion_require _
-  end
-
-  Object.send :include, self
-end
-
-module MotionBlender
-  module_function
-
-  def add _ = nil
-  end
-
-  def use_motion_dir _ = nil
-  end
-
-  def motion?
-    true
-  end
-
-  def raketime &_
-  end
-
-  def runtime &proc
-    proc.call
-  end
-end