motion-bundler 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = MotionBundler CHANGELOG
 
+== Version 0.1.4 (May 29, 2013)
+
+* Not using colorize as gem dependency anymore: defining String#yellow, String#green, String#red in MotionBundler itself
+* Fixed `duplicate symbol` error caused when requiring a file within `Dir["app/**/*.rb"]`
+
 == Version 0.1.3 (May 28, 2013)
 
 * Altered `simulator?` (and thus `device?`) determination (in simulator when ARGV is empty)

data/Rakefile

@@ -1,7 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "colorize"
 
 task :default => "test/unit"
 
@@ -16,11 +15,11 @@ task "test/motion" do
   if ENV["BUNDLE_GEMFILE"] == "foo"
     FileList["test/motion/**/test_*.rb"].each_with_index do |test_file, index|
       puts if index > 0 || ARGV.include?("test/unit")
-      puts "#{test_file}:\n".green
+      puts "\e[0;32;49m#{test_file}:\n\e[0m"
       test_file = File.expand_path test_file
       system "cd #{File.dirname test_file} && ruby #{File.basename test_file}"
     end
   else
-    puts "Please use `.rake` to run motion tests".red
+    puts "\e[0;31;49mPlease use `.rake` to run motion tests\e[0m"
   end
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/motion-bundler/device/core_ext.rb

@@ -10,6 +10,7 @@ module Kernel
   def autoload(mod, filename)
   end
 end
+
 class Object
   def require(name)
   end
@@ -18,6 +19,7 @@ class Object
   def load(filename, wrap=false)
   end
 end
+
 class Module
   def autoload(mod, filename)
   end

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

@@ -1,3 +1,4 @@
+require "set"
 require "motion-bundler/require/ripper/builder"
 
 module MotionBundler
@@ -33,20 +34,28 @@ module MotionBundler
 
           builder = Builder.new source
           builder.requires.each do |method, args|
-            (@files_dependencies[source] ||= []) << begin
-              (method == :require_relative ? File.expand_path("../#{args[0]}.rb", source) : Require.resolve(args[0])).tap do |file|
-                @files << source
-                @files << file
-                unless @sources.any?{|x| File.expand_path(x) == File.expand_path(file)}
-                  if file.include?(File.expand_path("."))
-                    added_sources << file
-                  else
-                    MotionBundler.app_require file
-                  end
-                end
+            (@requires[source] ||= []) << args[0]
+
+            file = begin
+              if method == :require_relative
+                File.expand_path("../#{args[0]}.rb", source)
+              else
+                Require.resolve(args[0])
               end
             end
-            (@requires[source] ||= []) << args[0]
+
+            next if @sources.any?{|x| File.expand_path(x) == File.expand_path(file)}
+
+            if file.include?(File.expand_path("."))
+              added_sources << file
+            else
+              MotionBundler.app_require file
+            end
+
+            @files << source
+            @files << file
+
+            (@files_dependencies[source] ||= []) << file
           end
 
           unless added_sources.empty?

data/lib/motion-bundler/simulator/boot.rb

@@ -1,3 +1,2 @@
 require_relative "core_ext"
-require "colorize"
 require_relative "console"

data/lib/motion-bundler/simulator/core_ext.rb

@@ -48,4 +48,20 @@ class Module
   end
 end
 
+end
+
+class String
+  def yellow
+    colorize 33
+  end
+  def green
+    colorize 32
+  end
+  def red
+    colorize 31
+  end
+private
+  def colorize(color)
+    "\e[0;#{color};49m#{self}\e[0m"
+  end
 end

data/lib/motion-bundler/version.rb

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

data/motion-bundler.gemspec

@@ -18,6 +18,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest", "4.6.2"
   gem.add_development_dependency "mocha", "0.13.2"
   gem.add_development_dependency "rake"
-
-  gem.add_dependency "colorize"
 end

data/sample_app/lib/foo.rb

@@ -1,4 +1,5 @@
 require_relative "foo/bar"
+require_relative './../app/controllers/app_controller'
 require "cgi"
 
 module Foo

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

@@ -1,8 +1,7 @@
 PATH
   remote: /Users/paulengel/Sources/motion-bundler
   specs:
-    motion-bundler (0.1.2)
-      colorize
+    motion-bundler (0.1.3)
 
 PATH
   remote: /Users/paulengel/Sources/motion-bundler/test/gems/slot_machine
@@ -12,7 +11,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.5.8)
 
 PLATFORMS
   ruby

