picky 0.0.4 → 0.0.5

data/lib/deployment.rb

@@ -126,7 +126,7 @@ module Picky
               # link database-config files
               run "ln -sf #{shared_path}/app/db.yml #{current_path}/app/db.yml"
               # link unicorn.ru
-              run "ln -sf #{shared_path}/app/unicorn.ru #{current_path}/app/unicorn.ru"
+              run "ln -sf #{shared_path}/unicorn.ru #{current_path}/unicorn.ru"
             end
             
             namespace :rollback do

data/lib/tasks/server.rake

@@ -1,48 +1,37 @@
 # TODO This file needs some love.
 #
 namespace :server do
+  
   def chdir_to_root
     Dir.chdir SEARCH_ROOT
   end
+  
   def current_pid
     pid = `cat #{File.join(SEARCH_ROOT, 'tmp/pids/unicorn.pid')}`
     pid.blank? ? nil : pid.chomp
   end
+  
   desc "Start the unicorns. Weheee!"
-  task :start => :application do
+  task :start => :framework do
     chdir_to_root
     # Rake::Task[:"solr:start"].invoke # TODO Move to better place.
-    config = {}
-    config['production'] = {
-      :port      => 6000,
-      :daemonize => true
-    }
-    config['development'] = {
-      :port      => 4000,
-      :daemonize => false
-    }
-    # TODO Move port configuration!
-    port = SEARCH_ENVIRONMENT == 'production' ? 6000 : 4000
-    `export SEARCH_ENV=#{SEARCH_ENVIRONMENT}; unicorn -p #{config[SEARCH_ENVIRONMENT][:port]} -c #{File.join(SEARCH_ROOT, 'app/unicorn.ru')} #{config[SEARCH_ENVIRONMENT][:daemonize] ? '-D' : ''} #{File.join(SEARCH_ROOT, 'app/application.ru')}`
-  end
-  desc "Restart the unicorns!"
-  task :restart do
-    Rake::Task[:"server:stop"].invoke
-    sleep 15
-    Rake::Task[:"server:start"].invoke
+    daemonize = SEARCH_ENVIRONMENT == 'production' ? '-D' : ''
+    command = "export SEARCH_ENV=#{SEARCH_ENVIRONMENT}; unicorn -c unicorn.ru #{daemonize}".strip
+    puts "Running \`#{command}\`."
+    exec command
   end
+  
   desc "Stop the unicorns. Blam!"
-  task :stop => :application do
-    chdir_to_root
+  task :stop => :framework do
     `kill -QUIT #{current_pid}` if current_pid
     # Rake::Task[:"solr:stop"].invoke # TODO Move to better place.
   end
-
-  # TODO
-  #
-  desc 'send the USR1 signal to the thin server'
-  task :usr1 => :ruby_version do
-    puts "Sending USR1 signal to the thin server."
-    `pidof thin#{RUBY_VERSION_APPENDIX}`.split.each { |pid| Process.kill('USR1', pid.to_i) }
+  
+  desc "Restart the unicorns!"
+  task :restart do
+    Rake::Task[:"server:stop"].invoke
+    sleep 5
+    Rake::Task[:"server:start"].invoke
   end
+  
 end

data/prototype_project/{app/application.ru → config.ru}

@@ -1,21 +1,18 @@
-# This file has been generated by Picky.
-#
-
 # Require the gem. This loads the search framework.
 #
 require 'picky'
 
 # Load your application. This requires the following files in
 # 
-#  * /lib/initializers/*.rb
-#  * /lib/tokenizers/*.rb
-#  * /lib/indexers/*.rb
-#  * /lib/query/*.rb
+#  * lib/initializers/*.rb
+#  * lib/tokenizers/*.rb
+#  * lib/indexers/*.rb
+#  * lib/query/*.rb
 #
-#  * /app/logging.rb
-#  * /app/application.rb
+#  * app/logging.rb
+#  * app/application.rb
 #
-# to be required (in that order).
+# (in that order).
 #
 Loader.load_application
 
@@ -34,6 +31,6 @@ use Rack::Harakiri
 
 # Start the application and start accepting requests.
 #
-# Note: Needs to be the same name as in application.rb.
+# Note: Needs to be the same name as in app/application.rb.
 #
 run PickySearch

data/prototype_project/unicorn.ru

@@ -0,0 +1,11 @@
+listen            '0.0.0.0:8080'
+pid               'tmp/pids/unicorn.pid'
+preload_app       true
+stderr_path       'log/unicorn.stderr.log'
+stdout_path       'log/unicorn.stdout.log'
+timeout           10
+worker_processes  2
+
+after_fork do |_, _|
+  GC.disable
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 +02:00
+date: 2010-10-03 00:00:00 +02:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -268,17 +268,17 @@ files:
 - lib/tasks/try.rake
 - lib/picky/ext/ruby19/performant.c
 - prototype_project/app/application.rb
-- prototype_project/app/application.ru
 - prototype_project/app/db.yml
 - prototype_project/app/logging.rb
 - prototype_project/app/README
-- prototype_project/app/unicorn.ru
+- prototype_project/config.ru
 - prototype_project/Gemfile
 - prototype_project/log/README
 - prototype_project/Rakefile
 - prototype_project/script/console
 - prototype_project/tmp/pids/README
 - prototype_project/tmp/README
+- prototype_project/unicorn.ru
 - spec/ext/performant_spec.rb
 - spec/lib/application_spec.rb
 - spec/lib/cacher/partial/subtoken_spec.rb

data/prototype_project/app/unicorn.ru

@@ -1,10 +0,0 @@
-worker_processes 2
-listen           '/tmp/unicorn.sock', :backlog => 1
-listen           9292, :tcp_nopush => true
-timeout          10
-pid              'tmp/pids/unicorn.pid'
-preload_app      true
-
-after_fork do |_, _|
-  GC.disable
-end