benschwarz-smoke 0.5.3 → 0.5.4

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "ben.schwarz@gmail.com"
     gem.homepage = "http://github.com/benschwarz/smoke"
     gem.authors = ["Ben Schwarz"]
-    gem.files = FileList['dependencies', 'lib/**/*.rb', 'rdoc/**/*', '[A-Z]*', 'spec/**/*', 'vendor/**/*'].to_a
+    gem.files = FileList['lib/**/*.rb', 'rdoc/**/*', '[A-Z]*', 'spec/**/*', 'vendor/**/*'].to_a
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION.yml

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

data/vendor/dependencies/bin/dep

@@ -58,8 +58,8 @@ protected
   end
 
   def deps
-    @deps ||= Dep.new(File.read(Dep.dependencies_file))
-  rescue Dep::DependenciesFileNotFound
+    @deps ||= Dep.new(File.read("dependencies"))
+  rescue Errno::ENOENT
     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("thor", "~> 0.11")
+  s.add_dependency("wycats-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("thor", "~> 0.11")
+  s.add_dependency("wycats-thor", "~> 0.11")
 end

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

@@ -1,20 +1,4 @@
-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
@@ -78,7 +62,7 @@ class Dep
     @missing = []
 
     dependencies.each_line do |line|
-      next unless line =~ /^([\w\-_]+)\s*([<~=>]* ?[\d\.]+)?\s*(?: \(([\w, ]+)\))?\s*(?: ([a-z]+:\/\/.+?))?\s*$/
+      next unless line =~ /^([\w\-_]+) ?([<~=> \d\.]+)?(?: \(([\w, ]+)\))?(?: ([a-z]+:\/\/.+?))?$/
       @dependencies << Dependency.new($1, $2, $3, $4)
     end
   end

data/vendor/dependencies/lib/dependencies.rb

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

data/vendor/dependencies/test/dependencies_test.rb

@@ -9,8 +9,6 @@ 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)
@@ -106,7 +104,7 @@ class DependenciesTest < Test::Unit::TestCase
     def dep(args = nil)
       out, err = nil
 
-      Open3.popen3("#{DEP_BINARY} #{args}") do |stdin, stdout, stderr|
+      Open3.popen3("#{File.expand_path(File.join("../bin/dep"))} #{args}") do |stdin, stdout, stderr|
         out = stdout.read
         err = stderr.read
       end
@@ -129,29 +127,10 @@ 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.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -23,7 +23,6 @@ extra_rdoc_files:
 - README.markdown
 - LICENSE
 files: 
-- dependencies
 - lib/core_ext/hash.rb
 - lib/core_ext/string.rb
 - lib/smoke/cache.rb

data/dependencies

@@ -1,7 +0,0 @@
-simple-rss 1.2
-rest-client 1.0.1
-json 1.1.3
-fakeweb 1.2.5
-crack 0.1.1
-moneta git://github.com/benschwarz/moneta.git
-dependencies git://github.com/benschwarz/dependencies.git