spring 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0824c6fabd2c8830c1a610f25821f746367cee6f
-  data.tar.gz: 108cf6e1bd07af03dfbfe9078727315eab78b39e
+  metadata.gz: 38ac640c7514d41f28205416b110496f5ddb14d2
+  data.tar.gz: 89b956912fee2b1b75e20c9f06986c33671a4b27
 SHA512:
-  metadata.gz: c2ca57a02be596e85692d0b8e75f60bc28278f99d82bd5352e5f9ef283c49720b75cca34101061e897f692923d83e030d57da6796e90611c68c01dd3bf688813
-  data.tar.gz: ec4654a54e32ea00418c230ed1c159d6cc628309bb025292c109458140c5b6c41212106004c2b3c2546fc53b81027a3f70b3a58d8b1ad5d695afbad6c43c2f8b
+  metadata.gz: 1251675f9d073842dc030e0855161594a31807b80ef64b530d2b8a759b9c6bf075a3cb6eb330e108b19483dcb8fb5d50a19a7e0be7a5c777d55326c56577e767
+  data.tar.gz: a96b76e7742eda3aa9a07ce69f6dc6d6f9de1d6bed809a2b7fc2f165dc49c282214015c229f21e9a157024bc14a4c3a81b2edd596377cee93f7dad70527a0cde

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.9.1
+
+* Environment variables which were created during application startup are no
+  longer overwritten.
+* Support for generating multiple binstubs at once. Use --all to
+  generate all, otherwise you can pass multiple command names to the
+  binstub command.
+* The `testunit` command has been extracted to the
+  `spring-commands-testunit` gem, because it's not necessary in Rails 4,
+  where you can just run `rake test path/to/test`.
+* The `~/.spring.rb` config file is loaded before bundler, so it's a good
+  place to require extra commands which you want to use in all projects,
+  without having to add those commands to the Gemfile of each individual
+  project.
+* Any gems in the bundle with names which start with "spring-commands-"
+  are now autoloaded. This makes it less faffy to add additional
+  commands.
+
 ## 0.9.0
 
 * Display spring version in the help message

data/README.md

@@ -40,7 +40,7 @@ For this walkthrough I've generated a new Rails application, and run
 Let's run a test:
 
 ```
-$ time spring testunit test/functional/posts_controller_test.rb
+$ time spring rake test test/functional/posts_controller_test.rb
 Run options:
 
 # Running tests:
@@ -70,7 +70,7 @@ Spring is running:
 The next run is faster:
 
 ```
-$ time spring testunit test/functional/posts_controller_test.rb
+$ time spring rake test test/functional/posts_controller_test.rb
 Run options:
 
 # Running tests:
@@ -89,12 +89,10 @@ sys     0m0.059s
 Writing `spring` before every command gets a bit tedious. Spring binstubs solve this:
 
 ```
-$ spring binstub testunit
-$ spring binstub rake
-$ spring binstub rails
+$ spring binstub rake rails
 ```
 
-This will generate `bin/testunit`, `bin/rake` and `bin/rails`. They
+This will generate `bin/rake` and `bin/rails`. They
 replace any binstubs that you might already have in your `bin/`
 directory. Check them in to source control.
 
@@ -168,16 +166,9 @@ You can also install the following gems for additional commands:
 
 * [spring-commands-rspec](https://github.com/jonleighton/spring-commands-rspec)
 * [spring-commands-cucumber](https://github.com/jonleighton/spring-commands-cucumber)
-
-### `testunit`
-
-Runs a test (e.g. Test::Unit, MiniTest::Unit, etc.)
-
-This command can also recursively run a directory of tests. For example,
-`spring testunit test/functional` will run `test/functional/**/*_test.rb`.
-
-If your test helper file takes a while to load, consider preloading it
-(see "Running code before forking" below).
+* [spring-commands-testunit](https://github.com/jonleighton/spring-commands-testunit) - useful for
+  running `Test::Unit` tests on Rails 3, since only Rails 4 allows you
+  to use `rake test path/to/test` to run a particular test/directory.
 
 ### `rake`
 
@@ -205,7 +196,11 @@ speed-up).
 
 ## Configuration
 
-Spring will read `~/.spring.rb` and `config/spring.rb` for custom settings, described below.
+Spring will read `~/.spring.rb` and `config/spring.rb` for custom
+settings. Note that `~/.spring.rb` is loaded *before* bundler, but
+`config/spring.rb` is loaded *after* bundler. This means that in
+`~/.spring.rb` you are able to load extra commands without them having
+to be in the bundle of the project you are working on.
 
 ### Application root
 

data/lib/spring/application.rb

@@ -15,6 +15,7 @@ module Spring
       @mutex      = Mutex.new
       @waiting    = 0
       @exiting    = false
+      @env_keys   = ENV.keys
 
       # Workaround for GC bug in Ruby 2 which causes segfaults if watcher.to_io
       # instances get dereffed.
@@ -46,12 +47,6 @@ module Spring
         ActiveSupport::Dependencies.mechanism = :load
       end
 
-      # Ensure eager loading does not take place, even though it usually would do
-      # in test mode with config.cache_classes = true. Eager loading in this situation
-      # just makes the initial run take longer without much gain in subsequent runs,
-      # at least in my testing.
-      Rails::Application::Finisher.initializers.delete_if { |i| i.name == :eager_load! }
-
       require Spring.application_root_path.join("config", "environment")
 
       Rails.application.config.cache_classes = false
@@ -113,7 +108,8 @@ module Spring
         IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
 
         ARGV.replace(args)
-        ENV.replace(env)
+        @env_keys.each { |k| ENV.delete k }
+        ENV.update(env)
 
         connect_database
         srand

data/lib/spring/client/binstub.rb

@@ -1,10 +1,10 @@
 module Spring
   module Client
     class Binstub < Command
-      attr_reader :bindir, :name, :command
+      attr_reader :bindir, :commands
 
       def self.description
-        "Generate spring based binstubs."
+        "Generate spring based binstubs. Use --all to generate a binstub for all known commands."
       end
 
       def self.call(args)
@@ -12,52 +12,65 @@ module Spring
         super
       end
 
+      class RailsCommand
+        def fallback
+          <<CODE
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
+CODE
+        end
+      end
+
       def initialize(args)
         super
 
-        @bindir  = env.root.join("bin")
-        @name    = args[1]
-        @command = Spring.commands[name]
+        @bindir   = env.root.join("bin")
+        @commands = args.drop(1).inject({}) { |mem, name| mem.merge(find_commands(name)) }
       end
 
-      def call
-        if command || name == "rails"
-          bindir.mkdir unless bindir.exist?
-          generate_binstub
+      def find_commands(name)
+        case name
+        when "--all"
+          commands = Spring.commands
+          commands.delete_if { |name, _| name.start_with?("rails_") }
+          commands["rails"] = RailsCommand.new
+          commands
+        when "rails"
+          { name => RailsCommand.new }
         else
-          $stderr.puts "The '#{name}' command is not known to spring."
-          exit 1
+          if command = Spring.commands[name]
+            { name => command }
+          else
+            $stderr.puts "The '#{name}' command is not known to spring."
+            exit 1
+          end
         end
       end
 
-      def binstub
-        bindir.join(name)
+      def call
+        bindir.mkdir unless bindir.exist?
+        commands.each { |name, command| generate_binstub(name, command) }
       end
 
-      def generate_binstub
-        File.write(binstub, <<CODE)
+      def generate_binstub(name, command)
+        File.write(bindir.join(name), <<CODE)
 #!/usr/bin/env ruby
 
 if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
-#{fallback.strip.gsub(/^/, "  ")}
+#{fallback(name, command).strip.gsub(/^/, "  ")}
 else
   ARGV.unshift "#{name}"
   load Gem.bin_path("spring", "spring")
 end
 CODE
 
-        binstub.chmod 0755
+        bindir.join(name).chmod 0755
       end
 
-      def fallback
+      def fallback(name, command)
         if command.respond_to?(:fallback)
           command.fallback
-        elsif name == "rails"
-          <<CODE
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
-CODE
         else
           %{exec "bundle", "exec", "#{name}", *ARGV}
         end

data/lib/spring/commands.rb

@@ -21,17 +21,20 @@ module Spring
 
   require "spring/commands/rails"
   require "spring/commands/rake"
-  require "spring/commands/testunit"
-
-  # If the config/spring.rb contains requires for commands from other gems,
-  # then we need to be under bundler.
-  require "bundler/setup"
 
   # Load custom commands, if any.
   # needs to be at the end to allow modification of existing commands.
   config = File.expand_path("~/.spring.rb")
   require config if File.exist?(config)
 
+  # If the config/spring.rb contains requires for commands from other gems,
+  # then we need to be under bundler.
+  require "bundler/setup"
+
+  Gem::Specification.map(&:name).grep(/^spring-commands-/).each do |command|
+    require command
+  end
+
   config = File.expand_path("./config/spring.rb")
   require config if File.exist?(config)
 end

data/lib/spring/commands/rake.rb

@@ -6,8 +6,8 @@ module Spring
       end
 
       self.environment_matchers = {
-        :default                     => "test",
-        /^(test|spec|cucumber)($|:)/ => "test"
+        :default     => "test",
+        /^test($|:)/ => "test"
       }
 
       def env(args)

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/acceptance/app_test.rb

@@ -174,15 +174,13 @@ class AppTest < ActiveSupport::TestCase
   end
 
   def spring_test_command
-    "#{spring} testunit #{@test}"
+    "#{spring} #{rails_3? ? 'testunit' : 'rake test'} #{@test}"
   end
 
   def generate_app
     Bundler.with_clean_env do
-      # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
-
       assert system("(gem list rails --installed --version '#{rails_version}' || " \
-                      "gem install rails --clear-sources --source http://rubygems.org --version '#{rails_version}') > /dev/null")
+                      "gem install rails --version '#{rails_version}') > /dev/null")
 
       # Have to shell out otherwise bundler prevents us finding the gem
       version = `ruby -e 'puts Gem::Specification.find_by_name("rails", "#{rails_version}").version'`.chomp
@@ -193,10 +191,12 @@ class AppTest < ActiveSupport::TestCase
       FileUtils.mkdir_p(user_home)
       FileUtils.rm_rf("#{app_root}/test/performance/")
 
-      File.write(
-        "#{app_root}/Gemfile",
-        File.read("#{app_root}/Gemfile").sub("https://rubygems.org", "http://rubygems.org")
-      )
+      if rails_3?
+        File.write(
+          "#{app_root}/Gemfile",
+          File.read("#{app_root}/Gemfile") + "gem 'spring-commands-testunit'\n"
+        )
+      end
     end
   end
 
@@ -373,11 +373,17 @@ class AppTest < ActiveSupport::TestCase
       FileUtils.mv "#{app_root}/bin", "#{app_root}/bin~" if File.exist?("#{app_root}/bin")
 
       app_run "#{spring} binstub rake"
-      app_run "#{spring} binstub rails"
-
       assert_success "bin/rake -T", stdout: "rake db:migrate"
+
+      app_run "#{spring} binstub rake rails"
       assert_success "bin/rails runner 'puts %(omg)'", stdout: "omg"
       assert_success "bin/rails server --help", stdout: "Usage: rails server"
+
+      FileUtils.rm ["#{app_root}/bin/rails", "#{app_root}/bin/rake"]
+
+      app_run "#{spring} binstub --all"
+      assert_success "bin/rake -T", stdout: "rake db:migrate"
+      assert_success "bin/rails runner 'puts %(omg)'", stdout: "omg"
     ensure
       if File.exist?("#{app_root}/bin~")
         FileUtils.rm_rf "#{app_root}/bin"
@@ -471,15 +477,25 @@ class AppTest < ActiveSupport::TestCase
   end
 
   test "changing the environment between runs" do
-    env["OMG"] = "1"
-    env["FOO"] = "1"
+    begin
+      application = "#{app_root}/config/application.rb"
+      application_contents = File.read(application)
+
+      File.write(application, "#{application_contents}\nENV['BAR'] = 'bar'")
 
-    assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "1"
+      env["OMG"] = "1"
+      env["FOO"] = "1"
 
-    env["OMG"] = "2"
-    env.delete "FOO"
+      assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "1"
+      assert_success %(#{spring} rails runner 'p ENV["BAR"]'), stdout: "bar"
 
-    assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "2"
-    assert_success %(#{spring} rails runner 'p ENV.key?("FOO")'), stdout: "false"
+      env["OMG"] = "2"
+      env.delete "FOO"
+
+      assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "2"
+      assert_success %(#{spring} rails runner 'p ENV.key?("FOO")'), stdout: "false"
+    ensure
+      File.write(application, application_contents)
+    end
   end
 end

data/test/unit/commands_test.rb

@@ -32,7 +32,6 @@ class CommandsTest < ActiveSupport::TestCase
     assert_nil command.env(["foo"])
     assert_equal "test", command.env(["test"])
     assert_equal "test", command.env(["test:models"])
-    assert_equal "test", command.env(["spec"])
     assert_nil command.env(["test_foo"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,7 +67,6 @@ files:
 - lib/spring/commands.rb
 - lib/spring/commands/rails.rb
 - lib/spring/commands/rake.rb
-- lib/spring/commands/testunit.rb
 - lib/spring/configuration.rb
 - lib/spring/env.rb
 - lib/spring/errors.rb

data/lib/spring/commands/testunit.rb

@@ -1,36 +0,0 @@
-module Spring
-  module Commands
-    class TestUnit
-      def env(*)
-        "test"
-      end
-
-      def call
-        $LOAD_PATH.unshift "test"
-        ARGV << "test" if ARGV.empty?
-        ARGV.each do |arg|
-          break if arg.start_with?("-")
-          require_test(File.expand_path(arg))
-        end
-      end
-
-      def require_test(path)
-        if File.directory?(path)
-          Dir[File.join path, "**", "*_test.rb"].each { |f| require f }
-        else
-          require path
-        end
-      end
-
-      def description
-        "Execute a Test::Unit test."
-      end
-
-      def fallback
-        %{exec "bundle", "exec", "ruby", "-Itest", *ARGV}
-      end
-    end
-
-    Spring.register_command "testunit", TestUnit.new
-  end
-end