pistol 0.0.1 → 0.0.2

data/Rakefile

@@ -1,20 +1,34 @@
-task :start_app do
-  require "./test/fixtures/helloworld/app.rb"
+task :test => :start_app do
+  require "cutest"
+  Cutest.run(Dir["test/*_test.rb"])
+end
+
+task :start_app => :runner do
+  require "./test/fixtures/sinatra/app.rb"
+  require "./test/fixtures/rackapp/app.rb"
+  require "./test/fixtures/cuba/app.rb"
   require "logger"
 
-  Thread.new do
-    Rack::Handler::WEBrick.run(App.new,
-      :Port => 9595,
-      :Logger => ::Logger.new(File.open("/dev/null", "w")),
-      :AccessLog => []
-    )
-  end
+  logger = ::Logger.new(File.open("/dev/null", "w"))
+
+  run(App.new, 9595, logger)
+  run($rackapp, 9696, logger)
+  run(Cuba, 9797, logger)
 
   # Let's simply wait for the sinatra app to start.
   sleep 2
 end
 
-task :test => :start_app do
-  require "cutest"
-  Cutest.run(Dir["test/*_test.rb"])
-end
+task :runner do
+  def run(app, port, logger)
+    Thread.new do
+      Rack::Handler::WEBrick.run(app,
+        :Port => port,
+        :Logger => logger,
+        :AccessLog => []
+      )
+    end
+  end
+end
+
+task :default => :test

data/lib/pistol.rb

@@ -1,19 +1,17 @@
 class Pistol
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
-  attr :options
-
-  def initialize(app, options = {})
-    @options  = optimize_options(options)
-    @app      = app
-    @app_file = options[:files].first
-    @last     = last_mtime
+  def initialize(app, files, &block)
+    @app   = app
+    @files = files.map { |file| File.expand_path(file) }
+    @block = block
+    @last  = last_mtime
   end
 
   def call(env)
     current = last_mtime
 
-    if current >= @last
+    if current > @last
       if Thread.list.size > 1
         Thread.exclusive { reload! }
       else
@@ -28,20 +26,15 @@ class Pistol
 
 private
   def reload!
-    options[:files].each { |file| $LOADED_FEATURES.delete(file) }
-
-    @app.class.reset! if @app.class.respond_to?(:reset!)
-    require @app_file
+    @files.each { |file| $LOADED_FEATURES.delete(file) }
+    @block.call(changed) if @block
   end
 
-  def last_mtime
-    options[:files].map { |file| ::File.mtime(file) }.max
+  def changed
+    @files.select { |file| ::File.mtime(file) > @last }
   end
 
-  def optimize_options(options)
-    opts = options.dup
-    opts[:files] ||= Dir["./app/**/*.rb"]
-    opts[:files].map! { |file| File.expand_path(file) }
-    opts
+  def last_mtime
+    @files.map { |file| ::File.mtime(file) }.max
   end
 end

data/test/cuba_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+scope do
+  app    "cuba"
+  server "http://localhost:9797"
+
+  test "/hello" do
+    assert "Hello" == get("/hello")
+  end
+
+  # test "/hello when modified" do
+  #   modify("app.rb", %{"Hello"}, %{"New Hello"}) do
+  #     assert "New Hello" == get("/hello")
+  #   end
+  # end
+
+  test "/article changes when Article is changed" do
+    assert "Hello World v1" == get("/article")
+
+    modify("app/article.rb", %{"Hello World v1"}, %{"Hello World v2"}) do
+      assert "Hello World v2" == get("/article")
+    end
+  end
+
+  test "/book doesn't change since Book is in lib" do
+    assert "Sinatra Book" == get("/book")
+
+    modify("lib/book.rb", %{"Sinatra Book"}, %{"Rack Book"}) do
+     assert "Sinatra Book" == get("/book")
+    end
+  end
+end

data/test/fixtures/cuba/app.rb