data/test/motion/simulator/test_setup.rb

@@ -17,8 +17,6 @@ module Motion
             SlotMachine
           end
 
-          colorize = "#{Bundler.load.specs.detect{|x| x.name == "colorize"}.full_gem_path}/lib/colorize.rb"
-
           Motion::Project::App.any_instance.expects(:files).returns %w(
             /Users/paulengel/foo.rb
             /Users/paulengel/bar.rb
@@ -28,7 +26,6 @@ module Motion
             MotionBundler::MOTION_BUNDLER_FILE,
             motion_bundler_file("motion-bundler/simulator/boot.rb"),
             motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
-            colorize,
             motion_bundler_file("motion-bundler/simulator/console.rb"),
             gem_path("slot_machine/lib/slot_machine.rb"),
             gem_path("slot_machine/lib/slot_machine/version.rb"),
@@ -47,7 +44,6 @@ module Motion
           Motion::Project::App.any_instance.expects(:files_dependencies).with(
             motion_bundler_file("motion-bundler/simulator/boot.rb") => [
               motion_bundler_file("motion-bundler/simulator/core_ext.rb"),
-              colorize,
               motion_bundler_file("motion-bundler/simulator/console.rb")
             ],
             gem_path("slot_machine/lib/slot_machine.rb") => [

data/test/unit/require/test_ripper.rb

@@ -16,7 +16,8 @@ module Unit
           foo_builder = mock "object"
           foo_builder.expects(:requires).returns [
             [:require, ["baz"]],
-            [:require_relative, ["qux"]]
+            [:require_relative, ["qux"]],
+            [:require_relative, ["bar"]]
           ]
           MotionBundler::Require::Ripper::Builder.expects(:new).with("./app/controllers/foo_controller.rb").returns foo_builder
 
@@ -26,7 +27,11 @@ module Unit
 
           qux_builder = mock "object"
           qux_builder.expects(:requires).returns []
-          MotionBundler::Require::Ripper::Builder.expects(:new).with(File.expand_path("./app/controllers/qux.rb")).returns qux_builder
+          MotionBundler::Require::Ripper::Builder.expects(:new).with("./app/controllers/qux.rb").returns qux_builder
+
+          bar_builder = mock "object"
+          bar_builder.expects(:requires).returns []
+          MotionBundler::Require::Ripper::Builder.expects(:new).with(File.expand_path("./app/controllers/bar.rb")).returns bar_builder
 
           MotionBundler::Require.expects(:resolve).with("stringio").returns("stdlib/stringio.rb")
           MotionBundler::Require.expects(:resolve).with("strscan").returns("mocks/strscan.rb")
@@ -35,7 +40,8 @@ module Unit
           ripper = MotionBundler::Require::Ripper.new(
             "./app/controllers/app_controller.rb",
             "./app/controllers/foo_controller.rb",
-            "./app/controllers/baz_controller.rb"
+            "./app/controllers/baz_controller.rb",
+            "./app/controllers/qux.rb"
           )
 
           assert_equal([
@@ -44,7 +50,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({
             "./app/controllers/app_controller.rb" => [
@@ -53,7 +59,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)
           assert_equal({
@@ -64,6 +70,7 @@ module Unit
             "./app/controllers/foo_controller.rb" => %w(
               baz
               qux
+              bar
             )
           }, ripper.requires)
         end

data/test/unit/simulator/test_core_ext.rb

@@ -42,6 +42,24 @@ module Unit
           assert_equal false, Kernel.respond_to?(:console)
           assert_equal false, Kernel.respond_to?(:_ruby_require)
         end
+
+        it "should be able to colorize messages" do
+          string = "MESSAGE"
+
+          assert_equal "\e[0;1982;49mMESSAGE\e[0m", string.send(:colorize, 1982)
+          assert_equal "\e[0;33;49mMESSAGE\e[0m", string.yellow
+          assert_equal "\e[0;32;49mMESSAGE\e[0m", string.green
+          assert_equal "\e[0;31;49mMESSAGE\e[0m", string.red
+
+          string.expects(:colorize).with(33)
+          string.yellow
+
+          string.expects(:colorize).with(32)
+          string.green
+
+          string.expects(:colorize).with(31)
+          string.red
+        end
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  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
 email:
 - paul.engel@holder.nl
@@ -199,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2773472459803331263
+      hash: 3894260479550083785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2773472459803331263
+      hash: 3894260479550083785
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25