dependencies 0.0.8 → 0.0.9

data/Rakefile

@@ -1,5 +1,7 @@
 task :test do
-  system "cd test && env GEM_HOME=#{File.expand_path("tmp")} ruby dependencies_test.rb"
+  binary = File.open($0) { |f| f.gets }[/#\s*!\s*(.*)/, 1]
+  puts "Running suite with #{binary}"
+  system "cd test && env GEM_HOME=#{File.expand_path("tmp")} #{binary} dependencies_test.rb"
 end
 
 task :default => :test

data/dependencies.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "dependencies"
-  s.version           = "0.0.8"
+  s.version           = "0.0.9"
   s.summary           = "Specify your project's dependencies in one file."
   s.authors           = ["Damian Janowski", "Michel Martens"]
   s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.executables << "dep"
 
-  s.files = ["README.markdown", "Rakefile", "bin/dep", "dependencies.gemspec", "lib/dependencies/dep.rb", "lib/dependencies.rb", "test/dependencies_test.rb", "test/foobaz-0.3.gem", "test/vendor/bar/lib", "test/vendor/barz-2.0/lib", "test/vendor/baz-1.0/lib"]
+  s.files = ["README.markdown", "Rakefile", "bin/dep", "dependencies.gemspec", "lib/dependencies/dep.rb", "lib/dependencies.rb", "test/dependencies_test.rb", "test/foobaz-0.3.gem", "test/vendor/bar/lib", "test/vendor/bar-core-1.0/lib", "test/vendor/barz-2.0/lib", "test/vendor/baz-1.0/lib"]
 
   s.add_dependency("thor", "~> 0.11")
 end

data/lib/dependencies/dep.rb

@@ -25,7 +25,8 @@ class Dep
     end
 
     def vendor_path
-      Dir[File.join("vendor", "#{vendor_name}*", "lib")].first ||
+      Dir[File.join("vendor", vendor_name, "lib")].first ||
+        Dir[File.join("vendor", "#{vendor_name}*", "lib")].first ||
         Dir[File.join("vendor", name, "lib")].first
     end
 

data/test/dependencies_test.rb

@@ -7,6 +7,11 @@ require "pp"
 require "stringio"
 require "fileutils"
 
+begin
+  require "ruby-debug"
+rescue LoadError
+end
+
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 class Dep
@@ -53,6 +58,14 @@ class DependenciesTest < Test::Unit::TestCase
       end
     end
 
+    test "does not conflict with similar names" do
+      with_dependencies "bar\nbar-core 1.0" do
+        do_require
+        assert_equal File.expand_path("vendor/bar/lib"), $:[2]
+        assert_equal File.expand_path("vendor/bar-core-1.0/lib"), $:[1]
+      end
+    end
+
     test "honors the version number for the vendor directory" do
       with_dependencies "foo 2.0" do
         do_require

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dependencies
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -03:00
+date: 2010-04-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency