spring 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e40e388796f0694f931b786ba678246e64bb51
-  data.tar.gz: fce7e7274cf3155517ca3f11411fb7f90d3ce1a6
+  metadata.gz: 6c37f7b4eddf6e88df7db145d63c44a92d7d166a
+  data.tar.gz: eee66fab5c0acb4c1b26a268cd544caeb01ab129
 SHA512:
-  metadata.gz: ea9be374bc7b1dec0ada6cb6aec41990fb872e96272c0536562a1c884fdc93016bd3d3b2abed67d0bcd36af739419bd2332f2add3699d3944a5a8f6f2cb9e763
-  data.tar.gz: f9f8ca0814f602e7ce30f05ee39e8c6d7313e38e1302c55d28ce30c10269974da5ca214709d4ec5c61df67053117aba92c066956c8c79bc92720363b61f0c1f4
+  metadata.gz: 0f402b076faef2f886e1b881732d1fa98e15ddb2652b72053755fa321bfe42a577a25adbf76529c5c6479ea3f098cbcb3515ecf9ae60e52dbe4c8b19f1048d4e
+  data.tar.gz: 2c48efd6d59b97147271a09689fef252f1ee379c5494a94faf8ef44b022761e751d02c37dc3f7acb59ec2ace1520cc64485d4ad0eb6db9f08da3028028db3113

data/README.md

@@ -294,6 +294,9 @@ settings. Note that `~/.spring.rb` is loaded *before* bundler, but
 projects without having to be added to the project's Gemfile, require
 them in your `~/.spring.rb`.
 
+`config/spring_client.rb` is also loaded before bundler and before a 
+server process is started, it can be used to add new top-level commands.
+
 ### Application root
 
 Spring must know how to find your Rails application. If you have a

data/bin/spring

@@ -43,6 +43,7 @@ if defined?(Gem)
   end
 end
 
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+lib = File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib) # enable local development
 require 'spring/client'
 Spring::Client.run(ARGV)

data/lib/spring/client.rb

@@ -14,12 +14,14 @@ module Spring
   module Client
     COMMANDS = {
       "help"      => Client::Help,
+      "-h"        => Client::Help,
+      "--help"    => Client::Help,
       "binstub"   => Client::Binstub,
       "stop"      => Client::Stop,
       "status"    => Client::Status,
       "rails"     => Client::Rails,
       "-v"        => Client::Version,
-      "--version" => Client::Version
+      "--version" => Client::Version,
     }
 
     def self.run(args)
@@ -36,3 +38,9 @@ module Spring
     end
   end
 end
+
+# allow users to add hooks that do not run in the server
+# or modify start/stop
+if File.exist?("config/spring_client.rb")
+  require "./config/spring_client.rb"
+end

data/lib/spring/client/binstub.rb

@@ -36,7 +36,7 @@ unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
     Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"

data/lib/spring/test/acceptance_test.rb

@@ -1,9 +1,8 @@
-# encoding: utf-8
-
 require "io/wait"
 require "timeout"
 require "spring/sid"
 require "spring/client"
+require "active_support/core_ext/string/strip"
 
 module Spring
   module Test
@@ -59,6 +58,14 @@ module Spring
         end
       end
 
+      def without_gem(name)
+        gem_home = app.gem_home.join('gems')
+        FileUtils.mv(gem_home.join(name), app.root)
+        yield
+      ensure
+        FileUtils.mv(app.root.join(name), gem_home)
+      end
+
       setup do
         generator.generate_if_missing
         generator.install_spring
@@ -77,6 +84,14 @@ module Spring
 
       test "help message when called without arguments" do
         assert_success "bin/spring", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert app.spring_env.server_running?
+      end
+
+      test "shows help" do
+        assert_success "bin/spring help", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert_success "bin/spring -h", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert_success "bin/spring --help", stdout: 'Usage: spring COMMAND [ARGS]'
+        refute app.spring_env.server_running?
       end
 
       test "test changes are picked up" do
@@ -111,13 +126,13 @@ module Spring
       test "app gets reloaded when preloaded files change" do
         assert_success app.spring_test_command
 
-        File.write(app.application_config, app.application_config.read + <<-CODE)
+        File.write(app.application_config, app.application_config.read + <<-RUBY.strip_heredoc)
           class Foo
             def self.omg
               raise "omg"
             end
           end