@@ -0,0 +1,33 @@
+require "cuba"
+require File.expand_path("./app/article", File.dirname(__FILE__))
+require File.expand_path("./lib/book",    File.dirname(__FILE__))
+require File.expand_path("../../../lib/pistol", File.dirname(__FILE__))
+
+Cuba.use Pistol, Dir[__FILE__,
+  File.expand_path("./app/article.rb", File.dirname(__FILE__))] do
+  Cuba.reset!
+  load File.expand_path(__FILE__)
+end
+
+Cuba.define do
+  on get do
+    on path("hello") do
+      res.write "Hello"
+    end
+
+    on path("article") do
+      res.write Article.content
+    end
+
+    on path("book") do
+      res.write Book.title
+    end
+  end
+end
+
+if __FILE__ == $0
+  Rack::Handler::WEBrick.run(Cuba,
+    :Port => 9797,
+    :AccessLog => []
+  )
+end

data/test/fixtures/cuba/app/article.rb

@@ -0,0 +1,5 @@
+class Article
+  def self.content
+    "Hello World v1"
+  end
+end

data/test/fixtures/rackapp/app.rb

@@ -0,0 +1,23 @@
+require File.expand_path("./app/article", File.dirname(__FILE__))
+require File.expand_path("./lib/book",    File.dirname(__FILE__))
+require File.expand_path("../../../lib/pistol", File.dirname(__FILE__))
+
+$rackapp = Rack::Builder.app do
+  use Pistol, Dir[__FILE__,
+    File.expand_path("app/article.rb", File.dirname(__FILE__))] do
+    load __FILE__
+  end
+
+  run(lambda { |env|
+    case env["PATH_INFO"]
+    when "/hello"
+      [200, { "Content-Type" => "text/html" }, ["Hello"]]
+    when "/article"
+      [200, { "Content-Type" => "text/html" }, [Article.content]]
+    when "/book"
+      [200, { "Content-Type" => "text/html" }, [Book.title]]
+    else
+      [404, { "Content-Type" => "text/html" }, ["Not Found"]]
+    end
+  })
+end

data/test/fixtures/rackapp/lib/book.rb

@@ -0,0 +1,5 @@
+class Book
+  def self.title
+    "Sinatra Book"
+  end
+end

data/test/fixtures/{helloworld → sinatra}/app.rb

@@ -7,7 +7,10 @@ class App < Sinatra::Base
   set :root, lambda { |*args| File.join(File.dirname(__FILE__), *args) }
   set :port, 9595
 
-  use Pistol, :files => Dir[__FILE__, root("app/**/*.rb")]
+  use Pistol, Dir[__FILE__, root("app/**/*.rb")] do
+    self.reset!
+    require __FILE__
+  end
 
   get "/hello" do
     "Hello"

data/test/fixtures/sinatra/app/article.rb

@@ -0,0 +1,5 @@
+class Article
+  def self.content
+    "Hello World v1"
+  end
+end

data/test/fixtures/sinatra/lib/book.rb

@@ -0,0 +1,5 @@
+class Book
+  def self.title
+    "Sinatra Book"
+  end
+end

data/test/helper.rb

@@ -1,16 +1,24 @@
 require "cutest"
 require "open-uri"
+require "fileutils"
 
-TEST_SERVER = "http://localhost:9595"
+class Cutest::Scope
+  def app(app = nil)
+    @app = app if app
+    @app
+  end
+
+  def server(server = nil)
+    @server = server if server
+    @server
+  end
 
-module Kernel
-private
   def get(path)
-    open([TEST_SERVER, path].join).read
+    open([server, path].join).read
   end
 
   def app_root(*args)
-    File.join(File.dirname(__FILE__), "fixtures", "helloworld", *args)
+    File.join(File.dirname(__FILE__), "fixtures", app, *args)
   end
 
   def modify(file, old, new)
@@ -18,14 +26,15 @@ private
 
     prev = File.read(path)
     change(path, prev.gsub(old, new))
+    sleep 1
     FileUtils.touch(path)
-
     yield
   ensure
-    change(app_root(file), prev)
+    change(path, prev)
   end
 
   def updated(file)
+    sleep 1
     FileUtils.touch(app_root(file))
     yield
   end

