geordi 0.2.7 → 0.3.0

data/README.md

@@ -30,6 +30,18 @@ Runs the given command under `bundle exec` if a `Gemfile` is present in your wor
 More information at http://makandra.com/notes/684-automatically-run-bundle-exec-if-required
 
 
+
+cu
+-----
+
+Runs Cucumber with the arguments you want, bundle exec, cucumber_spinner detection, etc.:
+
+    cu features/users.feature
+
+More information at http://makandra.com/notes/1277-a-nicer-way-to-run-rspec-and-or-cucumber
+
+
+
 cleanup-directory
 -----------------
 
@@ -111,14 +123,14 @@ Recursively removes executable flags from files in the working directory that pr
 More information at http://makandra.com/notes/659-recursively-remove-unnecessary-execute-flags
 
 
-rspec-and-cucumber
---------------
+rs
+-----
 
-Runs both RSpec and Cucumber. Call from any project directory:
+Runs RSpec with the arguments you want, RSpec 1/2 detection, bundle exec, rspec_spinner detection, etc.:
 
-    rspec-and-cucumber
+    rs spec/models/user_spec.rb
 
-More information at http://makandra.com/notes/1197-bash-script-to-run-specs-and-features
+More information at http://makandra.com/notes/1277-a-nicer-way-to-run-rspec-and-or-cucumber
 
 
 shell-for
@@ -129,3 +141,13 @@ Opens an SSH shell on the given [Capistrano multistage](https://github.com/capis
     shell-for production
 
 More information at http://makandra.com/notes/1209-script-to-open-an-ssh-shell-to-a-capistrano-deployment-target   
+
+
+tests
+--------------
+
+Runs both `rs` and `cu`. Call from any project directory:
+
+    tests
+
+More information at http://makandra.com/notes/1277-a-nicer-way-to-run-rspec-and-or-cucumber

data/bin/cu

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+# Print some whitespace
+4.times { puts }
+
+# Check if cucumber_spinner is available
+spinner_available =  File.open('Gemfile').read.scan(/cucumber_spinner/).any?
+format_args = spinner_available ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
+
+# Run cucumber behind bundler
+exec *["b", "cucumber", format_args, ARGV].flatten

data/bin/rs

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# Print some whitespace
+4.times { puts }
+
+# Check if we're looking at a Rails 2 / rspec 1 project
+rspec1 = File.exists?('script/spec')
+rspec_args = rspec1 ? ["spec", "-c"] : ["rspec"]
+
+# Check if rspec_spinner is available
+spinner_available = File.open('Gemfile').read.scan(/rspec_spinner/).any?
+spinner_args = spinner_available ? ['-r', 'rspec_spinner', '-f', 'RspecSpinner::Bar'] : []
+
+# Run examples in 'spec' unless an argument is given
+ARGV[0] ||= 'spec'
+
+# Run rspec behind bundler
+exec *["b", rspec_args, spinner_args, ARGV].flatten

data/bin/tests

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+# Delete any state from previous Cucumber failures
+File.delete 'rerun.txt' if File.exists? 'rerun.txt'
+
+# Run rspec and cucumber
+exec "rs && cu"

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.2.7'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +02:00
-default_executable: 
+date: 2011-06-10 00:00:00 Z
 dependencies: []
 
 description: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.
@@ -26,6 +25,7 @@ executables:
 - apache-site
 - b
 - cleanup-directory
+- cu
 - dump-for
 - dumple
 - install-gems-remotely
@@ -34,8 +34,9 @@ executables:
 - power-rake
 - remotify-local-branch
 - remove-executable-flags
-- rspec-and-cucumber
+- rs
 - shell-for
+- tests
 extensions: []
 
 extra_rdoc_files: []
@@ -48,6 +49,7 @@ files:
 - bin/apache-site
 - bin/b
 - bin/cleanup-directory
+- bin/cu
 - bin/dump-for
 - bin/dumple
 - bin/install-gems-remotely
@@ -56,11 +58,11 @@ files:
 - bin/power-rake
 - bin/remotify-local-branch
 - bin/remove-executable-flags
-- bin/rspec-and-cucumber
+- bin/rs
 - bin/shell-for
+- bin/tests
 - geordi.gemspec
 - lib/geordi/version.rb
-has_rdoc: true
 homepage: http://makandra.com
 licenses: []
 
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geordi
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.

data/bin/rspec-and-cucumber

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-File.delete 'rerun.txt' if FileTest.exists? 'rerun.txt'
-
-if File.open('Gemfile').read.scan(/rspec_spinner/).any?
-  spec = "script/spec -r rspec_spinner -f RspecSpinner::Bar -c spec"
-else
-  spec = "script/spec spec"
-end
-
-if File.open('Gemfile').read.scan(/cucumber_spinner/).any?
-  cucumber = "script/cucumber --format CucumberSpinner::CuriousProgressBarFormatter features"
-else
-  cucumber = "script/cucumber --format progress features"
-end
-
-exec "bundle exec #{spec} && bundle exec #{cucumber}"
-