esp-commons 0.2.2 → 0.2.3

data/lib/esp-commons/engine.rb

@@ -1,56 +1,14 @@
-require 'airbrake'
-require 'configliere'
+require 'openteam-commons'
 
 module EspCommons
   class Engine < ::Rails::Engine
     isolate_namespace EspCommons
 
     config.before_configuration do
-      Settings.read(Rails.root.join('config', 'settings.yml')) if Rails.root.join('config', 'settings.yml').exist?
-      Settings.defaults Settings.extract!(Rails.env)[Rails.env] || {}
-      Settings.extract!(:test, :development, :production)
-      Settings.define 'app.secret',       :env_var => 'APP_SECRET'
-      Settings.define 'app.url',          :env_var => 'APP_URL'
       Settings.define 'appeals.url',      :env_var => 'APPEALS_URL'
       Settings.define 'blue-pages.url',   :env_var => 'BLUE_PAGES_URL'
       Settings.define 'cms.url',          :env_var => 'CMS_URL'
-      Settings.define 'errors.key',       :env_var => 'ERRORS_KEY'
-      Settings.define 'errors.url',       :env_var => 'ERRORS_URL'
       Settings.define 'news.url',         :env_var => 'NEWS_URL'
-      Settings.define 'solr.url',         :env_var => 'SOLR_URL'
-      Settings.define 'sso.key',          :env_var => 'SSO_KEY'
-      Settings.define 'sso.secret',       :env_var => 'SSO_SECRET'
-      Settings.define 'sso.url',          :env_var => 'SSO_URL'
-      Settings.define 'storage.url',      :env_var => 'STORAGE_URL'
-    end
-
-    config.before_configuration do
-      if ENV['UNICORN']
-        log_path = Settings['unicorn.logs_dir'] || "/var/log/esp/#{Rails.root.basename}"
-        Rails.application.config.logger = ActiveSupport::BufferedLogger.new("#{log_path}/application.log")
-      end
-    end
-
-    config.before_initialize do
-      if Settings['errors.key'].present?
-        Airbrake.configure do |config|
-          config.api_key = Settings['errors.key']
-          URI.parse(Settings['errors.url']).tap do | url |
-            config.host = url.host
-            config.port = url.port
-            config.secure = url.scheme.inquiry.https?
-          end
-        end
-      end
-    end
-
-    config.after_initialize do
-      Rails.logger.level = ActiveSupport::BufferedLogger::Severity::WARN if Rails.env.production?
-    end
-
-    config.after_initialize do
-      Rails.application.config.secret_token = Settings['app.secret']
-      I18n.locale = I18n.default_locale
     end
 
     config.to_prepare do
@@ -58,7 +16,6 @@ module EspCommons
         helper_method :image_tag_for, :thumbnail_tag
 
         protected
-
           def image_tag_for(image)
             view_context.image_tag(image.url, :width => image.width, :height => image.height, :alt => image.description) if image
           end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

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

@@ -2,17 +2,6 @@ module EspCommons
   module Generators
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('..', __FILE__)
-
-      def create_binaries
-        copy_file 'script/start_site'
-        copy_file 'script/update_site'
-        chmod 'script/start_site', 0755
-        chmod 'script/update_site', 0755
-      end
-
-      def create_configs
-        copy_file 'config/unicorn.rb'
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: airbrake
-  requirement: &8237620 !ruby/object:Gem::Requirement
+  name: openteam-commons
+  requirement: &19480540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8237620
-- !ruby/object:Gem::Dependency
-  name: configliere
-  requirement: &8237080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *8237080
+  version_requirements: *19480540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &8236440 !ruby/object:Gem::Requirement
+  requirement: &19505060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8236440
+  version_requirements: *19505060
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &8236000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *8236000
-- !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: &8235560 !ruby/object:Gem::Requirement
+  requirement: &19500040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8235560
+  version_requirements: *19500040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &8234960 !ruby/object:Gem::Requirement
+  requirement: &19499160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8234960
+  version_requirements: *19499160
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -85,18 +63,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/models/esp_commons/image.rb
-- config/initializers/sunspot.rb
 - config/locales/commons.ru.yml
-- config/locales/datetime.ru.yml
-- config/unicorn.rb
 - lib/esp-commons/engine.rb
 - lib/esp-commons/version.rb
 - lib/esp-commons.rb
 - lib/generators/esp_commons/install/config/schedule.rb
-- lib/generators/esp_commons/install/config/unicorn.rb
 - lib/generators/esp_commons/install/install_generator.rb
-- lib/generators/esp_commons/install/script/start_site
-- lib/generators/esp_commons/install/script/update_site
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -114,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 693037452893961619
+      hash: 306898731652434501
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 693037452893961619
+      hash: 306898731652434501
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16

data/config/initializers/sunspot.rb

@@ -1,5 +0,0 @@
-begin
-  require 'sunspot'
-  Sunspot.config.solr.url = Settings['solr.url']
-rescue LoadError
-end

data/config/locales/datetime.ru.yml

@@ -1,18 +0,0 @@
-ru:
-  date:
-    formats:
-      default: "%d.%m.%Y"
-      short: "%d %b"
-      long: "%d %B %Y"
-
-  time:
-    # Форматы времени
-    formats:
-      default: "%d.%m.%Y %H:%M"
-      short: "%d %b, %H:%M"
-      long: "%d %B %Y, %H:%M"
-
-    # am/pm решено перевести как "утра/вечера" :)
-    am: "утра"
-    pm: "вечера"
-

data/config/unicorn.rb

@@ -1,34 +0,0 @@
-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/generators/esp_commons/install/config/unicorn.rb

@@ -1,34 +0,0 @@
-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/generators/esp_commons/install/script/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 $(realpath $(dirname $0)/../config/unicorn.rb) -E production -D

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

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