soundcheck 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,14 +2,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    cucumber (1.0.4)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
+      gherkin (~> 2.5.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.4.18)
+    gherkin (2.5.4)
       json (>= 1.4.6)
     git (1.2.5)
     jeweler (1.6.4)
@@ -17,7 +17,7 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.6.1)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rcov (0.9.11)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -27,7 +27,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
 
 PLATFORMS
   ruby

data/README.markdown

@@ -12,6 +12,10 @@ you require that file, you'll probably need all of Rails loaded. If you don't (a
 often do when running a spec for something you put in `Rails.root.join("lib")`), it'll execute
 "rspec $0", otherwise it'll execute "bundle exec rspec $0".
 
+## Is Soundcheck not working for your project?
+
+Feel free to submit a pull request that adds only a fixture and RSpec testcase which describes the situation in which it fails. If you can fix it yourself, then great, but I'll happily accept patches that add more project styles which Soundcheck currently can't handle.
+
 ## Contributing to Soundcheck
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/soundcheck

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'soundcheck'
-exec Soundcheck.command_to_run(ARGV[0])
+exec Soundcheck.new(ARGV[0]).command_to_run

data/features/soundcheck.feature

@@ -3,6 +3,6 @@ Feature: Soundcheck
   I want to require as little as possible
 
   Scenario: Ruby and RSpec
-    Given the "ruby/rspec" fixture
+    Given the "ruby-bundler-rspec" fixture
     When I run soundcheck with "spec"
     Then it should have passed

data/features/step_definitions/steps.rb

@@ -1,9 +1,11 @@
+SOUNDCHECK_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+
 Given /^the "([^"]*)" fixture$/ do |fixture_path|
-  Dir.chdir(File.join(File.expand_path(File.dirname(__FILE__)), "../../spec/fixtures", fixture_path))
+  Dir.chdir(File.join(SOUNDCHECK_ROOT, "fixtures", fixture_path))
 end
 
 When /^I run soundcheck with "([^"]*)"$/ do |spec_file|
-  puts output = `#{File.join(File.expand_path(File.dirname(__FILE__)), "../../bin/soundcheck")} #{spec_file}`
+  puts output = `ruby -I#{File.join(SOUNDCHECK_ROOT, "lib")} #{File.join(SOUNDCHECK_ROOT, "bin", "soundcheck")} #{spec_file}`
 end
 
 Then /^it should have passed$/ do

data/fixtures/ruby-bundler-rspec/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'rspec'

data/fixtures/ruby-bundler-rspec/Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec

data/fixtures/ruby-rspec/spec/with_spec_helper_spec.rb

@@ -0,0 +1 @@
+require 'spec_helper'

data/lib/soundcheck.rb

@@ -1,41 +1,29 @@
-#!/usr/bin/env ruby
-# Put this in the script/ directory of your Rails app, then run it with a spec
-# filename. If the spec uses spec_helper, it'll be run inside Bundler.
-# Otherwise, it'll be run directly with whatever `rspec` executable is on the
-# path.
-
 class Soundcheck
-  def self.command_to_run(path = nil)
-    path = "spec" unless path
-    
-    `grep -r 'spec_helper' #{path}`
-    if $?.exitstatus == 1 # no match; we have a stand-alone spec
-      "rspec #{path}"
-    else
-      "bundle exec rspec #{path}"
-    end
-  end
-end
-
-#need_rails=1
+  attr_accessor :path
 
-#if [ $# -gt 0 ]; then # we have args
-    #filename=$1
-    ## Remove trailing line numbers from filename, e.g. spec/my_spec.rb:33
-    #grep_filename=`echo $1 | sed 's/:.*$//g'`
+  def initialize(path = "spec")
+    @path = path || "spec"
+  end
 
-    #(set +e; grep -r 'spec_helper' $grep_filename; echo '') > /dev/null
-    #if [ $? -eq 1 ]; then # no match; we have a stand-alone spec
-        #need_rails=''
-    #fi
-#else # we have no args
-    #filename='spec'
-#fi
+  def command_to_run
+    if has_gemfile?
+      if requires_spec_helper?
+        return "rspec #{@path}"
+      else
+        return "bundle exec rspec #{@path}"
+      end
+    end
 
-#command='rspec'
+    # Assume rspec
+    "rspec #{@path}"
+  end
 
-#if [ $need_rails ]; then
-    #command="ruby -S bundle exec $command"
-#fi
+  def requires_spec_helper?
+    `grep -r 'spec_helper' #{@path}`
+    $?.exitstatus == 1 # no match; we have a stand-alone spec
+  end
 
-#RAILS_ENV=test $command $filename
+  def has_gemfile?
+    File.exist?("Gemfile")
+  end
+end

data/soundcheck.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "soundcheck"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marten Veldthuis"]
-  s.date = "2011-10-17"
+  s.date = "2011-10-28"
   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"]
@@ -29,11 +29,16 @@ Gem::Specification.new do |s|
     "bin/soundcheck",
     "features/soundcheck.feature",
     "features/step_definitions/steps.rb",
+    "fixtures/ruby-bundler-rspec/Gemfile",
+    "fixtures/ruby-bundler-rspec/Gemfile.lock",
+    "fixtures/ruby-bundler-rspec/spec/spec_helper.rb",
+    "fixtures/ruby-bundler-rspec/spec/with_spec_helper_spec.rb",
+    "fixtures/ruby-bundler-rspec/spec/without_spec_helper_spec.rb",
+    "fixtures/ruby-rspec/spec/spec_helper.rb",
+    "fixtures/ruby-rspec/spec/with_spec_helper_spec.rb",
+    "fixtures/ruby-rspec/spec/without_spec_helper_spec.rb",
     "lib/soundcheck.rb",
     "soundcheck.gemspec",
-    "spec/fixtures/ruby/rspec/spec/spec_helper.rb",
-    "spec/fixtures/ruby/rspec/spec/with_spec_helper_spec.rb",
-    "spec/fixtures/ruby/rspec/spec/without_spec_helper_spec.rb",
     "spec/soundcheck_spec.rb"
   ]
   s.homepage = "http://github.com/marten/soundcheck"

data/spec/soundcheck_spec.rb

@@ -1,31 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + '/../lib/soundcheck')
 
 CURRENT_PWD   = Dir.pwd
-FIXTURES_ROOT = File.expand_path(File.dirname(__FILE__) + '/fixtures')
+FIXTURES_ROOT = File.expand_path(File.dirname(__FILE__) + '/../fixtures')
+
+def cmd_for(path = nil)
+  Soundcheck.new(path).command_to_run
+end
 
 describe "Soundcheck" do
   context "for a ruby project" do
     context "using rspec" do
-      before(:all) { Dir.chdir(FIXTURES_ROOT + '/ruby/rspec') }
-      after(:all)  { Dir.chdir(CURRENT_PWD) }
+      before(:all) { Dir.chdir(FIXTURES_ROOT + '/ruby-rspec') }
 
-      it "should return 'bundle exec rspec spec' when run with no arguments" do
-        Soundcheck.command_to_run().should == "bundle exec rspec spec"
+      it "should not use bundler when no Gemfile exists" do
+        cmd_for.should == "rspec spec"
       end
 
-      it "should return 'bundle exec rspec spec/with_spec_helper_spec.rb'" do
-        Soundcheck.command_to_run('spec/with_spec_helper_spec.rb').should == "bundle exec rspec spec/with_spec_helper_spec.rb"
-      end
+      context "using bundler" do
+        before(:all) { Dir.chdir(FIXTURES_ROOT + '/ruby-bundler-rspec') }
 
-      it "should return 'rspec spec/without_spec_helper_spec.rb'" do
-        Soundcheck.command_to_run('spec/without_spec_helper_spec.rb').should == "rspec spec/without_spec_helper_spec.rb"
-      end
+        it "should return 'bundle exec rspec spec' when run with no arguments" do
+          cmd_for.should == "bundle exec rspec spec"
+        end
+
+        it "should return 'bundle exec rspec spec/with_spec_helper_spec.rb'" do
+          cmd_for('spec/with_spec_helper_spec.rb').should == "bundle exec rspec spec/with_spec_helper_spec.rb"
+        end
 
-      it "should not use bundler when no Gemfile exists"
-      it "should not call rspec outside of bundler when the rspec command does not exist"
+        it "should return 'rspec spec/without_spec_helper_spec.rb'" do
+          cmd_for('spec/without_spec_helper_spec.rb').should == "rspec spec/without_spec_helper_spec.rb"
+        end
+      end
     end
     
     context "using minitest"
+    context "using test::unit"
   end
 
   context "for a python project"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soundcheck
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19873260 !ruby/object:Gem::Requirement
+  requirement: &21299080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19873260
+  version_requirements: *21299080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19871160 !ruby/object:Gem::Requirement
+  requirement: &21298600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19871160
+  version_requirements: *21298600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19869480 !ruby/object:Gem::Requirement
+  requirement: &21298000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19869480
+  version_requirements: *21298000
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &19868540 !ruby/object:Gem::Requirement
+  requirement: &21297400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19868540
+  version_requirements: *21297400
 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
@@ -76,11 +76,16 @@ files:
 - bin/soundcheck
 - features/soundcheck.feature
 - features/step_definitions/steps.rb
+- fixtures/ruby-bundler-rspec/Gemfile
+- fixtures/ruby-bundler-rspec/Gemfile.lock
+- fixtures/ruby-bundler-rspec/spec/spec_helper.rb
+- fixtures/ruby-bundler-rspec/spec/with_spec_helper_spec.rb
+- fixtures/ruby-bundler-rspec/spec/without_spec_helper_spec.rb
+- fixtures/ruby-rspec/spec/spec_helper.rb
+- fixtures/ruby-rspec/spec/with_spec_helper_spec.rb
+- fixtures/ruby-rspec/spec/without_spec_helper_spec.rb
 - lib/soundcheck.rb
 - soundcheck.gemspec
-- spec/fixtures/ruby/rspec/spec/spec_helper.rb
-- spec/fixtures/ruby/rspec/spec/with_spec_helper_spec.rb
-- spec/fixtures/ruby/rspec/spec/without_spec_helper_spec.rb
 - spec/soundcheck_spec.rb
 homepage: http://github.com/marten/soundcheck
 licenses:
@@ -97,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3910485601409575450
+      hash: -4368845081355427010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: