spring 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2357648d0fc0f884098f352ab693e66556de6df
-  data.tar.gz: df070385ccdf9fbbb6d48770f21886dbab93516e
+  metadata.gz: e8e020e7dc1eb3f27faa79634ad8c9ff4e9c1ddb
+  data.tar.gz: 5bd55b0c1e659701f4cd61afaba2b854070bc482
 SHA512:
-  metadata.gz: cc65ad0c92b3a134505805c9b8ed999029b49030ab0ca8e46473c47c18a6ff17804de47897a7493e28765dc3fa6dc18df2de5beb4be7b8f6bdf04bd979d2a7da
-  data.tar.gz: 1b408b559590cf9a1b13da2d390d191964809107edc00c4b67e6c54384d05df1a5f9673fcc796318e1962c1f3c4e9fd49141596a3692c80b831d9cc933dd67c5
+  metadata.gz: ebecedcb2e4a616615dc33a752e54a380f685e9d43227f67a5c3a0f29ae8c500df20ab75705778e13f2efa5c52d51f4ed682472eda7b12006e3720a762232dd9
+  data.tar.gz: 349a6b90ba96409a80e90a14e5bc39d7057970d3a6a81eb8fe7e6c6b7cd48aebc7465d687ffd08b704a3977cc0c3405a72cc93521b022fd54ef7a13a154ba3e8

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.1
+
+* Fix `$0` so that it is no longer prefixed with "spring ", as doing
+  this cause issues with rspec when running just `rspec` with no
+  arguments.
+* Ensure we're always connected to a tty when preloading the
+  application in the background, in order to avoid loading issues
+  with readline + libedit which affected pry-rails.
+
 ## 1.1.0
 
 * A `bin/spring` binstub is now generated. This allows us to load spring

data/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing guide
+
+## Getting set up
+
+Check out the code and run `bundle install` as usual.
+
+## Running tests
+
+Running `rake` will run all tests. There are both unit tests and
+acceptance tests. You can run them individually with `rake test:unit` or
+`rake test:acceptance`.
+
+If one doesn't already exist, the acceptance tests will generate a dummy
+Rails app in `test/apps/`. On each test run, the dummy app is copied to
+`test/apps/tmp/` so that any changes won't affect the pre-generated app
+(this saves us having to regenerate the app on each run).
+
+If tests are failing and you don't know why, it might be that the
+pre-generated app has become inconsistent in some way. In that case the
+best solution is to purge it with `rm -rf test/apps/*` and then run the
+acceptance tests again, which will generate a new app.
+
+## Testing different Rails versions
+
+You can set the `RAILS_VERSION` environment variable:
+
+```
+$ RAILS_VERSION="~> 3.2.0" rake test:acceptance
+```
+
+The apps in `test/apps` will be named based on the rails version and the
+spring version.

data/README.md

@@ -7,6 +7,8 @@ Spring is a Rails application preloader. It speeds up development by
 keeping your application running in the background so you don't need to
 boot it every time you run a test, rake task or migration.
 
+**Upgrading to 1.1? It's recommended to run `bundle exec spring binstub --all` to regenerate your binstubs.**
+
 ## Features
 
 * Totally automatic; no need to explicitly start and stop the background process

data/lib/spring/application.rb

@@ -1,5 +1,6 @@
 require "spring/boot"
 require "set"
+require "pty"
 
 module Spring
   class Application
@@ -102,12 +103,16 @@ module Spring
       watcher.add loaded_application_features
       watcher.add Spring.gemfile, "#{Spring.gemfile}.lock"
 
-      if defined?(Rails)
+      if defined?(Rails) && Rails.application
         watcher.add Rails.application.paths["config/initializers"]
         watcher.add Rails.application.paths["config/database"]
       end
     end
 
+    def eager_preload
+      with_pty { preload }
+    end
+
     def run
       state :running
       manager.puts
@@ -128,7 +133,7 @@ module Spring
       manager.puts
 
       stdout, stderr, stdin = streams = 3.times.map { client.recv_io }
-      [STDOUT, STDERR].zip([stdout, stderr]).each { |a, b| a.reopen(b) }
+      [STDOUT, STDERR, STDIN].zip(streams).each { |a, b| a.reopen(b) }
 
       preload unless preloaded?
 
@@ -144,8 +149,6 @@ module Spring
       end
 
       pid = fork {
-        Process.setsid
-        STDIN.reopen(stdin)
         IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
         trap("TERM", "DEFAULT")
 
@@ -172,7 +175,7 @@ module Spring
       }
 
       disconnect_database
-      [STDOUT, STDERR].each { |stream| stream.reopen(spring_env.log_file) }
+      reset_streams
 
       log "forked #{pid}"
       manager.puts pid
@@ -273,5 +276,18 @@ module Spring
       stream.puts("#{first}: #{error} (#{error.class})")
       rest.each { |line| stream.puts("\tfrom #{line}") }
     end
+
+    def with_pty
+      PTY.open do |master, slave|
+        [STDOUT, STDERR, STDIN].each { |s| s.reopen slave }
+        yield
+        reset_streams
+      end
+    end
+
+    def reset_streams
+      [STDOUT, STDERR].each { |stream| stream.reopen(spring_env.log_file) }
+      STDIN.reopen("/dev/null")
+    end
   end
 end

data/lib/spring/application/boot.rb

@@ -1,3 +1,6 @@
+# This is necessary for the terminal to work correctly when we reopen stdin.
+Process.setsid
+
 require "spring/application"
 
 app = Spring::Application.new(
@@ -6,11 +9,10 @@ app = Spring::Application.new(
 )
 
 Signal.trap("TERM") { app.terminate }
-Signal.trap("TTOU", "IGNORE")
 
 Spring::ProcessTitleUpdater.run { |distance|
   "spring app    | #{app.app_name} | started #{distance} ago | #{app.app_env} mode"
 }
 
-app.preload if ENV.delete("SPRING_PRELOAD") == "1"
+app.eager_preload if ENV.delete("SPRING_PRELOAD") == "1"
 app.run

data/lib/spring/command_wrapper.rb

@@ -42,7 +42,7 @@ module Spring
     end
 
     def process_title
-      ["spring", name, *ARGV].join(" ")
+      [name, *ARGV].join(" ")
     end
 
     def gem_name

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/acceptance/helper.rb

@@ -267,8 +267,8 @@ module Spring
       # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
       def generate
         Bundler.with_clean_env do
-          system("(gem list rails --installed --version '#{version_constraint}' || " \
-                    "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}')")
+          system("gem list rails --installed --version '#{version_constraint}' || " \
+                   "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}'")
 
           skips = %w(--skip-bundle --skip-javascript --skip-sprockets)
           skips << "--skip-spring" if version.bundles_spring?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -49,6 +49,7 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md