-        CODE
+        RUBY
         File.write(app.test, app.test.read.sub("get :index", "Foo.omg"))
 
         app.await_reload
@@ -160,7 +175,7 @@ module Spring
         # Start spring before setting up the command, to test that it gracefully upgrades itself
         assert_success "bin/rails runner ''"
 
-        File.write(app.spring_config, <<-CODE)
+        File.write(app.spring_config, <<-RUBY.strip_heredoc)
           class CustomCommand
             def call
               puts "omg"
@@ -172,7 +187,7 @@ module Spring
           end
 
           Spring.register_command "custom", CustomCommand.new
-        CODE
+        RUBY
 
         assert_success "bin/spring custom", stdout: "omg"
 
@@ -194,52 +209,55 @@ module Spring
       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.*/, ""))
-        assert_success "bin/rake -T", stdout: "rake db:migrate"
+        without_gem "spring-#{Spring::VERSION}" do
+          File.write(app.gemfile, app.gemfile.read.gsub(/gem 'spring.*/, ""))
+          assert_success "bin/rake -T", stdout: "rake db:migrate"
+        end
       end
 
       test "binstub upgrade" do
-        File.write(app.path("bin/rake"), <<CODE)
-#!/usr/bin/env ruby
-
-if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
-  exec "bundle", "exec", "rake", *ARGV
-else
-  ARGV.unshift "rake"
-  load Gem.bin_path("spring", "spring")
-end
-CODE
-
-        File.write(app.path("bin/rails"), <<CODE)
-#!/usr/bin/env ruby
-
-if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
-  APP_PATH = File.expand_path('../../config/application',  __FILE__)
-  require_relative '../config/boot'
-  require 'rails/commands'
-else
-  ARGV.unshift "rails"
-  load Gem.bin_path("spring", "spring")
-end
-CODE
+        File.write(app.path("bin/rake"), <<-RUBY.strip_heredoc)
+          #!/usr/bin/env ruby
+
+          if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
+            exec "bundle", "exec", "rake", *ARGV
+          else
+            ARGV.unshift "rake"
+            load Gem.bin_path("spring", "spring")
+          end
+        RUBY
+
+        File.write(app.path("bin/rails"), <<-RUBY.strip_heredoc)
+          #!/usr/bin/env ruby
+
+          if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?
+            APP_PATH = File.expand_path('../../config/application',  __FILE__)
+            require_relative '../config/boot'
+            require 'rails/commands'
+          else
+            ARGV.unshift "rails"
+            load Gem.bin_path("spring", "spring")
+          end
+        RUBY
 
         assert_success "bin/spring binstub --all", stdout: "upgraded"
 
-        assert_equal app.path("bin/rake").read, <<CODE
-#!/usr/bin/env ruby
-#{Spring::Client::Binstub::LOADER.strip}
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
-CODE
+        expected = <<-RUBY.gsub(/^          /, "")
+          #!/usr/bin/env ruby
+          #{Spring::Client::Binstub::LOADER.strip}
+          require 'bundler/setup'
+          load Gem.bin_path('rake', 'rake')
+        RUBY
+        assert_equal expected, app.path("bin/rake").read
 
-    assert_equal app.path("bin/rails").read, <<CODE
-#!/usr/bin/env ruby
-#{Spring::Client::Binstub::LOADER.strip}
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
-CODE
+        expected = <<-RUBY.gsub(/^          /, "")
+          #!/usr/bin/env ruby
+          #{Spring::Client::Binstub::LOADER.strip}
+          APP_PATH = File.expand_path('../../config/application',  __FILE__)
+          require_relative '../config/boot'
+          require 'rails/commands'
+        RUBY
+        assert_equal expected, app.path("bin/rails").read
       end
 
       test "after fork callback" do
@@ -252,6 +270,13 @@ CODE
         assert_success "bin/rails runner 'puts 2'", stdout: "!callback!\n2"
       end
 
+      test "can define client tasks" do
+        File.write("#{app.spring_config.sub('.rb', '_client.rb')}", <<-RUBY)
+          Spring::Client::COMMANDS["foo"] = lambda { |args| puts "bar -- \#{args.inspect}" }
+        RUBY
+        assert_success "bin/spring foo --baz", stdout: "bar -- [\"foo\", \"--baz\"]\n"
+      end
+
       test "missing config/application.rb" do
         app.application_config.delete
         assert_failure "bin/rake -T", stderr: "unable to find your config/application.rb"
@@ -278,17 +303,17 @@ CODE
       end
 
       test "setting env vars with rake" do
-        File.write(app.path("lib/tasks/env.rake"), <<-'CODE')
+        File.write(app.path("lib/tasks/env.rake"), <<-RUBY.strip_heredoc)
           task :print_rails_env => :environment do
             puts Rails.env
           end
 
           task :print_env do
-            ENV.each { |k, v| puts "#{k}=#{v}" }
+            ENV.each { |k, v| puts "\#{k}=\#{v}" }
           end
 
           task(:default).clear.enhance [:print_rails_env]
-        CODE
+        RUBY
 
         assert_success "bin/rake RAILS_ENV=test print_rails_env", stdout: "test"
         assert_success "bin/rake FOO=bar print_env", stdout: "FOO=bar"
@@ -305,7 +330,7 @@ CODE
       end
 
       test "changing the Gemfile works when spring calls into itself" do
-        File.write(app.path("script.rb"), <<-CODE)
+        File.write(app.path("script.rb"), <<-RUBY.strip_heredoc)
           gemfile = Rails.root.join("Gemfile")
           File.write(gemfile, "\#{gemfile.read}gem 'devise'\\n")
           Bundler.with_clean_env do
@@ -313,7 +338,7 @@ CODE
           end
           output = `\#{Rails.root.join('bin/rails')} runner 'require "devise"; puts "done";'`
           exit output == "done\n"
-        CODE
+        RUBY
 
         assert_success [%(bin/rails runner 'load Rails.root.join("script.rb")'), timeout: 60]
       end

data/lib/spring/test/application.rb

@@ -48,7 +48,7 @@ module Spring
       end
 
       def gem_home
-        path "vendor/gems/#{RUBY_VERSION}"
+        path "../gems/#{RUBY_VERSION}"
       end
 
       def user_home

data/lib/spring/test/application_generator.rb

@@ -52,19 +52,32 @@ module Spring
         FileUtils.mkdir_p(application.user_home)
         FileUtils.rm_rf(application.path("test/performance"))
 
-        File.write(application.gemfile, "#{application.gemfile.read}gem 'spring', '#{Spring::VERSION}'\n")
+        append_to_file(application.gemfile, "gem 'spring', '#{Spring::VERSION}'")
 
         if version.needs_testunit?
-          File.write(application.gemfile, "#{application.gemfile.read}gem 'spring-commands-testunit'\n")
+          append_to_file(application.gemfile, "gem 'spring-commands-testunit'")
+        end
+
+        rewrite_file(application.gemfile) do |c|
+          c.sub!("https://rubygems.org", "http://rubygems.org")
+          c.gsub!(/(gem '(byebug|web-console|sdoc|jbuilder)')/, "# \\1")
+          c
         end
 
-        File.write(application.gemfile, application.gemfile.read.sub("https://rubygems.org", "http://rubygems.org"))
 
         if application.path("bin").exist?
           FileUtils.cp_r(application.path("bin"), application.path("bin_original"))
         end
       end
 
+      def rewrite_file(file)
+        File.write(file, yield(file.read))
+      end
+
+      def append_to_file(file, add)
+        rewrite_file(file) { |c| c << "#{add}\n" }
+      end
+
       def generate_if_missing
         generate unless application.exists?
       end

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.3.6"
+  VERSION = "1.4.0"
 end

data/lib/spring/watcher.rb

@@ -25,6 +25,6 @@ module Spring
   end
 
   def self.watch(*items)
-    watcher.add *items
+    watcher.add(*items)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,7 +38,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails application preloader
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Preloads your application so things like console, rake and tests run
+  faster
 email:
 - j@jonathanleighton.com
 executables:
@@ -84,7 +99,7 @@ files:
 - lib/spring/watcher.rb
 - lib/spring/watcher/abstract.rb
 - lib/spring/watcher/polling.rb
-homepage: http://github.com/rails/spring
+homepage: https://github.com/rails/spring
 licenses:
 - MIT
 metadata: {}
@@ -104,9 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails application preloader
 test_files: []
-has_rdoc: