motion-bundler 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5db7eef27452db03cec3069345404b2782c6e9d
-  data.tar.gz: f7e198110cf2ed95529df59957a5dc662e4bb8dc
+  metadata.gz: c3b46ddc7bfbf054507b9cc9faa9ccbdf66cc1c7
+  data.tar.gz: 5d5c20b2234f96d586022c5631472228b9332f02
 SHA512:
-  metadata.gz: 14a40f729b2ec900abb0f4f1e244617fb5a438f5b9b792baa63e9dab486cff3aa4d79547af3b74cdce96f287461182378a41eeaa8223b7655221cba2ac7356af
-  data.tar.gz: c5ddd7429a457a06d7ba1dd6296e13a83163b0b05226f44e321c79a0f4cc6cff882aaedb8f0512d029ede239d4957f864ad5117c1ecebfe2824712a104550066
+  metadata.gz: 0ffa0e8ed9ed71638d5fdbeea0a710b882483efdf7a2d086c99919e2f4c11eca84a2e194b9d27964f8290d2cc26740de6b4ae2a5a6efd983d8ef8ab7dbc50d5b
+  data.tar.gz: 28901834c38dd26658f5175fe589764cf9bd6de6dea8bcf5ec8b3e275ff5f5a7bfd71b1780b40fc81cbb53df4aef6d636db234750e30132f790f60378c5a6cc3

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = MotionBundler CHANGELOG
 
