oop_rails_server 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64166a5f8c1b10c4954ae6fbee47d79fee0c1065
-  data.tar.gz: b9e67fb02b818e4d65a5189a91096d82f33733e9
+  metadata.gz: 1c9e054823517aa7b937701217e7cc349d6140d7
+  data.tar.gz: 9b2f63bc076d13fdeefe0ad08fcd82fff4ca6238
 SHA512:
-  metadata.gz: 06e6d7d246ddb75ed3e6866505f34f2714c7ad8b94bb8d79899eb916c514dbd877bbd82b8fa8bc27959733e4abeed60edebb0ce19058a558350fbbb0a61bdaa1
-  data.tar.gz: c362495d9d4b97c349dd60d87c7953d55b61c8eff112f3166fd793a76067e77452e42d56a6b90d8cd95d86cf96916022e7f2649550ccb50859b5489a288a0e5d
+  metadata.gz: 50a5b00e9f12ad296bb12a292deba5e173b8dc99f51387b7375c1914427327e08650f2043ef4b7310c3f7ab6723c069331873068d8cf2805d7369a8851f42607
+  data.tar.gz: 41b3c402d613e50c9866f7c358d64450b56de08fdb3f9ef39276414b555f30a6d5f784dbee6ecb3d30a05af390d76e77eae99caeab0c638fcdbed5dc398d0914

data/CHANGES.md

@@ -1,5 +1,13 @@
 # `oop_rails_server` Releases
 
+## 0.0.13, 6 October 2015
+
+* A significantly longer timeout (30 seconds, rather than 15) for starting up the Rails server; some versions of JRuby
+  in some environments seem to require this.
+* Much better error messages when the server fails to start up, or fails verification.
+* Added a workaround for the fact that Rails 3.1.x requires `rack-cache`, but a new version (1.3.0) was just released
+  that's incompatible with Ruby < 2.x. We now pin `rack-cache` to `< 1.3.0` when using Rails 3.1.x.
+
 ## 0.0.12, 4 October 2015
 
 * Much better error output if the Rails server fails to start up, and willingness to keep trying if it returns an

data/lib/oop_rails_server/rails_server.rb

@@ -201,6 +201,7 @@ gem 'rails'#{rails_version_spec}
 EOS
 
         f.puts "gem 'i18n', '< 0.7.0'" if RUBY_VERSION =~ /^1\.8\./
+        f.puts "gem 'rack-cache', '< 1.3.0'" if RUBY_VERSION =~ /^1\./
       end
 
       run_bundle_install!(:bootstrap)
@@ -229,6 +230,12 @@ EOS
         gemfile_contents << "\ngem 'i18n', '< 0.7.0'\n"
       end
 
+      # Since Rails 3.1.12 was released, a new version of the rack-cache gem, 1.3.0, was released that requires
+      # Ruby 2.0 or above. So, if we're running Rails 3.1.x, we lock the 'rack-cache' gem to an earlier version.
+      if rails_version && rails_version =~ /^3\.1\./
+        gemfile_contents << "\ngem 'rack-cache', '< 1.3.0'\n"
+      end
+
       # Apparently execjs released a version 2.2.0 that will happily install on Ruby 1.8.7, but which contains some
       # new-style hash syntax. As a result, we pin the version backwards in this one specific case.
       gemfile_contents << "\ngem 'execjs', '~> 2.0.0'\n" if RUBY_VERSION =~ /^1\.8\./
@@ -283,6 +290,8 @@ EOS
       @server_output_file ||= File.join(rails_root, 'log', 'rails-server.out')
     end
 
+    START_SERVER_TIMEOUT = 30
+
     def start_server!
       output = server_output_file
       cmd = "bundle exec rails server -p #{port} > '#{output}' 2>&1"
@@ -291,7 +300,7 @@ EOS
       server_pid_file = File.join(rails_root, 'tmp', 'pids', 'server.pid')
 
       start_time = Time.now
-      while Time.now < start_time + 15
+      while Time.now < start_time + START_SERVER_TIMEOUT
         if File.exist?(server_pid_file)
           server_pid = File.read(server_pid_file).strip
           if server_pid =~ /^(\d{1,10})$/i
@@ -299,18 +308,24 @@ EOS
             break
           end
         end
+
         sleep 0.1
       end
+
+      unless server_pid
+        raise "Unable to start the Rails server even after #{Time.now - start_time} seconds; there seems to be no file at '#{server_pid_file}', or no PID in that file if it does exist. Help!"
+      end
     end
 
     def verify_server_and_shut_down_if_fails!
       begin
         verify_server!
       rescue Exception => e
+        say "Verification of Rails server failed:\n  #{e.message} (#{e.class.name})\n    #{e.backtrace.join("\n    ")}"
         begin
           stop_server!
         rescue Exception => e
-          say "WARNING: Verification of server failed, so we tried to stop it, but we couldn't do that. Proceeding, but you may have a Rails server left around anyway..."
+          say "WARNING: Verification of server failed, so we tried to stop it, but we couldn't do that. Proceeding, but you may have a Rails server left around anyway. The exception from trying to stop the server was:\n  #{e.message} (#{e.class.name})\n    #{e.backtrace.join("\n    ")}"
         end
 
         raise
@@ -365,11 +380,11 @@ The last #{last_lines.length} lines of this log are:
         sleep 0.1
         begin
           data = Net::HTTP.get_response(uri)
+          last_exception = nil
         rescue Errno::ECONNREFUSED, EOFError => e
           last_exception = e
         end
 
-        $stderr.puts "TRYING..."
         break if data && data.code && data.code.to_s == '200'
       end
 

data/lib/oop_rails_server/version.rb

@@ -1,3 +1,3 @@
 module OopRailsServer
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oop_rails_server
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json