sinatra-reloader 0.4.0.a → 0.4.0.b

data/README.md

@@ -16,9 +16,21 @@ Check it out if you are looking for other fancy Sinatra extensions.
 
 BigBand will setup the reloader automatically, but only in development mode.
 
+Installation
+------------
+
+    gem install sinatra-reloader --prerelease
+
 Usage
 -----
 
+Simple example:
+
+    require "sinatra"
+    require "sinatra/reloader" if development?
+
+More complex:
+
     require "sinatra/base"
     require "sinatra/reloader"
     

data/lib/sinatra/reloader.rb

@@ -6,23 +6,6 @@ require "sinatra/advanced_routes"
 module Sinatra
   Base.ignore_caller
 
-  # Advanced reloader for sinatra. Reloads only files that have changed and automatically
-  # detects orphaned routes that have to be removed. Files defining routes will be added
-  # to the reload list per default. Avoid reloading with dont_reload. Add other files to
-  # the reload list with also_reload.
-  #
-  # Usage:
-  #
-  #   require "big_band"
-  #   class Foo < Sinatra::Base
-  #     configure(:development) do
-  #       register BigBand::Reloader
-  #       also_reload "app/models/*.rb"
-  #       dont_reload "lib/**/*.rb"
-  #     end
-  #   end
-  #
-  # Per default this will only be acitvated in development mode.
   module Reloader
 
     class FileWatcher < Array
@@ -37,7 +20,12 @@ module Sinatra
       end
 
       def self.new(file)
-        @map[file.expand_path] ||= super
+        file = file.expand_path
+        begin
+          file = file.realpath
+        rescue Errno::ENOENT
+        end
+        @map[file] ||= super
       end
 
       class << self
@@ -49,8 +37,8 @@ module Sinatra
       end
 
       def initialize(file)
-        @reload = true
-        @file, @mtime = file, File.mtime(file)
+        @reload, @file = true, file
+        @mtime = File.exist?(file) ? File.mtime(file) : Time.at(0)
         super()
       end
 
@@ -88,7 +76,9 @@ module Sinatra
         else dont = true
         end
         files.flatten.each do |file|
-          Dir.glob(file) { |f| FileWatcher[f].dont_reload! dont }
+          # Rubinius and JRuby ignore block passed to glob.
+          Dir.glob(file).each { |f| FileWatcher[f].dont_reload! dont }
+          FileWatcher[file].dont_reload! dont
         end
       end
 
@@ -118,4 +108,7 @@ module Sinatra
     end
 
   end
+
+  register Reloader
+
 end

data/spec/sinatra/reloader_spec.rb

@@ -3,22 +3,32 @@ require File.expand_path("../../spec_helper", __FILE__)
 describe Sinatra::Reloader do
 
   def app_file(file, content, go_sleeping = true)
-    sleep 1 if go_sleeping
     file = File.expand_path(file, @temp_dir)
-    File.open(file, "w") { |f| f << "class ExampleApp < Sinatra::Base; #{content}; end" }
+    old_mtime = File.exist?(file) ? File.mtime(file) : Time.at(0)
+    new_mtime = old_mtime
+    # this is eventually faster than a hard coded sleep 1, also it adjusts to the systems
+    # mtime granularity
+    until new_mtime > old_mtime
+      File.open(file, "w") { |f| f << "class ::ExampleApp < Sinatra::Base; #{content}; end" }
+      new_mtime = File.mtime file
+      # ok, let's not generate too much io
+      sleep 0.1 if new_mtime == old_mtime
+    end
     require file
     file
   end
 
   def app
-    ExampleApp
+    ::ExampleApp
   end
 
-  before :all do
+  before do
     @temp_dir ||= File.expand_path "../../temp", __FILE__
     rm_rf @temp_dir
     mkdir_p @temp_dir
-    class ExampleApp < Sinatra::Base
+    $LOADED_FEATURES.reject! { |f| f =~ /^#{@temp_dir}/ }
+    class ::ExampleApp < Sinatra::Base
+      reset!
       register Sinatra::Reloader
     end
   end
@@ -36,14 +46,14 @@ describe Sinatra::Reloader do
 
   it "should not affact other routes" do
     app_file("example_app.rb", "get('/foo') { 'foo' }")
-    app_file("example_app2.rb", "get('/bar') { 'bar' }", false)
+    app_file("example_app2.rb", "get('/bar') { 'bar' }")
     browse_route(:get, '/bar').body.should == 'bar'
     app_file("example_app.rb", "get('/foo') { 'bar' }")
     browse_route(:get, '/bar').body.should == 'bar'
   end
 
   it "should respect dont_reload" do
-    file = app_file("example_app3.rb", "get('/baz') { 'foo' }", false)
+    file = app_file("example_app3.rb", "get('/baz') { 'foo' }")
     app.dont_reload file
     app_file("example_app3.rb", "get('/baz') { 'bar' }")
     browse_route(:get, '/baz').body.should == 'foo'

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require "sinatra/rspec"
 require "sinatra/reloader"
 require "fileutils"
-require "monkey"
-Sinatra::Base.set :environment, :test
 include FileUtils

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-reloader
-version: &id001 !ruby/object:Gem::Version 
-  version: 0.4.0.a
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 4
+  - 0
+  - b
+  version: 0.4.0.b
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -9,65 +15,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - a
+        version: 0.4.0.a
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra-advanced-routes
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - a
+        version: 0.4.0.a
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra-sugar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - a
+        version: 0.4.0.a
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra-test-helper
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - a
+        version: 0.4.0.a
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id006
 description: Smart and fast code reloader for Sinatra (part of BigBand).
 email: konstantin.mailinglists@googlemail.com
 executables: []
@@ -94,18 +132,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Smart and fast code reloader for Sinatra (part of BigBand).