+== Version 0.1.6 (June 14, 2013)
+
+* Removed optional `strict` argument within Require.resolve
+* Also mocking within `MotionBundler.tracer_require` (thanks Li Jie for issuing, see https://github.com/archan937/motion-bundler/issues/7)
+
 == Version 0.1.5 (May 30, 2013)
 
 * Being able to require multiple files (e.g. `require "./config/**/*.rb"` within `app/app_delegate.rb`)

data/README.md

@@ -30,7 +30,7 @@ Add `MotionBundler.setup` at the end of your `Rakefile`:
 
     # -*- coding: utf-8 -*-
     $:.unshift "/Library/RubyMotion/lib"
-    require "motion/project"
+    require "motion/project/template/ios"
 
     # Require and prepare Bundler
     require "bundler"
@@ -73,4 +73,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/motion-bundler.rb

@@ -74,7 +74,7 @@ private
   end
 
   def tracer_require(files, files_dependencies, required)
-    Require.trace do
+    Require.mock_and_trace do
       require MOTION_BUNDLER_FILE
       require boot_file
       Bundler.require :motion

data/lib/motion-bundler/require.rb

@@ -8,6 +8,14 @@ module MotionBundler
     include Resolve
     extend self
 
+    def mock_and_trace
+      mock do
+        trace do
+          yield
+        end
+      end
+    end
+
     def trace
       Tracer.yield do
         yield

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

@@ -2,7 +2,7 @@ module MotionBundler
   module Require
     module Resolve
 
-      def resolve(path, strict = false)
+      def resolve(path)
         base_path = path.gsub(/\.rb$/, "")
 
         load_paths.each do |load_path|
@@ -11,7 +11,7 @@ module MotionBundler
           end
         end
 
-        path unless strict
+        path
       end
 
     private

data/lib/motion-bundler/require/tracer/hooks.rb

@@ -36,7 +36,7 @@ module MotionBundler
                   false
                 end
                 unless result
-                  {:required => MotionBundler::Require.resolve(path, false)}
+                  {:required => MotionBundler::Require.resolve(path)}
                 end
               end
               result

data/lib/motion-bundler/version.rb

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

data/sample_app/Rakefile

@@ -8,7 +8,7 @@ Bundler.require
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
-  app.name = "SampleApp"
+  app.name = "MBundler"
 end
 
 # Track and specify files and their mutual dependencies within the :motion Bundler group

data/sample_app/app/controllers/app_controller.rb

@@ -2,6 +2,7 @@ require "stringio"
 require "strscan"
 require "zlib"
 require "httparty"
+require "net/pop"
 require_relative "../../lib/foo"
 
 class AppController < UIViewController
@@ -36,6 +37,10 @@ class AppController < UIViewController
 
     p HTTParty.hi!
 
+    # Testing (mocked) Net::Protocol
+
+    p Net::Protocol.hi!
+
     # Testing Foo and Foo::Bar
 
     p Foo.foo!
@@ -49,5 +54,15 @@ class AppController < UIViewController
     p enc
     p Base64.decode64(enc)
 
+    # Say thanks
+
+    alert = UIAlertView.new
+    alert.title = "Thanks!"
+    alert.message = "Hi, thanks for giving MotionBundler a try! Any form of collaboration is very welcome.\n\nGreets,\nPaul Engel\n@archan937"
+    alert.show
+
+    count = alert.message.split("\n").collect(&:size).max + 2
+    puts ["", "=" * count, "", alert.title, "", alert.message, "", "=" * count]
+
   end
 end

data/sample_app/lib/foo.rb

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

data/sample_app/mocks/httparty.rb

@@ -1,5 +1,5 @@
 module HTTParty
   def self.hi!
-    "Hi!"
+    "Hi, I'm #{name}"
   end
 end

data/sample_app/mocks/net/protocol.rb

@@ -0,0 +1,9 @@
+module Net
+  class ProtocolError < StandardError; end
+  class ProtoAuthError < ProtocolError; end
+  class Protocol
+    def self.hi!
+      "Hi, I'm #{name}"
+    end
+  end
+end

data/sample_app/mocks/timeout.rb

@@ -0,0 +1,4 @@
+module Timeout
+  class Error < RuntimeError
+  end
+end

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

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

data/test/unit/require/test_resolve.rb

@@ -15,7 +15,6 @@ module Unit
           MotionBundler::Require::Mocker.expects(:dirs).at_least_once.returns [
             MotionBundler::Require::Mocker::APP_MOCKS, mocks_dir, MotionBundler::Require::Mocker::GEM_MOCKS
           ]
-          assert_equal nil, Require.resolve("foo", true)
           assert_equal "foo", Require.resolve("foo")
           assert_equal "#{mocks_dir}/yaml.rb", Require.resolve("yaml")
           assert_equal "#{mocks_dir}/net/http.rb", Require.resolve("net/http")

data/test/unit/require/test_ripper.rb

@@ -33,10 +33,6 @@ 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
@@ -45,10 +41,12 @@ module Unit
           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("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")
 
+          MotionBundler.expects(:app_require).with("/stdlib/stringio.rb")
+
           ripper = MotionBundler::Require::Ripper.new(
             "./app/controllers/app_controller.rb",
             "./app/controllers/foo_controller.rb",
@@ -58,7 +56,7 @@ module Unit
 
           assert_equal([
             "./app/controllers/app_controller.rb",
-            "stdlib/stringio.rb",
+            "/stdlib/stringio.rb",
             "mocks/strscan.rb",
             "./app/controllers/foo_controller.rb",
             "lib/baz.rb",
@@ -67,7 +65,7 @@ module Unit
           ], ripper.files)
           assert_equal({
             "./app/controllers/app_controller.rb" => [
-              "stdlib/stringio.rb",
+              "/stdlib/stringio.rb",
               "mocks/strscan.rb"
             ],
             "./app/controllers/foo_controller.rb" => [

data/test/unit/test_motion-bundler.rb

@@ -65,7 +65,7 @@ module Unit
       end
 
       describe "calling `setup`" do
-        it "should require the :motion Bundler group and trace requires" do
+        it "should require the :motion Bundler group and mock and trace requires" do
           object = mock "object"
           object.expects :do_something
 
@@ -75,6 +75,9 @@ module Unit
             object.do_something
           end
 
+          MotionBundler::Require.expects(:mock_and_trace)
+          MotionBundler.setup
+
           MotionBundler.expects(:touch_motion_bundler)
           MotionBundler.expects(:ripper_require)
           MotionBundler.expects(:tracer_require)

data/test/unit/test_require.rb

@@ -4,6 +4,23 @@ module Unit
   class TestRequire < MiniTest::Unit::TestCase
 
     describe MotionBundler::Require do
+      it "should be able to mock and trace requirements within a block" do
+        object = mock "object"
+        object.expects :do_something
+
+        MotionBundler::Require.mock_and_trace do
+          object.do_something
+        end
+
+        MotionBundler::Require::Tracer.expects :yield
+        MotionBundler::Require.mock_and_trace do
+        end
+
+        MotionBundler::Require::Mocker.expects :yield
+        MotionBundler::Require.mock_and_trace do
+        end
+      end
+
       it "should be able to trace requirements within a block" do
         object = mock "object"
         object.expects :do_something

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -99,8 +99,16 @@ files:
 - sample_app/app/controllers/app_controller.rb
 - sample_app/lib/foo.rb
 - sample_app/lib/foo/bar.rb
+- sample_app/mocks/digest/md5.rb
 - sample_app/mocks/httparty.rb
-- sample_app/resources/Default-568h@2x.png
+- sample_app/mocks/net/protocol.rb
+- sample_app/mocks/openssl.rb
+- sample_app/mocks/socket.rb
+- sample_app/mocks/timeout.rb
+- sample_app/resources/Icon.png
+- sample_app/resources/Icon.pxm
+- sample_app/resources/Icon@2x.png
+- sample_app/resources/Icon@2x.pxm
 - sample_app/spec/main_spec.rb
 - script/console
 - test/.gemfiles/simulator/test_setup