motion-require 0.0.2 → 0.0.3

data/Rakefile

@@ -1 +1,4 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')

data/lib/motion-require/ext.rb

@@ -0,0 +1,35 @@
+# Hack until HipByte accepts https://github.com/HipByte/RubyMotion/pull/82
+# Stolen from BubbleWrap
+module Motion
+  module Require
+    module Ext
+      module ConfigTask
+
+        def self.included(base)
+          base.class_eval do
+            alias_method :files_dependencies_without_require, :files_dependencies
+            alias_method :files_dependencies, :files_dependencies_with_require
+          end
+        end
+
+        def files_dependencies_with_require(deps_hash)
+          res_path = lambda do |x|
+            path = /^\.?\//.match(x) ? x : File.join('.', x)
+            unless @files.flatten.include?(path)
+              Motion::Project::App.send(:fail, "Can't resolve dependency `#{x}'")
+            end
+            path
+          end
+          deps_hash.each do |path, deps|
+            deps = [deps] unless deps.is_a?(Array)
+            @dependencies[res_path.call(path)] = deps.map(&res_path)
+          end
+        end
+      end
+    end
+  end
+end
+
+if Motion.const_defined?("Project")
+  Motion::Project::Config.send(:include, Motion::Require::Ext::ConfigTask)
+end

data/lib/motion-require/version.rb

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

data/lib/motion-require.rb

@@ -1,41 +1,11 @@
 require 'ripper'
-
-# Hack until HipByte accepts https://github.com/HipByte/RubyMotion/pull/82
-# Stolen from BubbleWrap
-module Motion::Require
-  module Ext
-    module ConfigTask
-
-      def self.included(base)
-        base.class_eval do
-          alias_method :files_dependencies_without_require, :files_dependencies
-          alias_method :files_dependencies, :files_dependencies_with_require
-        end
-      end
-
-      def files_dependencies_with_require(deps_hash)
-        res_path = lambda do |x|
-          path = /^\.?\//.match(x) ? x : File.join('.', x)
-          unless @files.flatten.include?(path)
-            Motion::Project::App.send(:fail, "Can't resolve dependency `#{x}'")
-          end
-          path
-        end
-        deps_hash.each do |path, deps|
-          deps = [deps] unless deps.is_a?(Array)
-          @dependencies[res_path.call(path)] = deps.map(&res_path)
-        end
-      end
-    end
-  end
-end
-
-Motion::Project::Config.send(:include, Motion::Require::Ext::ConfigTask)
+require 'pathname'
+require_relative 'motion-require/ext'
 
 module Motion
   module Require
     class RequireBuilder < Ripper::SexpBuilder
-      REQUIREMENT_TOKEN = "motion_require"
+      REQUIREMENT_TOKENS = %w[motion_require require_relative]
 
       attr_accessor :requires
 
@@ -45,7 +15,7 @@ module Motion
 
       def on_command(command, args) # scanner event
         type, name, position = command
-        if name == REQUIREMENT_TOKEN
+        if REQUIREMENT_TOKENS.include?(name)
           file = parse_args(args)
           requires << file
         end
@@ -77,7 +47,7 @@ module Motion
             if required[-3..-1] != ".rb"
               required += ".rb"
             end
-            absolute_path(file_path, required)
+            resolve_path(file_path, required)
           }
           dependencies[file_path].unshift ext_file
         end
@@ -91,22 +61,27 @@ module Motion
       parser.requires
     end
 
-    def absolute_path(source, required)
-      File.expand_path(File.join(File.dirname(source), required.to_str))
+    # Join `required` to directory containing `source`.
+    # Preserves relative/absolute nature of source
+    def resolve_path(source, required)
+      Pathname.new(source).dirname.join(required.to_str).cleanpath.to_path
     end
 
     def all(files)
       Motion::Project::App.setup do |app|
         app.files << ext_file
-        files.each do |file|
-          app.files << file
-        end
-
+        app.files |= files.map { |f| explicit_relative(f) }
         dependencies = dependencies_for(files)
         app.files_dependencies dependencies
       end
     end
 
+    # RubyMotion prefers relative paths to be explicitly prefixed with ./
+    def explicit_relative(path)
+      # Paths that do not start with "/", "./", or "../" will be prefixed with ./
+      path.sub(%r(^(?!\.{0,2}/)), './')
+    end
+
     def ext_file
       File.expand_path(File.join(File.dirname(__FILE__), "../motion/ext.rb"))
     end

data/motion/ext.rb

@@ -3,4 +3,5 @@
 module Kernel
   def motion_require(*args)
   end
+  alias_method :require_relative, :motion_require
 end

data/motion-require.gemspec

@@ -12,4 +12,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split($\)
   s.require_paths = ["lib"]
+  s.test_files  = Dir.glob("spec/**/*.rb")
+  s.add_development_dependency 'rspec', '~> 2.5'
 end

data/spec/TestApp/app/app_delegate.rb

@@ -0,0 +1,5 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    true
+  end
+end

data/spec/motion_require_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Motion::Require do
+  it 'should run' do
+    true.should == true
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'rspec'
+require 'motion-require'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-require
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-04-05 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: Dependency management for RubyMotion, using a pseudo `require`
 email:
 - clay@usepropeller.com
@@ -24,9 +40,13 @@ files:
 - README.md
 - Rakefile
 - lib/motion-require.rb
+- lib/motion-require/ext.rb
 - lib/motion-require/version.rb
 - motion-require.gemspec
 - motion/ext.rb
+- spec/motion_require_spec.rb
+- spec/spec_helper.rb
+- spec/TestApp/app/app_delegate.rb
 homepage: https://github.com/clayallsopp/motion-require
 licenses: []
 post_install_message: 
@@ -51,4 +71,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dependency management for RubyMotion, using a pseudo `require`
-test_files: []
+test_files:
+- spec/motion_require_spec.rb
+- spec/spec_helper.rb
+- spec/TestApp/app/app_delegate.rb