dependencies 0.0.4 → 0.0.5

data/bin/dep

@@ -29,12 +29,12 @@ protected
 
   def vendor_one(name)
     dep = dependency(name)  || flunk("Dependency #{name} not found in dependencies.")
-    dep.url                 || flunk("Don't know where to vendor #{name} from (no URL given...)")
+    dep.version || dep.url  || flunk("Don't know where to vendor #{name} from (no version or URL given...)")
 
     FileUtils.mkdir("vendor") unless File.directory?("vendor")
 
     inside "vendor", :verbose => true do
-      run "git clone #{dep.url} #{dep.name} -q"
+      fetch dep
       remove_file File.join(dep.name, ".git")
     end
   end
@@ -47,6 +47,14 @@ protected
     end
   end
 
+  def fetch(dep)
+    if dep.version
+      run "gem unpack #{dep.name} -v #{dep.version}"
+    else
+      run "git clone #{dep.url} #{dep.name} -q --depth 1"
+    end
+  end
+
   def deps
     @deps ||= Dep.new(File.read("dependencies"))
   rescue Errno::ENOENT

data/dependencies.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "dependencies"
-  s.version           = "0.0.4"
+  s.version           = "0.0.5"
   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/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/barz-2.0/lib", "test/vendor/baz-1.0/lib"]
 
   s.add_dependency("wycats-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", name, "lib")].first
     end
 
     def require_vendor
@@ -85,6 +86,8 @@ class Dep
       end
 
       $stderr.puts
+      $stderr.puts "Run `dep list` to view the missing dependencies or `dep vendor --all` to try to solve them.\n\n"
+      exit(1)
     end
 
     $:.unshift File.expand_path("lib")

data/test/dependencies_test.rb

@@ -11,11 +11,24 @@ require "fileutils"
 
 $:.unshift LIB = File.join(File.dirname(__FILE__), "..", "lib")
 
+class Dep
+
+  # Override exit to allow the tests to keep running.
+  def exit(*attrs)
+  end
+end
+
 class DependenciesTest < Test::Unit::TestCase
   def do_require
     load "dependencies.rb"
   end
 
+  def ensure_gem_home
+    gem_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "tmp"))
+
+    flunk "GEM_HOME should be #{gem_path}. Run with env GEM_HOME=#{gem_path}." unless gem_path == ENV["GEM_HOME"]
+  end
+
   def with_dependencies(deps)
     File.open("dependencies", "w") do |f|
       f.write(deps)
@@ -34,15 +47,25 @@ class DependenciesTest < Test::Unit::TestCase
     test "loads dependencies from ./vendor" do
       with_dependencies "bar" do
         do_require
+        assert_equal File.expand_path("vendor/bar/lib"), $:[1]
+      end
 
+      with_dependencies "bar 1.0" do
+        do_require
         assert_equal File.expand_path("vendor/bar/lib"), $:[1]
       end
     end
 
+    test "honors the version number for the vendor directory" do
+      with_dependencies "foo 2.0" do
+        do_require
+        assert_equal File.expand_path("vendor/foo-2.0/lib"), $:[1]
+      end
+    end
+
     test "add ./lib to the load path" do
       with_dependencies "" do
         do_require
-
         assert_equal File.expand_path("lib"), $:.first
       end
     end
@@ -54,6 +77,7 @@ class DependenciesTest < Test::Unit::TestCase
         end
 
         assert err.include?("Missing dependencies:\n\n  foo 1.0")
+        assert err.include?("Run `dep list` to view the missing dependencies or `dep vendor --all` to try to solve them")
       end
     end
 
@@ -95,7 +119,6 @@ class DependenciesTest < Test::Unit::TestCase
       test "prints all dependencies" do
         with_dependencies "foo ~> 1.0\nbar" do
           out, err = dep "list"
-
           assert_equal "foo ~> 1.0\nbar\n", out
         end
       end
@@ -103,14 +126,12 @@ class DependenciesTest < Test::Unit::TestCase
       test "prints dependencies based on given environment" do
         with_dependencies "foo 1.0 (test)\nbar (development)\nbarz 2.0\nbaz 0.1 (test)" do
           out, err = dep "list test"
-
           assert_equal "foo 1.0 (test)\nbarz 2.0\nbaz 0.1 (test)\n", out
         end
       end
 
       test "complains when no dependencies file found" do
         out, err = dep "list"
-
         assert_equal "No dependencies file found.\n", err
       end
     end
@@ -121,7 +142,7 @@ class DependenciesTest < Test::Unit::TestCase
       end
 
       test "vendors dependencies" do
-        with_dependencies "foobar 1.0 file://#{@dir}" do
+        with_dependencies "foobar file://#{@dir}" do
           out, err = dep "vendor foobar"
 
           assert File.exist?("vendor/foobar/lib/foobar.rb")
@@ -129,11 +150,24 @@ class DependenciesTest < Test::Unit::TestCase
         end
       end
 
+      test "vendors using RubyGems when given a version" do
+        ensure_gem_home
+
+        system "gem install foobaz-0.3.gem > /dev/null"
+
+        with_dependencies "foobaz 0.3" do
+          out, err = dep "vendor foobaz"
+
+          assert  File.exist?("vendor/foobaz-0.3/lib/foobaz.rb")
+          assert !File.exist?("vendor/foobaz-0.3/.git")
+        end
+      end
+
       test "complains when no URL given" do
-        with_dependencies "foobar 1.0" do
+        with_dependencies "foobar" do
           out, err = dep "vendor foobar"
 
-          assert_match %r{Don't know where to vendor foobar from \(no URL given...\)}, err
+          assert_match %r{Don't know where to vendor foobar from \(no version or URL given...\)}, err
         end
       end
 
@@ -146,7 +180,7 @@ class DependenciesTest < Test::Unit::TestCase
       end
 
       test "vendors everything with --all" do
-        with_dependencies "foobar 1.0 file://#{@dir}\nbarbar file://#{create_repo "barbar"}" do
+        with_dependencies "foobar file://#{@dir}\nbarbar file://#{create_repo "barbar"}" do
           out, err = dep "vendor --all"
 
           assert File.exist?("vendor/foobar/lib/foobar.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dependencies
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -03:00
+date: 2009-07-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ files:
 - lib/dependencies/dep.rb
 - lib/dependencies.rb
 - test/dependencies_test.rb
+- test/foobaz-0.3.gem
 has_rdoc: true
 homepage: 
 licenses: []