dependencies 0.0.2 → 0.0.3

data/bin/dep

@@ -1,13 +1,41 @@
 #! /usr/bin/env ruby
 
+require "fileutils"
 require "dependencies/dep"
+require "thor"
 
-env = ARGV.first
+class App < Thor
+  def list(env = nil)
+    deps.filter(env).each { |dep| puts dep }
+    deps.require(env)
+  end
 
-deps = Dep.new(File.read("dependencies"))
+  def vendor(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...)")
 
-deps.filter(env).each do |dep|
-  puts dep
+    FileUtils.mkdir("vendor") unless File.directory?("vendor")
+
+    Dir.chdir("vendor") do
+      system "git clone #{dep.url} #{dep.name} -q"
+      Dir.chdir(dep.name) { FileUtils.rm_rf(".git") }
+    end
+  end
+
+protected
+
+  def deps
+    @deps ||= Dep.new(File.read("dependencies"))
+  end
+
+  def dependency(name)
+    deps.find { |dep| dep.name == name }
+  end
+
+  def flunk(message)
+    $stderr.puts(message)
+    exit 1
+  end
 end
 
-deps.require(env)
+App.start

data/dependencies.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "dependencies"
-  s.version           = "0.0.2"
+  s.version           = "0.0.3"
   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,5 +9,7 @@ Gem::Specification.new do |s|
 
   s.executables << "dep"
 
-  s.files = ["Rakefile", "bin/dep", "dependencies.gemspec", "lib/dependencies/dep.rb", "lib/dependencies.rb", "test/dependencies_test.rb", "test/vendor/barz-2.0", "test/vendor/baz-1.0"]
+  s.files = ["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.add_dependency("thor", "~> 0.9")
 end

data/lib/dependencies/dep.rb

@@ -1,15 +1,15 @@
 class Dep
-  attr :dependencies
-
   class Dependency
     attr :name
     attr :version
     attr :environment
+    attr :url
 
-    def initialize(name, version = nil, environment = nil)
+    def initialize(name, version = nil, environment = nil, url = nil)
       @name = name
       @version = version if version && !version.empty?
       @environment = environment ? environment.split(/\, ?/) : []
+      @url = url
     end
 
     def for_environment?(env)
@@ -50,13 +50,17 @@ class Dep
     end
   end
 
+  include Enumerable
+
+  attr :dependencies
+
   def initialize(dependencies)
     @dependencies = []
     @missing = []
 
     dependencies.each_line do |line|
-      next unless line =~ /^([\w\-_]+) ?([<~=> \d\.]+)?( \(([\w, ]+)\))?$/
-      @dependencies << Dependency.new($1, $2, $4)
+      next unless line =~ /^([\w\-_]+) ?([<~=> \d\.]+)?(?: \(([\w, ]+)\))?(?: ([a-z]+:\/\/.+?))?$/
+      @dependencies << Dependency.new($1, $2, $3, $4)
     end
   end
 

data/test/dependencies_test.rb

@@ -1,5 +1,5 @@
 require "rubygems"
-require "ruby-debug"
+require "open3"
 
 gem "contest"
 
@@ -81,22 +81,86 @@ class DependenciesTest < Test::Unit::TestCase
 
   context "binary" do
     def dep(args = nil)
-      %x{ruby -I#{LIB} -rubygems #{File.expand_path(File.join("../bin/dep"))} #{args}}
+      out, err = nil
+
+      Open3.popen3("ruby -I#{LIB} -rubygems #{File.expand_path(File.join("../bin/dep"))} #{args}") do |stdin, stdout, stderr|
+        out = stdout.read
+        err = stderr.read
+      end
+
+      [out, err]
     end
 
-    test "prints all dependencies" do
-      with_dependencies "foo ~> 1.0\nbar" do
-        out = dep
+    context "list" do
+      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
 
-        assert_equal "foo ~> 1.0\nbar\n", out
+      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
     end
 
-    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 = dep "test"
+    context "vendor" do
+      setup do
+        @dir = create_repo("foobar")
+      end
+
+      test "vendors dependencies" do
+        with_dependencies "foobar 1.0 file://#{@dir}" do
+          out, err = dep "vendor foobar"
+
+          assert File.exist?("vendor/foobar/lib/foobar.rb")
+          assert !File.exist?("vendor/foobar/.git")
+        end
+      end
+
+      test "complains when no URL given" do
+        with_dependencies "foobar 1.0" do
+          out, err = dep "vendor foobar"
+
+          assert_match %r{Don't know where to vendor foobar from \(no URL given...\)}, err
+        end
+      end
+
+      test "complains when the dependency is not found" do
+        with_dependencies "foobar 1.0" do
+          out, err = dep "vendor qux"
+
+          assert_match %r{Dependency qux not found.}, err
+        end
+      end
+
+      teardown do
+        FileUtils.rm_rf(@dir)
+      end
+
+      def create_repo(name)
+        dir = File.expand_path(File.join(File.dirname(__FILE__), "tmp", name))
+
+        FileUtils.rm_rf(dir)
+        FileUtils.rm_rf("vendor/#{name}")
+        FileUtils.mkdir_p(dir)
+
+        Dir.chdir(dir) do
+          `git init`
+
+          FileUtils.mkdir("lib")
+          FileUtils.touch("lib/#{name}.rb")
+
+          `git add lib`
+          `git commit -m 'Lorem.'`
+        end
 
-        assert_equal "foo 1.0 (test)\nbarz 2.0\nbaz 0.1 (test)\n", out
+        dir
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dependencies
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Damian Janowski
@@ -10,10 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -03:00
+date: 2009-06-25 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.9"
+    version: 
 description: 
 email: 
 - djanowski@dimaion.com