motion-bundler 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5db7eef27452db03cec3069345404b2782c6e9d
+  data.tar.gz: f7e198110cf2ed95529df59957a5dc662e4bb8dc
+SHA512:
+  metadata.gz: 14a40f729b2ec900abb0f4f1e244617fb5a438f5b9b792baa63e9dab486cff3aa4d79547af3b74cdce96f287461182378a41eeaa8223b7655221cba2ac7356af
+  data.tar.gz: c5ddd7429a457a06d7ba1dd6296e13a83163b0b05226f44e321c79a0f4cc6cff882aaedb8f0512d029ede239d4957f864ad5117c1ecebfe2824712a104550066

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = MotionBundler CHANGELOG
 
+== Version 0.1.5 (May 30, 2013)
+
+* Being able to require multiple files (e.g. `require "./config/**/*.rb"` within `app/app_delegate.rb`)
+* Expanding paths when registering files and files dependencies
+* Corrected files order when registering
+* Fixed `duplicate symbol` error (for real this time)
+
 == Version 0.1.4 (May 29, 2013)
 
 * Not using colorize as gem dependency anymore: defining String#yellow, String#green, String#red in MotionBundler itself

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/motion-bundler/require/ripper.rb

@@ -29,33 +29,36 @@ module MotionBundler
 
       def parse
         @sources.each do |source|
-          next if @files_dependencies.include?(source)
+          next if @requires.include?(source)
           added_sources = []
 
           builder = Builder.new source
           builder.requires.each do |method, args|
-            (@requires[source] ||= []) << args[0]
 
-            file = begin
-              if method == :require_relative
-                File.expand_path("../#{args[0]}.rb", source)
-              else
-                Require.resolve(args[0])
+            (@requires[source] ||= []) << args[0]
+            ((arg = args[0]).include?("*.rb") ? Dir[arg] : [arg]).each do |file|
+              file = begin
+                if method == :require_relative
+                  File.expand_path("../#{file}.rb", source)
+                else
+                  Require.resolve(file)
+                end
               end
-            end
 
-            next if @sources.any?{|x| File.expand_path(x) == File.expand_path(file)}
+              @files << source
+              @files << file
 
-            if file.include?(File.expand_path("."))
-              added_sources << file
-            else
-              MotionBundler.app_require file
-            end
+              (@files_dependencies[source] ||= []) << file
+              expanded_path = File.expand_path(file)
 
-            @files << source
-            @files << file
-
-            (@files_dependencies[source] ||= []) << file
+              unless @sources.any?{|x| File.expand_path(x) == expanded_path}
+                if expanded_path.include?(MotionBundler::PROJECT_PATH)
+                  added_sources << file
+                else
+                  MotionBundler.app_require file
+                end
+              end
+            end
           end
 
           unless added_sources.empty?

data/lib/motion-bundler/version.rb

@@ -1,7 +1,7 @@
 module MotionBundler #:nodoc:
   MAJOR = 0
   MINOR = 1
-  TINY  = 4
+  TINY  = 5
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/lib/motion-bundler.rb

@@ -7,7 +7,8 @@ require "motion-bundler/version"
 module MotionBundler
   extend self
 
-  MOTION_BUNDLER_FILE = File.expand_path "./.motion-bundler.rb"
+  PROJECT_PATH = File.expand_path "."
+  MOTION_BUNDLER_FILE = "#{PROJECT_PATH}/.motion-bundler.rb"
 
   def app_require(file)
     app_requires << file
@@ -21,10 +22,14 @@ module MotionBundler
       ripper_require files, files_dependencies, required
       tracer_require files, files_dependencies, required, &block
 
-      app.files = files
-      app.files_dependencies files_dependencies
+      normalize! files
+      normalize! files_dependencies
+      required.sort!.uniq!
 
       write_motion_bundler files, files_dependencies, required
+
+      app.files = files
+      app.files_dependencies files_dependencies
     end
   end
 
@@ -57,11 +62,15 @@ private
   def ripper_require(files, files_dependencies, required)
     ripper = Require::Ripper.new *Dir["app/**/*.rb"].collect{|x| "./#{x}"}
 
