benschwarz-smoke 0.5.2 → 0.5.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 5

data/dependencies

@@ -4,4 +4,4 @@ json 1.1.3
 fakeweb 1.2.5
 crack 0.1.1
 moneta git://github.com/benschwarz/moneta.git
-dependencies git://github.com/djanowski/dependencies.git
+dependencies git://github.com/benschwarz/dependencies.git

data/vendor/dependencies/bin/dep

@@ -58,8 +58,8 @@ protected
   end
 
   def deps
-    @deps ||= Dep.new(File.read("dependencies"))
-  rescue Errno::ENOENT
+    @deps ||= Dep.new(File.read(Dep.dependencies_file))
+  rescue Dep::DependenciesFileNotFound
     flunk "No dependencies file found."
   end
 

data/vendor/dependencies/dependencies.gemspec

@@ -11,5 +11,5 @@ Gem::Specification.new do |s|
 
   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")
+  s.add_dependency("thor", "~> 0.11")
 end

data/vendor/dependencies/dependencies.gemspec.erb

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
     "test/vendor/baz-1.0/**/*"
   ].inspect %>
 
-  s.add_dependency("wycats-thor", "~> 0.11")
+  s.add_dependency("thor", "~> 0.11")
 end

data/vendor/dependencies/lib/dependencies/dep.rb

@@ -1,4 +1,20 @@
+require "pathname"
+
 class Dep
+  DependenciesFileNotFound = Class.new(StandardError)
+
+  def self.dependencies_file
+    current = Pathname.new(Dir.pwd)
+
+    until current.root?
+      filename = current.join("dependencies")
+      return filename if filename.exist? and filename.file?
+      current = current.parent
+    end
+
+    raise DependenciesFileNotFound
+  end
+
   class Dependency
     attr :name
     attr :version
@@ -62,7 +78,7 @@ class Dep
     @missing = []
 
     dependencies.each_line do |line|
-      next unless line =~ /^([\w\-_]+) ?([<~=> \d\.]+)?(?: \(([\w, ]+)\))?(?: ([a-z]+:\/\/.+?))?$/
+      next unless line =~ /^([\w\-_]+)\s*([<~=>]* ?[\d\.]+)?\s*(?: \(([\w, ]+)\))?\s*(?: ([a-z]+:\/\/.+?))?\s*$/
       @dependencies << Dependency.new($1, $2, $3, $4)
     end
   end

data/vendor/dependencies/lib/dependencies.rb

@@ -2,4 +2,5 @@ $:.unshift(File.expand_path(File.dirname(__FILE__)))
 
 require "dependencies/dep"
 
-Dep.new(File.read("dependencies")).require(ENV["RACK_ENV"].to_s)
+Dep.new(File.read(Dep.dependencies_file)).require(ENV["RACK_ENV"].to_s)
+

data/vendor/dependencies/test/dependencies_test.rb

@@ -9,6 +9,8 @@ require "fileutils"
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
+DEP_BINARY = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "dep"))
+
 class Dep
   # Override exit to allow the tests to keep running.
   def exit(*attrs)
@@ -104,7 +106,7 @@ class DependenciesTest < Test::Unit::TestCase
     def dep(args = nil)
       out, err = nil
 
-      Open3.popen3("#{File.expand_path(File.join("../bin/dep"))} #{args}") do |stdin, stdout, stderr|
+      Open3.popen3("#{DEP_BINARY} #{args}") do |stdin, stdout, stderr|
         out = stdout.read
         err = stderr.read
       end
@@ -127,10 +129,29 @@ class DependenciesTest < Test::Unit::TestCase
         end
       end
 
+      test "allow for arbitrary spaces in the declarations" do
+        with_dependencies "foo   1.0   (test)\nbar   >= 3.1      (test)\nbaz   2.0 (development)" do
+          out, err = dep "list test"
+          assert_equal "foo 1.0 (test)\nbar >= 3.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
+
+      test "search recursively for the dependencies file" do
+        with_dependencies "foo 1.0 (test)\nbar (development)\nbarz 2.0\nbaz 0.1 (test)" do
+          FileUtils.rm_rf("dep-test")
+          FileUtils.mkdir("dep-test")
+          Dir.chdir("dep-test") do
+            out, err = dep "list test"
+            assert_equal "foo 1.0 (test)\nbarz 2.0\nbaz 0.1 (test)\n", out
+          end
+          FileUtils.rm_rf("dep-test")
+        end
+      end
     end
 
     context "vendor" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ben Schwarz