soundcheck 0.2.3 → 0.2.4.beta1

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4.beta1

data/bin/soundcheck

@@ -32,6 +32,7 @@ option_parser.parse!(ARGV)
 soundcheck = Soundcheck.new(ARGV, options)
 
 begin
+  exit_status = 0
   soundcheck.commands_to_run.each do |cmd|
     puts "Executing #{cmd}\n\n"
 
@@ -42,10 +43,19 @@ begin
         end
       rescue Errno::EIO
       end
+      Process.wait(pid)
     end
-
     puts "\n\n\n"
+
+    if $?
+      exit_status = $?.exitstatus if $?.exitstatus > exit_status
+    else
+      puts "Huh?! We didn't get an exit status from that last one."
+      exit 1
+    end
   end
+
+  exit exit_status
 rescue Project::UnknownLanguage
   puts "Error: Cannot detect the programming language for this project."
   exit 1

data/lib/soundcheck/frameworks.rb

@@ -52,9 +52,13 @@ module Frameworks
         :is_dir         => lambda {|arg| project.has_dir?(arg) }
       })
     end
+    
+    def default_args
+      ["spec"]
+    end
 
     def command(*args)
-      args = (args.empty? ? ["spec"] : filter(*args))
+      args = (args.empty? ? default_args : filter(*args))
       return nil if args.empty?
 
       to_run = []
@@ -88,11 +92,29 @@ module Frameworks
       args.select { |arg| arg =~ /\.feature$/ }
     end
 
+    def default_args
+      ["features"]
+    end
+
     def command(*args)
-      args = (args.empty? ? ["features"] : filter(*args))
+      args = (args.empty? ? default_args : filter(*args))
       return nil if args.empty?
 
-      "cucumber #{args.join(" ")}".strip
+      to_run = []
+      to_run << "bundle exec" if has_gemfile?
+      to_run << "cucumber #{args.join(" ")}".strip
+      to_run.join(" ")
+    end
+
+    private
+
+    def requires_spec_helper?(*args)
+      output, status = project.execute("grep -r 'spec_helper' #{args.join(" ")}")
+      status.exitstatus == 0 # matched
+    end
+
+    def has_gemfile?
+      project.has_file?("Gemfile")
     end
   end
 
@@ -109,8 +131,12 @@ module Frameworks
       })
     end
 
+    def default_args
+      ["test/*.rb"]
+    end
+
     def command(*args)
-      args = (args.empty? ? ["test/*.rb"] : filter(*args))
+      args = (args.empty? ? default_args : filter(*args))
       return nil if args.empty?
 
       "cutest #{args.join(" ")}".strip
@@ -130,8 +156,12 @@ module Frameworks
       })
     end
 
+    def default_args
+      ["test/*"]
+    end
+
     def command(*args)
-      args = (args.empty? ? ["test/*"] : filter(*args))
+      args = (args.empty? ? default_args : filter(*args))
       return nil if args.empty?
 
       "expresso --include lib #{args.join(" ")}"

data/soundcheck.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "soundcheck"
-  s.version = "0.2.3"
+  s.version = "0.2.4.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marten Veldthuis"]
-  s.date = "2011-11-06"
+  s.date = "2011-11-08"
   s.description = "Soundcheck tries to figure out what kind of project you're working on, what test file you're trying to run, and what the fastest way is to run that."
   s.email = "marten@veldthuis.com"
   s.executables = ["soundcheck"]

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: soundcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000 Z
+date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &21025260 !ruby/object:Gem::Requirement
+  requirement: &16722740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21025260
+  version_requirements: *16722740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21024640 !ruby/object:Gem::Requirement
+  requirement: &16721780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21024640
+  version_requirements: *16721780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21023920 !ruby/object:Gem::Requirement
+  requirement: &16721120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21023920
+  version_requirements: *16721120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21023120 !ruby/object:Gem::Requirement
+  requirement: &16158300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21023120
+  version_requirements: *16158300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &21022460 !ruby/object:Gem::Requirement
+  requirement: &16155360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21022460
+  version_requirements: *16155360
 description: Soundcheck tries to figure out what kind of project you're working on,
   what test file you're trying to run, and what the fastest way is to run that.
 email: marten@veldthuis.com
@@ -140,13 +140,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2800419404506608249
+      hash: 4407562474867627896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11