spring 0.0.4 → 0.0.5

data/README.md

@@ -42,7 +42,10 @@ At the moment only MRI 1.9.3 / Rails 3.2 is supported.
 
 ## Usage
 
-Add `spring` to your gemfile and do a `bundle`.
+Install the `spring` gem. You may wish to add it to your bundle, but
+it's not necessary. If you do, I don't recommend invoking `spring`
+via `bundle exec` as that will make it slow. Just call `spring`
+on its own.
 
 You now have a `spring` command. Do a `rbenv rehash` if necessary. Note
 that on my machine I had over 700 gems installed, and activating the gem
@@ -79,8 +82,8 @@ That booted our app in the background:
 
 ```
 $ ps ax | grep spring
- 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
- 8698 pts/6    Sl     0:02 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
+ 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
+ 8698 pts/6    Sl     0:02 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
 ```
 
 We can see two processes, one is the Spring server, the other is the
@@ -118,8 +121,8 @@ automatically. Note that the application process id is 8698 above. Let's
 ```
 $ touch config/application.rb
 $ ps ax | grep spring
- 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
- 8876 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
+ 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
+ 8876 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
 ```
 
 The application process detected the change and exited. The server process
@@ -151,9 +154,9 @@ the application in development mode.
 
 ```
 $ ps ax | grep spring
- 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
- 8876 pts/6    Sl     0:15 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
- 9088 pts/6    Sl     0:01 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -r bundler/setup -r spring/server -e Spring::Server.boot
+ 8692 pts/6    Sl     0:00 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
+ 8876 pts/6    Sl     0:15 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
+ 9088 pts/6    Sl     0:01 /home/turnip/.rbenv/versions/1.9.3-p194/bin/ruby -I ... -r spring/server -r bundler/setup -e Spring::Server.boot
 ```
 
 Running rake is faster the second time:

data/lib/spring.rb

@@ -10,8 +10,9 @@ require "spring/commands"
 class Spring
   SERVER_COMMAND = [
     File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')),
-    "-r", "bundler/setup",
+    "-I", File.expand_path("../", __FILE__),
     "-r", "spring/server",
+    "-r", "bundler/setup",
     "-e", "Spring::Server.boot"
   ]
 
@@ -51,6 +52,32 @@ class Spring
   end
 
   def run(args)
+    if self.class.command_registered?(args.first)
+      run_command(args)
+    else
+      print_help
+    end
+  end
+
+  private
+
+  def print_help
+    puts <<-EOT
+Usage: spring COMMAND [ARGS]
+
+The most common spring commands are:
+ rake        Run a rake task
+ console     Start the Rails console
+ runner      Execute a command with the Rails runner
+ generate    Trigger a Rails generator
+
+ test        Execute a Test::Unit test
+ rspec       Execute an RSpec spec
+EOT
+    false
+  end
+
+  def run_command(args)
     boot_server unless server_running?
 
     application, client = UNIXSocket.pair
@@ -91,8 +118,6 @@ class Spring
     server.close if server
   end
 
-  private
-
   def rails_env_for(command_name)
     command = Spring.command(command_name)
 

data/lib/spring/commands.rb

@@ -5,8 +5,16 @@ class Spring
     attr_reader :commands
   end
 
-  def self.register_command(name, klass)
-    commands[name] = klass.new
+  def self.register_command(name, klass, options = {})
+    commands[name] = klass
+
+    if options[:alias]
+      commands[options[:alias]] = klass
+    end
+  end
+
+  def self.command_registered?(name)
+    commands.has_key?(name)
   end
 
   def self.command(name)
@@ -35,7 +43,7 @@ class Spring
         require File.expand_path(args.first)
       end
     end
-    Spring.register_command "test", Test
+    Spring.register_command "test", Test.new
 
     class RSpec
       def env
@@ -51,7 +59,7 @@ class Spring
         ::RSpec::Core::Runner.run(args)
       end
     end
-    Spring.register_command "rspec", RSpec
+    Spring.register_command "rspec", RSpec.new
 
     class Rake
       def setup
@@ -63,7 +71,7 @@ class Spring
         ::Rake.application.run
       end
     end
-    Spring.register_command "rake", Rake
+    Spring.register_command "rake", Rake.new
 
     class Console
       def setup
@@ -75,7 +83,7 @@ class Spring
         ::Rails::Console.start(::Rails.application)
       end
     end
-    Spring.register_command "console", Console
+    Spring.register_command "console", Console.new, alias: "c"
 
     class Generate
       def setup
@@ -87,7 +95,7 @@ class Spring
         require "rails/commands/generate"
       end
     end
-    Spring.register_command "generate", Generate
+    Spring.register_command "generate", Generate.new, alias: "g"
 
     class Runner
       def call(args)
@@ -96,6 +104,6 @@ class Spring
         require "rails/commands/runner"
       end
     end
-    Spring.register_command "runner", Runner
+    Spring.register_command "runner", Runner.new, alias: "r"
   end
 end

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 class Spring
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spring.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activesupport'
+  gem.add_development_dependency 'activesupport'
   gem.add_development_dependency 'rake'
 end

data/test/acceptance/app_test.rb

@@ -122,6 +122,10 @@ class AppTest < ActiveSupport::TestCase
     assert_speedup
   end
 
+  test "help message when called without arguments" do
+    assert_stdout BINFILE, 'Usage: spring COMMAND [ARGS]'
+  end
+
   test "test changes are picked up" do
     assert_successful_run test_command
 
@@ -208,4 +212,8 @@ class AppTest < ActiveSupport::TestCase
   test "custom commands" do
     assert_stdout "#{BINFILE} custom", "omg"
   end
+
+  test "runner alias" do
+    assert_stdout "#{BINFILE} r 'puts 1'", "1"
+  end
 end

data/test/apps/rails-3-2/config/spring.rb

@@ -4,4 +4,4 @@ class CustomCommand
   end
 end
 
-Spring.register_command "custom", CustomCommand
+Spring.register_command "custom", CustomCommand.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false