esp-commons 0.1.0 → 0.1.1

data/config/unicorn.rb

@@ -0,0 +1,34 @@
+current_dir = File.expand_path('../..', __FILE__)
+
+project = current_dir.split('/').last
+
+settings = YAML.load_file "#{current_dir}/config/settings.yml"
+
+settings['unicorn'] ||= {}
+settings['unicorn']['workers'] ||= 2
+settings['unicorn']['preload'] = true if settings['unicorn']['preload'] != false
+settings['unicorn']['timeout'] ||= 300
+
+settings['unicorn']['logs_dir'] ||= "/var/log/esp/#{project}"
+settings['unicorn']['pids_dir'] ||= '/var/run/esp'
+settings['unicorn']['socks_dir'] ||= '/tmp'
+unless settings['unicorn']['socks_dir'].start_with? "/"
+  settings['unicorn']['socks_dir'] = "#{current_dir}/#{settings['unicorn']['socks_dir']}"
+end
+
+worker_processes  settings['unicorn']['workers']
+preload_app       settings['unicorn']['preload']
+timeout           settings['unicorn']['timeout']
+listen            settings['unicorn']['listen'] if settings['unicorn']['listen']
+listen            "#{settings['unicorn']['socks_dir']}/esp-#{project}.sock", :backlog => 64
+pid               "#{settings['unicorn']['pids_dir']}/#{project}.pid"
+stderr_path       "#{settings['unicorn']['logs_dir']}/stderr.log"
+stdout_path       "#{settings['unicorn']['logs_dir']}/stdout.log"
+
+before_fork do |server, worker|
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/esp_commons/install/install_generator.rb

@@ -4,11 +4,14 @@ module EspCommons
       source_root File.expand_path('..', __FILE__)
 
       def create_binaries
-        template 'bin/start_site'
+        copy_file 'script/start_site'
+        copy_file 'script/update_site'
+        chmod 'script/start_site', 0755
+        chmod 'script/update_site', 0755
       end
 
       def create_configs
-        template 'config/unicorn.rb'
+        copy_file 'config/unicorn.rb'
       end
     end
   end

data/lib/generators/esp_commons/install/script/start_site

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source ~/.rvm/scripts/rvm
+export LANG=ru_RU.UTF-8
+
+UNICORN=true bundle exec unicorn -c $(realpath $(dirname $0)/../config/unicorn.rb) -E production -D

data/lib/generators/esp_commons/install/script/update_site

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+PROJECT=$(basename $(dirname $(dirname $(realpath $0))))
+
+git checkout
+git pull
+bundle --path .bundle --binstubs --clean
+bin/rake db:migrate
+if [ -f /usr/local/etc/rc.d/esp-${PROJECT} ]; then
+  /usr/local/etc/rc.d/esp-${PROJECT} restart
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &8290800 !ruby/object:Gem::Requirement
+  requirement: &8925620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8290800
+  version_requirements: *8925620
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &8290040 !ruby/object:Gem::Requirement
+  requirement: &8924880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8290040
+  version_requirements: *8924880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &8288860 !ruby/object:Gem::Requirement
+  requirement: &8939740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8288860
+  version_requirements: *8939740
 - !ruby/object:Gem::Dependency
   name: api_smith
-  requirement: &8303180 !ruby/object:Gem::Requirement
+  requirement: &8937880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8303180
+  version_requirements: *8937880
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &8301560 !ruby/object:Gem::Requirement
+  requirement: &8936140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8301560
+  version_requirements: *8936140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &8300080 !ruby/object:Gem::Requirement
+  requirement: &8934780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8300080
+  version_requirements: *8934780
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -86,10 +86,12 @@ extra_rdoc_files: []
 files:
 - app/models/esp_commons/image.rb
 - config/initializers/sunspot.rb
+- config/unicorn.rb
 - config/locales/datetime.ru.yml
 - config/locales/commons.ru.yml
 - lib/generators/esp_commons/install/install_generator.rb
-- lib/generators/esp_commons/install/bin/start_site
+- lib/generators/esp_commons/install/script/update_site
+- lib/generators/esp_commons/install/script/start_site
 - lib/generators/esp_commons/install/config/schedule.rb
 - lib/generators/esp_commons/install/config/unicorn.rb
 - lib/esp-commons/engine.rb
@@ -112,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2181019276315037716
+      hash: 801026800095515242
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2181019276315037716
+      hash: 801026800095515242
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15

data/lib/generators/esp_commons/install/bin/start_site

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-source ~/.rvm/scripts/rvm
-export LANG=ru_RU.UTF-8
-
-UNICORN=true bundle exec unicorn -c `dirname $0`/../config/unicorn.rb -E production -D