-    files.replace(ripper.files + files).uniq!
-    files_dependencies.merge!(ripper.files_dependencies)
-
-    files_dependencies.each{|k, v| v.uniq!}
-    required.concat(ripper.requires.values.flatten).uniq!; required.sort!
+    files.replace(
+      ripper.files + files
+    )
+    files_dependencies.merge!(
+      ripper.files_dependencies
+    )
+    required.concat(
+      ripper.requires.values.flatten
+    )
   end
 
   def tracer_require(files, files_dependencies, required)
@@ -82,7 +91,7 @@ private
 
     files.replace(
       Require.files + files - ["APP", "BUNDLER", __FILE__]
-    ).uniq!
+    )
     files_dependencies.merge!(
       Require.files_dependencies.tap do |dependencies|
         (dependencies.delete("BUNDLER") || []).each do |file|
@@ -92,11 +101,9 @@ private
         dependencies.delete(__FILE__)
       end
     )
-
-    files_dependencies.each{|k, v| v.uniq!}
-    required.concat(Require.requires.values.flatten).uniq!; required.sort!
-
-    true
+    required.concat(
+      Require.requires.values.flatten
+    )
   end
 
   def write_motion_bundler(files, files_dependencies, required)
@@ -116,6 +123,24 @@ private
     end
   end
 
+  def normalize!(object)
+    object.replace(
+      if object.is_a?(Array)
+        object.inject(Set.new) do |a, v|
+          a << File.expand_path(v)
+          a
+        end.to_a.partition do |v|
+          (v == MOTION_BUNDLER_FILE) || !v.include?(PROJECT_PATH)
+        end.flatten
+      elsif object.is_a?(Hash)
+        object.inject({}) do |h, (k, v)|
+          (h[File.expand_path(k)] ||= []).concat normalize!(v)
+          h
+        end
+      end
+    )
+  end
+
   def pretty_inspect(object, indent = 0)
     if object.is_a?(Array)
       entries = object.collect{|x| "  #{pretty_inspect x, indent + 2}"}

data/test/.gemfiles/simulator/test_setup.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/paulengel/Sources/motion-bundler
   specs:
-    motion-bundler (0.1.3)
+    motion-bundler (0.1.5)
 
 PATH
   remote: /Users/paulengel/Sources/motion-bundler/test/gems/slot_machine

data/test/motion/simulator/test_setup.rb

@@ -22,7 +22,7 @@ module Motion
             /Users/paulengel/bar.rb
           )
 
