doozer 0.2.1 → 0.2.2

data/README.rdoc

@@ -7,16 +7,20 @@
 * Clustering ala Mongrel::Cluster
 
 == Requirements
-* Ruby < 1.9 (untestested on Ruby 1.9 as of now)
-* Rack (http://rack.rubyforge.org) gem (0.9.1 or 1.0.0)
-* Any http server supported by Rack
-* ActiveRecord, DataMapper or Sequel (only if you need DB support)
+* Ruby < 1.9 (untested on Ruby 1.9 as of now)
+* Rack (http://rack.rubyforge.org) gem (0.9.1, 1.0.0, or 1.0.1)
+* Any http server supported by Rack out of the box (CGI, FastCGI, Mongrel, EventedMongrel, SwiftipliedMongrel, WEBrick, LSWS, SCGI, or Thin)
+* ActiveRecord, DataMapper, or Sequel (only if you need DB support)
+
+== Gems
+* As of version >= 0.2.0, the doozer gem is now distributed via gemcutter.
+* The project homepage is here: http://gemcutter.org/gems/doozer
 
 == Getting Started
 1. Install the gem(s):
-	- gem sources -a http://gems.github.com (if you haven't already)
+	- gem sources -a http://gemcutter.org (if you haven't already)
 	- sudo gem install rack
-	- sudo gem install grippy-doozer
+	- sudo gem install doozer
 2. Run 'doozer test-app' to generate the base application skeleton.
 3. Fire up the application in development mode 
 	- cd test-app

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-23}
   s.default_executable = %q{doozer}
   s.description = %q{This GEM provides a small, barebones framework for creating MVC Rack applications.}
   s.email = %q{gmelton@whorde.com}

data/lib/doozer/app.rb

@@ -35,32 +35,31 @@ module Doozer
             controller = controller_klass.new({:env=>env, :route=>route, :extra_params=>extra_params, :port=>@options[:Port]})
             
             # call after_initialize test for excludes
-            execution_time('controller.after_initialize',:start)
+            #execution_time('controller.after_initialize',:start)
             controller.after_initialize if not controller_klass.after_initialize_exclude.include?(route.action.to_sym)
-            execution_time(nil, :end)
+            #execution_time(nil, :end)
             
             begin
 
               # call before_filter test for excludes
-              execution_time('controller.before_filter',:start)
+              #execution_time('controller.before_filter',:start)
               controller.before_filter if not controller_klass.before_filter_exclude.include?(route.action.to_sym)
-              execution_time(nil,:end)
+              #execution_time(nil,:end)
               
               # call the action method
-              execution_time('controller.method(route.action).call',:start)
+              #execution_time('controller.method(route.action).call',:start)
               controller.method(route.action).call()
-              execution_time(nil,:end)
+              #execution_time(nil,:end)
               
               # call after_filter test for excludes
-              execution_time('controller.after_filter',:start)
+              #execution_time('controller.after_filter',:start)
               controller.after_filter if not controller_klass.after_filter_exclude.include?(route.action.to_sym)
-              execution_time(nil, :end)
+              #execution_time(nil, :end)
               
               # render controller...
-              execution_time('controller.render_result',:start)
-              # r = Rack::Response.new(controller.render_controller(view, layout), route.status, {"Content-Type" => route.content_type})
+              #execution_time('controller.render_result',:start)
               r = Rack::Response.new(controller.render_result, route.status, {"Content-Type" => route.content_type})
-              execution_time(nil,:end)
+              #execution_time(nil,:end)
               r.set_cookie('flash',{:value=>nil, :path=>'/'})
               r.set_cookie('session',{:value=>controller.session_to_cookie(), :path=>'/'})
               

data/lib/doozer/scripts/cluster.rb

@@ -20,6 +20,7 @@ clusters = Doozer::Configs.symbolize_keys(config[:clusters])
 @server = clusters[:server]
 @config = DOOZER_PATH + '/doozer/rackup/server.ru'
 @test_config = DOOZER_PATH + '/doozer/rackup/test.rb'
+@config_file = '' #optional config file to use instead of the default unicorn config
 @apps = []
 
 for app in clusters[:apps]
@@ -59,6 +60,29 @@ def start
   system("ps -aux | grep rackup")
 end
 
+# Call to start unicorn server
+#
+# Set the app.yml clusters server to unicorn complete with one ip:port value.
+#
+# You can also pass an optional value -c FILE to override the default unicorn conf.
+#
+# See Unicorn::Configurator for more details => http://unicorn.bogomips.org/Unicorn/Configurator.html 
+#
+# You'll need to create your own scripts for stoping and restarting.
+#
+# See this page for details => http://unicorn.bogomips.org/SIGNALS.html
+def start_unicorn
+  printf "Starting unicorn... \n"
+  for app in @apps
+    # unicorn
+    @config_file = "-c #{@config_file}" if @config_file != ''
+    cmd = "unicorn  -p #{app[:port]} -E #{@env.to_s} -o #{app[:ip]} #{@daemonize} #{@config_file} #{@config}"
+    printf "Command: #{cmd}\n"
+    system(cmd)
+    break
+  end
+end
+
 # Calls stop() and then start()
 def restart
   stop
@@ -101,6 +125,10 @@ opts = OptionParser.new("", 24, '  ') { |opts|
   opts.on("-E", "--env ENVIRONMENT", "default: development || deployment") { | e |
     @env = e.downcase.to_sym
   }
+  opts.on("-c", "--config-file FILE", "optional config file to use for server (supported by unicorn, etc.)") { | cf |
+    @config_file = cf || ''
+  }
+  
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -113,7 +141,7 @@ opts = OptionParser.new("", 24, '  ') { |opts|
 
 case @command
   when :start
-    start()
+    @server != 'unicorn' ? start() : start_unicorn()
   when :restart
     restart()
   when :stop

data/lib/doozer/version.rb

@@ -2,7 +2,7 @@ module Doozer
   module Version
     MAJOR=0
     MINOR=2
-    PATCH=1
+    PATCH=2
     STRING=[MAJOR, MINOR, PATCH].join('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doozer
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -07:00
+date: 2009-10-23 00:00:00 -07:00
 default_executable: doozer
 dependencies: []