cargo 0.0.1 → 0.0.2

data/Rakefile

@@ -1,5 +1,7 @@
+require "cutest"
+
 task :test do
-  system "cd test && ruby cargo_test.rb"
+  Cutest.run(Dir["test/*_test.rb"])
 end
 
 task :default => :test

data/cargo.gemspec

@@ -1,10 +1,13 @@
+require "./lib/cargo"
+
 Gem::Specification.new do |s|
   s.name              = "cargo"
-  s.version           = "0.0.1"
+  s.version           = Cargo::VERSION
   s.summary           = "Require libraries without cluttering your namespace."
   s.description       = "Cargo lets you use different versions of the same library by implementing two simple commands, which let you load programs without messing with your namespace."
   s.authors           = ["Michel Martens", "Damian Janowski"]
   s.email             = ["michel@soveran.com", "djanowski@dimaion.com"]
   s.homepage          = "http://github.com/soveran/cargo"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cargo.rb", "cargo.gemspec", "test/cargo_test.rb", "test/foo-1.0.0.rb", "test/foo-2.0.0.rb", "test/helper.rb"]
+  s.files             = Dir[ "LICENSE", "README.markdown", "Rakefile", "lib/**/*.rb", "*.gemspec", "test/*.*" ]
+  s.add_development_dependency "cutest"
 end

data/lib/cargo.rb

@@ -1,25 +1,21 @@
 module Cargo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
-  def self.import(file)
+  def import(file)
     unless file.match(/\.rb$/)
       file = "#{file}.rb"
     end
 
     load(file, true)
 
-    @cargo
+    Thread.current[:cargo].tap do
+      Thread.current[:cargo] = nil
+    end
   end
 
-  def self.export(cargo)
-    @cargo = cargo
+  def export(cargo)
+    Thread.current[:cargo] = cargo
   end
 end
 
-def import(file)
-  Cargo.import(file)
-end
-
-def export(cargo)
-  Cargo.export(cargo)
-end
+include Cargo

data/test/cargo_test.rb

@@ -1,15 +1,14 @@
 # encoding: UTF-8
 
-require File.join(File.dirname(__FILE__), "helper")
-require "ruby-debug"
+require File.join(".", "lib", "cargo")
 
 setup do
   unless defined?(Foo1)
-    Foo1 = import("foo-1.0.0")
+    Foo1 = import("test/foo-1.0.0")
   end
 
   unless defined?(Foo2)
-    Foo2 = import("foo-2.0.0")
+    Foo2 = import("test/foo-2.0.0")
   end
 end
 
@@ -41,5 +40,3 @@ end
 test "Foo2 should be possible" do
   assert "Hello" == Foo2.new.bar
 end
-
-puts " ✔ All tests passed"

metadata

@@ -1,35 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cargo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michel Martens
 - Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-26 00:00:00 -03:00
-default_executable: 
-dependencies: []
-
-description: Cargo lets you use different versions of the same library by implementing two simple commands, which let you load programs without messing with your namespace.
-email: 
+date: 2012-01-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cutest
+  requirement: &2156141560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156141560
+description: Cargo lets you use different versions of the same library by implementing
+  two simple commands, which let you load programs without messing with your namespace.
+email:
 - michel@soveran.com
 - djanowski@dimaion.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.markdown
 - Rakefile
@@ -38,38 +40,28 @@ files:
 - test/cargo_test.rb
 - test/foo-1.0.0.rb
 - test/foo-2.0.0.rb
-- test/helper.rb
-has_rdoc: true
 homepage: http://github.com/soveran/cargo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Require libraries without cluttering your namespace.
 test_files: []
-

data/test/helper.rb

@@ -1,26 +0,0 @@
-# encoding: UTF-8
-
-require File.join(File.dirname(__FILE__), "..", "lib", "cargo")
-
-AssertionFailed = Class.new(StandardError)
-
-def assert(value)
-  return if value
-
-  file, line = caller[0].split(":")
-  code = File.readlines(file)[line.to_i - 1]
-
-  puts " ✗ #{code.strip}"
-  puts "   #{file}:#{line}"
-  exit(1)
-end
-
-def setup(&block)
-  @_setup = block
-end
-
-def test(name = nil, &block)
-  @_test = name
-
-  block.call(@_setup.call)
-end