-          Motion::Project::App.any_instance.expects(:files=).with([
+          Motion::Project::App.any_instance.expects(:files=).with(expand_paths [
             MotionBundler::MOTION_BUNDLER_FILE,
             motion_bundler_file("motion-bundler/simulator/boot.rb"),
             motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
@@ -41,7 +41,7 @@ module Motion
             "/Users/paulengel/bar.rb"
           ])
 
-          Motion::Project::App.any_instance.expects(:files_dependencies).with(
+          Motion::Project::App.any_instance.expects(:files_dependencies).with(expand_paths({
             motion_bundler_file("motion-bundler/simulator/boot.rb") => [
               motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
               motion_bundler_file("motion-bundler/simulator/console.rb")
@@ -56,7 +56,7 @@ module Motion
               gem_path("slot_machine/lib/time_slot.rb"),
               gem_path("slot_machine/lib/time_slots.rb")
             ]
-          )
+          }))
 
           MotionBundler.setup do |app|
             app.require "a"

data/test/test_helper.rb

@@ -37,6 +37,17 @@ def mocks_dir
   File.expand_path "../mocks", __FILE__
 end
 
+def expand_paths(paths)
+  if paths.is_a? Array
+    paths.collect{|v| File.expand_path v}
+  else
+    paths.inject({}) do |h, (k, v)|
+      h[File.expand_path(k)] = expand_paths(v)
+      h
+    end
+  end
+end
+
 def motion_gemfile(content)
   content = "source \"https://rubygems.org\"\n\n#{content}"
   dirname = File.dirname __FILE__

data/test/unit/require/test_ripper.rb

@@ -33,6 +33,18 @@ module Unit
           bar_builder.expects(:requires).returns []
           MotionBundler::Require::Ripper::Builder.expects(:new).with(File.expand_path("./app/controllers/bar.rb")).returns bar_builder
 
+          stringio_builder = mock "object"
+          stringio_builder.expects(:requires).returns []
+          MotionBundler::Require::Ripper::Builder.expects(:new).with("stdlib/stringio.rb").returns stringio_builder
+
+          strscan_builder = mock "object"
+          strscan_builder.expects(:requires).returns []
+          MotionBundler::Require::Ripper::Builder.expects(:new).with("mocks/strscan.rb").returns strscan_builder
+
+          lib_baz_builder = mock "object"
+          lib_baz_builder.expects(:requires).returns []
+          MotionBundler::Require::Ripper::Builder.expects(:new).with("lib/baz.rb").returns lib_baz_builder
+
           MotionBundler::Require.expects(:resolve).with("stringio").returns("stdlib/stringio.rb")
           MotionBundler::Require.expects(:resolve).with("strscan").returns("mocks/strscan.rb")
           MotionBundler::Require.expects(:resolve).with("baz").returns("lib/baz.rb")
@@ -50,6 +62,7 @@ module Unit
             "mocks/strscan.rb",
             "./app/controllers/foo_controller.rb",
             "lib/baz.rb",
+            File.expand_path("app/controllers/qux.rb"),
             File.expand_path("app/controllers/bar.rb")
           ], ripper.files)
           assert_equal({
@@ -59,6 +72,7 @@ module Unit
             ],
             "./app/controllers/foo_controller.rb" => [
               "lib/baz.rb",
+              File.expand_path("app/controllers/qux.rb"),
               File.expand_path("app/controllers/bar.rb")
             ]
           }, ripper.files_dependencies)

data/test/unit/test_motion-bundler.rb

@@ -58,6 +58,12 @@ module Unit
         MotionBundler.send :write_motion_bundler, [], {}, []
       end
 
+      it "should be able to register files to require" do
+        assert_equal [], MotionBundler.send(:app_requires)
+        MotionBundler.app_require "foo/bar.rb"
+        assert_equal ["foo/bar.rb"], MotionBundler.send(:app_requires)
+      end
+
       describe "calling `setup`" do
         it "should require the :motion Bundler group and trace requires" do
           object = mock "object"
@@ -113,7 +119,7 @@ module Unit
             ]
           })
 
-          Motion::Project::App.any_instance.expects(:files=).with([
+          Motion::Project::App.any_instance.expects(:files=).with(expand_paths [
             motion_bundler_file("motion-bundler/simulator/boot.rb"),
             motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
             motion_bundler_file("motion-bundler/simulator/motion-bundler.rb"),
@@ -125,7 +131,7 @@ module Unit
             "controller.rb"
           ])
 
-          Motion::Project::App.any_instance.expects(:files_dependencies).with({
+          Motion::Project::App.any_instance.expects(:files_dependencies).with(expand_paths({
             motion_bundler_file("motion-bundler/simulator/boot.rb") => [
               motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
               motion_bundler_file("motion-bundler/simulator/motion-bundler.rb")
@@ -135,7 +141,7 @@ module Unit
               "gems/foo-0.1.0/lib/foo/bar.rb",
               "gems/foo-0.1.0/lib/foo/version.rb"
             ]
-          })
+          }))
 
           MotionBundler.setup
         end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: motion-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,17 +41,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Use Ruby gems and mock require statements within RubyMotion applications
@@ -171,33 +164,26 @@ files:
 - test/unit/test_require.rb
 homepage: https://github.com/archan937/motion-bundler
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3894260479550083785
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3894260479550083785
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Ruby gems and mock require statements within RubyMotion applications
 test_files:
 - test/gems/slot_machine/CHANGELOG.rdoc