motion-require 0.0.3 → 0.0.4

data/README.md

@@ -17,7 +17,7 @@ end
 require 'motion/project'
 
 require 'motion-require'
-Motion::Require.all(Dir.glob("app/**/*.rb"))
+Motion::Require.all
 
 Motion::Project::App.setup do |app|
   # ...
@@ -26,6 +26,12 @@ end
 
 ![Whoa.](http://i.imgur.com/JLpjqkk.jpg)
 
+To enable `motion_require` for only select files:
+
+```ruby
+Motion::Require.all(Dir.glob('app/models/**/*.rb'))
+```
+
 It's used in:
 - [Formotion](https://github.com/clayallsopp/formotion)
 
@@ -39,7 +45,15 @@ Can also add to your `Gemfile` etc
 
 motion-require uses static analysis (via [`ripper`](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/ripper/rdoc/Ripper.html)) to find the files using `motion_require` and automatically add the declared dependencies to `Motion::Project::Config#dependencies`. Then the `Kernel#motion_require` method is overriden at compile-time to be a noop.
 
-The paths attached to `motion_require` are treated like those with `require_relative`.
+The paths attached to `motion_require` are treated like those with `require_relative`. If you want to use `require_relative` instead of `motion_require`, you can enable this:
+
+```ruby
+require 'motion-require'
+Motion::Require.require_relative_enabled = true
+
+# now Motion::Require will detect require_relative
+Motion::Require.all(Dir.glob("app/**/*.rb"))
+```
 
 ## Contact
 

data/lib/motion-require/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Require
-    VERSION="0.0.3"
+    VERSION="0.0.4"
   end
 end

data/lib/motion-require.rb

@@ -4,6 +4,11 @@ require_relative 'motion-require/ext'
 
 module Motion
   module Require
+
+    class << self
+      attr_accessor :require_relative_enabled
+    end
+
     class RequireBuilder < Ripper::SexpBuilder
       REQUIREMENT_TOKENS = %w[motion_require require_relative]
 
@@ -15,12 +20,19 @@ module Motion
 
       def on_command(command, args) # scanner event
         type, name, position = command
-        if REQUIREMENT_TOKENS.include?(name)
+        if valid_require_command(name)
           file = parse_args(args)
           requires << file
         end
       end
 
+      def valid_require_command(name)
+        if name == 'require_relative' && !Motion::Require.require_relative_enabled
+          raise NoMethodError, 'require_relative is not enabled, see Motion::Require.require_relative_enabled'
+        end
+        REQUIREMENT_TOKENS.include?(name)
+      end
+
       def parse_args(args)
         value = nil
         args.each do |arg|
@@ -44,10 +56,17 @@ module Motion
         requires = requires_in(file_path)
         if !requires.empty?
           dependencies[file_path] = requires.map { |required|
-            if required[-3..-1] != ".rb"
-              required += ".rb"
+            required_path = resolve_path(file_path, required)
+            if !File.exist?(required_path) && File.extname(required) != ".rb"
+              required_path += ".rb"
+            end
+
+            if !File.exist?(required_path)
+              # TODO: Report line number of failing require
+              raise LoadError, "ERROR! In `#{file_path}', could not require `#{required}', file not found."
             end
-            resolve_path(file_path, required)
+
+            required_path
           }
           dependencies[file_path].unshift ext_file
         end
@@ -67,11 +86,12 @@ module Motion
       Pathname.new(source).dirname.join(required.to_str).cleanpath.to_path
     end
 
-    def all(files)
+    # Scan specified files. When nil, fallback to RubyMotion's default (app/**/*.rb).
+    def all(files=nil)
       Motion::Project::App.setup do |app|
         app.files << ext_file
-        app.files |= files.map { |f| explicit_relative(f) }
-        dependencies = dependencies_for(files)
+        app.files |= Array(files).map { |f| explicit_relative(f) }
+        dependencies = dependencies_for(files || app.files)
         app.files_dependencies dependencies
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-require
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: