Revert "Merge pull request #329 from merhard/master"

This reverts commit 2480a8e, reversing
changes made to 9cd21d2.

Revert "Changelog: binstub_prelude support for commands. #329."

This reverts commit 8a3546d.

Conflicts:
	CHANGELOG.md

Reasoning:

* #329 (comment)
* jonleighton/spring-commands-rspec#20 (comment)
* 2480a8e

Since the thing that this feature was aiming to allow is already
possible via the commands API, I prefer not to add an extra feature to
Spring.

Author: jonleighton

CHANGELOG.md

@@ -2,9 +2,6 @@
 
 * Accept -e and --environment options for `rails console`.
 * Watch `config/secrets.yml` by default. #289 - @morgoth
-* Custom Spring commands that implement `#binstub_prelude` will have that
-  snippet of code inserted into generated binstubs just after Spring is
-  set up. #329 - @merhard
 * Change monkey-patched `Kernel.raise` from public to private (to match default Ruby behavior) #351 - @mattbrictson
 * Let application_id also respect RUBY_VERSION for the use case of switching between Ruby versions for a given Rails app - @methodmissing
 

lib/spring/client/binstub.rb

@@ -104,14 +104,8 @@ def generate(fallback = nil)
             fallback = "require 'bundler/setup'\n" \
                        "load Gem.bin_path('#{command.gem_name}', '#{command.exec_name}')\n"
           end
-          if prelude = command.binstub_prelude
-            formatted_prelude = prelude.chomp.gsub(/^(?!$)/, '  ')
-            loader = LOADER.sub(/^end$/, "else\n#{formatted_prelude}\nend")
-          else
-            loader = LOADER
-          end
 
-          File.write(command.binstub, "#!/usr/bin/env ruby\n#{loader}#{fallback}")
+          File.write(command.binstub, "#!/usr/bin/env ruby\n#{LOADER}#{fallback}")
           command.binstub.chmod 0755
         end
 

lib/spring/command_wrapper.rb

@@ -69,12 +69,6 @@ def binstub_name
       "bin/#{name}"
     end
 
-    def binstub_prelude
-      if command.respond_to?(:binstub_prelude)
-        command.binstub_prelude
-      end
-    end
-
     def exec
       if binstub.exist?
         binstub.to_s

test/acceptance/app_test.rb

@@ -188,25 +188,6 @@ def exec_name
     assert_success "bin/rake -T", stdout: "rake db:migrate"
   end
 
-  test "binstub with prelude code" do
-    prelude = "Prelude code line 1\nPrelude code line 2\n"
-
-    File.write(app.spring_config, <<-CODE)
-      class PreludeCode
-        def binstub_prelude
-          "#{prelude}"
-        end
-      end
-
-      Spring.register_command "prelude", PreludeCode.new
-    CODE
-
-    assert_success "bin/spring binstub prelude"
-    prelude.each_line do |line|
-      assert app.path("bin/prelude").read.include?(line), "'#{line}' not found in bin/prelude"
-    end
-  end
-
   test "binstub when spring is uninstalled" do
     app.run! "gem uninstall --ignore-dependencies spring"
     File.write(app.gemfile, app.gemfile.read.gsub(/gem 'spring.*/, ""))