data/test/rack_app_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+scope do
+  app    "rackapp"
+  server "http://localhost:9696"
+
+  test "/hello" do
+    assert "Hello" == get("/hello")
+  end
+
+  # test "/hello when modified" do
+  #   modify("app.rb", %{"Hello"}, %{"New Hello"}) do
+  #     assert "New Hello" == get("/hello")
+  #   end
+  # end
+
+  test "/article changes when Article is changed" do
+    updated("app/article.rb") do
+      assert "Hello World v1" == get("/article")
+    end
+
+    modify("app/article.rb", %{"Hello World v1"}, %{"Hello World v2"}) do
+      assert "Hello World v2" == get("/article")
+    end
+  end
+
+  test "/book doesn't change since Book is in lib" do
+    assert "Sinatra Book" == get("/book")
+
+    modify("lib/book.rb", %{"Sinatra Book"}, %{"Rack Book"}) do
+      assert "Sinatra Book" == get("/book")
+    end
+  end
+end

data/test/sinatra_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+scope do
+  app    "sinatra"
+  server "http://localhost:9595"
+
+  test "/hello" do
+    assert "Hello" == get("/hello")
+  end
+
+  test "/hello when modified" do
+    modify("app.rb", %{"Hello"}, %{"New Hello"}) do
+      assert "New Hello" == get("/hello")
+    end
+  end
+
+  test "/article changes when Article is changed" do
+    assert "Hello World v1" == get("/article")
+
+    modify("app/article.rb", %{"Hello World v1"}, %{"Hello World v2"}) do
+      assert "Hello World v2" == get("/article")
+    end
+  end
+
+  test "/book doesn't change since Book is in lib" do
+    assert "Sinatra Book" == get("/book")
+
+    modify("lib/book.rb", %{"Sinatra Book"}, %{"Rack Book"}) do
+     assert "Sinatra Book" == get("/book")
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michel Martens
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +08:00
+date: 2010-11-14 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,6 +47,34 @@ dependencies:
         version: "1.0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cuba
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id004
 description: |-
   Extremely lightweight reloading tool for rack &
                        sinatra apps.
@@ -65,12 +93,20 @@ files:
 - README.markdown
 - LICENSE
 - Rakefile
-- test/fixtures/helloworld/app/article.rb
-- test/fixtures/helloworld/app.rb
-- test/fixtures/helloworld/lib/article.rb
-- test/fixtures/helloworld/lib/book.rb
+- test/cuba_test.rb
+- test/fixtures/cuba/app/article.rb
+- test/fixtures/cuba/app.rb
+- test/fixtures/cuba/lib/article.rb
+- test/fixtures/cuba/lib/book.rb
+- test/fixtures/rackapp/app/article.rb
+- test/fixtures/rackapp/app.rb
+- test/fixtures/rackapp/lib/book.rb
+- test/fixtures/sinatra/app/article.rb
+- test/fixtures/sinatra/app.rb
+- test/fixtures/sinatra/lib/article.rb
+- test/fixtures/sinatra/lib/book.rb
 - test/helper.rb
-- test/pistol_test.rb
+- test/rack_app_test.rb
 - test/sinatra_test.rb
 has_rdoc: true
 homepage: http://github.com/monk/pistol

data/test/pistol_test.rb

@@ -1,27 +0,0 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
-
-test "/hello" do
-  assert "Hello" == get("/hello")
-end
-
-test "/hello when modified" do
-  modify("app.rb", %{"Hello"}, %{"New Hello"}) do
-    assert "New Hello" == get("/hello")
-  end
-end
-
-test "/article changes when Article is changed" do
-  assert "Hello World v1" == get("/article")
-
-  modify("app/article.rb", %{"Hello World v1"}, %{"Hello World v2"}) do
-    assert "Hello World v2" == get("/article")
-  end
-end
-
-test "/book doesn't change since Book is in lib" do
-  assert "Sinatra Book" == get("/book")
-
-  modify("lib/book.rb", %{"Sinatra Book"}, %{"Rack Book"}) do
-    assert "Sinatra Book" == get("/book")
-  end
-end