mr-sparkle 0.2.0 → 0.3.0

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.3.0
+
+  * In addition to gems in the :default group, also preload gems in the group specified in the RACK\_ENV environment variable, or :development if RACK\_ENV is unset.  This is similar to Rails behavior.  (Jonathan Davies)
+
 ### 0.2.0
 
   * Allow polling to be forced on with --force-polling.  If you have mounted the files over NFS, and are editing them remotely, then file system events are not fired, so the reloading doesn't work.  Force it to poll with --force-polling and it will work in this case. (Jamie Cobbett)

data/README.md

@@ -7,7 +7,7 @@ This gem contains a script to start a [Unicorn](http://unicorn.bogomips.org/)-ba
 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:
 
 1. It uses [listen](https://github.com/guard/listen) instead of [directory_watcher](https://github.com/TwP/directory_watcher/), which provides native event-driven file change detection, instead of polling.
-1. It assumes you're using [Bundler](http://gembundler.com/) for dependencies, which means that instead of needing a hardcoded list of gems in the `before_fork` hook, like the blog post had, this plugin just does `Bundler.require(:default)` to get all the modules mentioned in the Gemfile loaded before forking.
+1. It assumes you're using [Bundler](http://gembundler.com/) for dependencies, which means that instead of needing a hardcoded list of gems in the `before_fork` hook, like the blog post had, this plugin just does `Bundler.require(:default, ENV['RACK_ENV'])` to get all the modules mentioned in the Gemfile loaded before forking.  (Unicorn will default the RACK_ENV variable to development if it isn't set already, so by default you'll get all the gems in the `:default` and `:development` groups.)
 1. If you change your Gemfile, the preloads are no longer valid, so this script treats that change as a special case: when the Gemfile changes, we kill the whole server and restart it, thus reloading absolutely everything.
 
 The script comes with a default set of file extensions it will watch for changes.  I've tried to be liberal about it--no harm reloading a few extra times when developing.  You can run `mr-sparkle --help` to see the default set as a regexp, and you can change that regexp with the `--pattern` option.
@@ -38,7 +38,7 @@ Any arguments after the `--` will be passed on to unicorn.  This is how you woul
 
 ## Requirements
 
-This script requires Ruby 1.9.1 or greater (because it depends on `Kernel.spawn`.)  Since it's a wrapper around Unicorn, it will only work on "unix or unix-like" systems where unicorn is supported.
+This script requires Ruby 1.9.3 or greater.  Since it's a wrapper around Unicorn, it will only work on "unix or unix-like" systems where unicorn is supported.
 
 ## Contributing
 

data/lib/mr-sparkle/unicorn.conf.rb

@@ -4,5 +4,5 @@ GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true
 
 before_fork do |server, worker|
   require 'bundler'
-  Bundler.require(:default)
+  Bundler.require(:default, ENV["RACK_ENV"])
 end

data/lib/mr-sparkle/version.rb

@@ -1,5 +1,5 @@
 module Mr
   module Sparkle
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/mr-sparkle.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |gem|
   gem.description   = %q{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 blog post "Magical Reloading Sparkles"--hence the name.}
   gem.summary       = %q{Runs Unicorn, automatically reloading the application, but not bundled gems.}
   gem.homepage      = "http://github.com/MicahChalmer/mr-sparkle"
-  gem.required_ruby_version = '>= 1.9.1'
+  gem.license       = 'MIT'
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/fixtures/load_rack_env_group/Gemfile

@@ -0,0 +1,12 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem 'rack', '>= 1.4'
+
+group :development do
+  gem 'my_development_gem', :path=>'vendor/my_development_gem'
+end
+
+group :foo do
+  gem 'my_foo_gem', :path=>'vendor/my_foo_gem'
+end

data/spec/fixtures/load_rack_env_group/config.ru

@@ -0,0 +1,2 @@
+puts "HEY my rack_env is #{ENV['RACK_ENV']}"
+run lambda {|env| [200, {'Content-Type' => 'text/plain; charset=utf8'}, [($gems_loaded || []).join(",")]] }

data/spec/fixtures/load_rack_env_group/vendor/my_development_gem/lib/my_development_gem.rb

@@ -0,0 +1,4 @@
+module MyDevelopmentGem
+  $gems_loaded ||= []
+  $gems_loaded << "development"
+end

data/spec/fixtures/load_rack_env_group/vendor/my_development_gem/my_development_gem.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |gem|
+  gem.name          = "my_development_gem"
+  gem.version       = '0.0.1'
+  gem.authors       = ["Micah Chalmer"]
+  gem.email         = ["micah@micahchalmer.net"]
+  gem.description   = %q{This is only here as part of a test fixture}
+  gem.summary       = %q{This is only here as part of a test fixture}
+  gem.homepage      = ""
+
+  gem.files         = ['lib/my_development_gem.rb']
+  gem.executables   = []
+  gem.test_files    = []
+  gem.require_paths = ["lib"]
+end

data/spec/fixtures/load_rack_env_group/vendor/my_foo_gem/lib/my_foo_gem.rb

@@ -0,0 +1,4 @@
+module MyFooGem
+  $gems_loaded ||= []
+  $gems_loaded << "foo"
+end

data/spec/fixtures/load_rack_env_group/vendor/my_foo_gem/my_foo_gem.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |gem|
+  gem.name          = "my_foo_gem"
+  gem.version       = '0.0.1'
+  gem.authors       = ["Micah Chalmer"]
+  gem.email         = ["micah@micahchalmer.net"]
+  gem.description   = %q{This is only here as part of a test fixture}
+  gem.summary       = %q{This is only here as part of a test fixture}
+  gem.homepage      = ""
+
+  gem.files         = ['lib/my_foo_gem.rb']
+  gem.executables   = []
+  gem.test_files    = []
+  gem.require_paths = ["lib"]
+end

data/spec/load_rack_env_spec.rb

@@ -0,0 +1,27 @@
+require_relative 'spec_helper'
+
+describe "App Runner: Loading bundler groups based on RACK_ENV" do
+  before do
+    self.app_template_path = app_template_fixture("load_rack_env_group")
+  end
+
+  it "loads the group whose name is specified by RACK_ENV" do
+    start_app({'RACK_ENV'=>'foo'})
+    app_request('/').body.must_equal('foo')
+  end
+
+  it "loads the development group if specified" do
+    start_app({'RACK_ENV'=>'development'})
+    app_request('/').body.must_equal('development')
+  end
+
+  it "loads no groups if nothing is specified" do
+    start_app({'RACK_ENV'=>''})
+    app_request('/').body.must_equal('')
+  end
+
+  it "loads the development group if RACK_ENV is unset" do
+    start_app({'RACK_ENV'=>nil})
+    app_request('/').body.must_equal('development')
+  end
+end

data/spec/spec_helper.rb

@@ -37,13 +37,14 @@ class ServerAppTest < MiniTest::Spec
     @app_args || []
   end
 
-  def start_app
+  def start_app(env_vars={})
     stop_app
     @app_socket_path = File.expand_path("main_unicorn_socket", running_app_dir)
     Dir.mkdir(File.expand_path('log', running_app_dir))
     @app_stdout, app_stdout_w = IO.pipe
     @app_stderr, app_stderr_w = IO.pipe
     Bundler.with_clean_env do
+      ENV.replace(Hash[ENV.to_a].merge(env_vars))
       # 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))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-sparkle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
@@ -185,11 +185,19 @@ files:
 - spec/fixtures/full_reload/vendor/full_reload_test_gem/lib/full_reload_test_gem.rb
 - spec/fixtures/hello/Gemfile
 - spec/fixtures/hello/config.ru
+- spec/fixtures/load_rack_env_group/Gemfile
+- spec/fixtures/load_rack_env_group/config.ru
+- spec/fixtures/load_rack_env_group/vendor/my_development_gem/lib/my_development_gem.rb
+- spec/fixtures/load_rack_env_group/vendor/my_development_gem/my_development_gem.gemspec
+- spec/fixtures/load_rack_env_group/vendor/my_foo_gem/lib/my_foo_gem.rb
+- spec/fixtures/load_rack_env_group/vendor/my_foo_gem/my_foo_gem.gemspec
 - spec/full_reload_spec.rb
+- spec/load_rack_env_spec.rb
 - spec/normal_running_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/MicahChalmer/mr-sparkle
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -199,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,6 +228,13 @@ test_files:
 - spec/fixtures/full_reload/vendor/full_reload_test_gem/lib/full_reload_test_gem.rb
 - spec/fixtures/hello/Gemfile
 - spec/fixtures/hello/config.ru
+- spec/fixtures/load_rack_env_group/Gemfile
+- spec/fixtures/load_rack_env_group/config.ru
+- spec/fixtures/load_rack_env_group/vendor/my_development_gem/lib/my_development_gem.rb
+- spec/fixtures/load_rack_env_group/vendor/my_development_gem/my_development_gem.gemspec
+- spec/fixtures/load_rack_env_group/vendor/my_foo_gem/lib/my_foo_gem.rb
+- spec/fixtures/load_rack_env_group/vendor/my_foo_gem/my_foo_gem.gemspec
 - spec/full_reload_spec.rb
+- spec/load_rack_env_spec.rb
 - spec/normal_running_spec.rb
 - spec/spec_helper.rb