mr-sparkle 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "1.9.3"

data/README.md

@@ -1,6 +1,6 @@
-# Mr. Sparkle - The Magical Reloading Unicorn
+# Mr. Sparkle - The Magical Reloading Rack Server
 
-This gem contains a script to start a [Unicorn](http://unicorn.bogomips.org/)-based server for your [Rack](http://rack.github.com/) application that reloads your automatically when they are changed, but doesn't incur the penalty of reloading all the gem dependencies.  It's based on Jonathan D. Stott's blog post ["Magical Reloading Sparkles"](http://namelessjon.posterous.com/magical-reloading-sparkles)--hence the name.  (The name is also a Simpsons reference.  [CAN YOU SEE THAT I AM SERIOUS?](http://www.youtube.com/watch?v=dnaLRbbc-54))
+This gem contains a script to start a [Unicorn](http://unicorn.bogomips.org/)-based server for your [Rack](http://rack.github.com/) application that reloads your application code automatically when its files are changed, but doesn't incur the penalty of reloading all the gem dependencies.  It's based on Jonathan D. Stott's blog post ["Magical Reloading Sparkles"](http://namelessjon.posterous.com/magical-reloading-sparkles)--hence the name.  (The name is also a Simpsons reference.  [CAN YOU SEE THAT I AM SERIOUS?](http://www.youtube.com/watch?v=dnaLRbbc-54))
 
 The main purpose of this gem is to take Jonathan's idea and package it into something can "just work" without having to be customized inside each project's code.  Besides the gem packaging, this code differs from the original watcher script in the following ways:
 

data/lib/mr-sparkle.rb

@@ -6,7 +6,7 @@ module Mr
 
     DEFAULT_RELOAD_PATTERN = /\.(?:builder|coffee|creole|css|erb|erubis|haml|html|js|less|liquid|mab|markdown|md|mdown|mediawiki|mkd|mw|nokogiri|radius|rb|rdoc|rhtml|ru|sass|scss|str|textile|txt|wiki|yajl|yml)$/
 
-    DEFAULT_FULL_RELOAD_PATTERN = /^Gemfile$/
+    DEFAULT_FULL_RELOAD_PATTERN = /^Gemfile(?:\.lock)?$/
 
     class Daemon
 

data/lib/mr-sparkle/version.rb

@@ -1,5 +1,5 @@
 module Mr
   module Sparkle
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/mr-sparkle.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency("unicorn", '~>4.5.0')
-  gem.add_dependency("listen", '~>0.6.0')
+  gem.add_dependency("unicorn", '>= 4.5')
+  gem.add_dependency("listen", '>= 0.6')
 
   # Only one of these can actually be used on a given platform, but they
   # can both be installed OK--see the note about this at:
   # https://github.com/guard/guard#efficient-filesystem-handling
-  gem.add_dependency('rb-inotify', '~>0.8.8')
-  gem.add_dependency('rb-fsevent', '~>0.9.2')
+  gem.add_dependency('rb-inotify', '>= 0.8')
+  gem.add_dependency('rb-fsevent', '>= 0.9')
 
-  gem.add_development_dependency('minitest', '~>4.3.3')
-  gem.add_development_dependency('minitest-reporters', '~>0.13.1')
-  gem.add_development_dependency('minitest-around', '~>0.0.1')
-  gem.add_development_dependency('rack', '~>1.4.1')
-  gem.add_development_dependency('rake', '~>10.0.3')
+  gem.add_development_dependency('minitest', '>= 4.3')
+  gem.add_development_dependency('minitest-reporters', '>= 0.13')
+  gem.add_development_dependency('minitest-around', '>= 0.0')
+  gem.add_development_dependency('rack', '>= 1.4')
+  gem.add_development_dependency('rake', '>= 10.0')
 end

data/spec/fixtures/full_reload/Gemfile

@@ -1,5 +1,5 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'rack', '~>1.4.1'
+gem 'rack', '>= 1.4'
 gem 'full_reload_test_gem', :path=>'vendor/full_reload_test_gem'

data/spec/fixtures/hello/Gemfile

@@ -1,4 +1,4 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'rack', '~>1.4.1'
+gem 'rack', '>= 1.4'

data/spec/full_reload_spec.rb

@@ -38,4 +38,12 @@ describe "App Runner: Full Reloading" do
     watch_until_change_detected
     app_request('/').body.must_equal("This file was changed.\nThis string is from a gem and this time it will show changes.")
   end
+
+  it "recovers if the app becomes unstartable" do
+    change_file('Gemfile', /^#A sample/, 'THIS LINE IS BAD')
+    start_app
+    change_file('Gemfile', /^THIS LINE IS BAD/, '# Now this line is OK again')
+    watch_until_change_detected
+    app_request('/').body.must_equal(INITIAL_STRING)
+  end
 end

data/spec/spec_helper.rb

@@ -44,10 +44,18 @@ class ServerAppTest < MiniTest::Spec
     @app_stdout, app_stdout_w = IO.pipe
     @app_stderr, app_stderr_w = IO.pipe
     Bundler.with_clean_env do
+      # Need to generate the right Gemfile.lock so that we don't generate it
+      # from the app itself, creating spurious reload events
+      unless File.exists?(File.expand_path('Gemfile.lock', running_app_dir))
+        Kernel.system('bundle install --local', chdir: running_app_dir, 
+          in: '/dev/null', out: '/dev/null', err: '/dev/null')
+      end
       @app_pid = Kernel.spawn(
         app_command, *app_args, '--', '-l', @app_socket_path,
         {pgroup: true, chdir: running_app_dir,
-          in: '/dev/null', out: app_stdout_w, err: app_stderr_w, pgroup: true})
+          in: '/dev/null', out: app_stdout_w, err: app_stderr_w})
+      app_stdout_w.close
+      app_stderr_w.close
     end
     
     @old_handler = Signal.trap(:EXIT) do
@@ -114,6 +122,15 @@ class ServerAppTest < MiniTest::Spec
         yield
       rescue Exception=>e
         puts e.inspect
+        stop_app
+        begin
+          Timeout.timeout(1) do
+            puts "App stdout: #{@app_stdout.read}"
+            puts "App stderr: #{@app_stderr.read}"
+          end
+        rescue Exception=>f
+          puts "Exception while printing app stderr/stdout: #{f.inspect}"
+        end
         raise
       ensure
         stop_app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-sparkle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,152 +9,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: minitest-around
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
 description: This gem contains a script to start a Unicorn-based server for your Rack
   application that reloads your automatically when they are changed, but doesn't incur
   the penalty of reloading all the gem dependencies.  It's based on Jonathan D. Stott's
@@ -167,6 +167,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE.txt