motion-require 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0e3ca776d4929815ce73f741bf83029ccc2ca7
-  data.tar.gz: f080b2ccf72e2337e7181e67bcfe007ad14c2787
+  metadata.gz: 65d2009b53c5642252ae63eab604f55900d3bc46
+  data.tar.gz: 132b227bd9b8b57fc58bbb3937682205ea5db72a
 SHA512:
-  metadata.gz: 47a2a9cd4fd9590195fd6fad1bb67c06ac163a58b79038178c007941728a140e60b72e64ca90463e1816403557244b27532a42a079d90772c319713782a4d8a5
-  data.tar.gz: d8934f032d4a999ed0215927ad7de4960895dd3b959f3b847394ffec684903a542434ade5fd01bf5ae7af50db150ae9dc16d7636f3b3c5de85d8be4c75601273
+  metadata.gz: 0b1d2ecdd20c39be8644dae728e50b441ad7d85e88c70ea7965e704f982cc88f87550f7b0933d1b5182a064d21f2e17958b0c298cbfff5b06be5bae728282a7f
+  data.tar.gz: aa95e01fe0bfb2b2e296ebcd973b933a0219e11360027b64572e505e7e2eafed4dcfdd5d9dc4d26bb14c78e313d39bdb5bffffd55bec49d9ed4668850083beb3

data/lib/motion-require.rb

@@ -1,6 +1,5 @@
 require 'ripper'
 require 'pathname'
-require_relative 'motion-require/ext'
 
 module Motion
   module Require
@@ -89,13 +88,17 @@ module Motion
     # Scan specified files. When nil, fallback to RubyMotion's default (app/**/*.rb).
     def all(files=nil)
       Motion::Project::App.setup do |app|
+        app.exclude_from_detect_dependencies << ext_file
+
         if files.nil? || files.empty?
           app.files.push ext_file
+          app.exclude_from_detect_dependencies += app.files
           app.files_dependencies dependencies_for(app.files.flatten)
         else
         # Place files prior to those in ./app, otherwise at the end.
           preceding_app = app.files.index { |f| f =~ %r(^(?:\./)?app/) } || -1
           required = Array(files).map { |f| explicit_relative(f) }
+          app.exclude_from_detect_dependencies += required
           app.files.insert(preceding_app, ext_file, *required)
           app.files.uniq! # Prevent redundancy
 

data/lib/motion-require/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Require
-    VERSION="0.1.0"
+    VERSION="0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-require
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,7 +37,6 @@ files:
 - README.md
 - Rakefile
 - lib/motion-require.rb
-- lib/motion-require/ext.rb
 - lib/motion-require/version.rb
 - motion-require.gemspec
 - motion/ext.rb

data/lib/motion-require/ext.rb

@@ -1,35 +0,0 @@
-# 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