openteam-commons 0.1.2 → 0.1.3

data/lib/generators/openteam_commons/install/script/update_site

@@ -5,11 +5,15 @@ CURRENT_PATH=$(dirname $(dirname $(realpath $0)))
 PROJECT_GROUP=$(basename $(dirname $CURRENT_PATH))
 PROJECT_NAME=$(basename $(dirname $(dirname $(realpath $0))))
 
-echo "group: ${PROJECT_GROUP} name: ${PROJECT_NAME}"
+pushd $CURRENT_PATH
 
 if [ $(/usr/bin/uname) == "FreeBSD" ]; then
   git checkout Gemfile.lock
+  RC_PATH=/usr/local/etc/rc.d/
+else
+  RC_PATH=/etc/init.d/
 fi
+RC_SCRIPT=${RC_PATH}/${PROJECT_GROUP}-${PROJECT_NAME}
 
 git pull
 
@@ -19,20 +23,14 @@ if [ -f "config/database.yml" ]; then
   bin/rake db:migrate
 fi
 
-if [ $(/usr/bin/uname) == "FreeBSD" ]; then
-  RC_PATH=/usr/local/etc/rc.d/
-else
-  RC_PATH=/etc/init.d/
+if [ "x${1}" == "x--assets" ]; then
+  bin/rake assets:clean assets:precompile
 fi
 
-RC_SCRIPT=${RC_PATH}/${PROJECT_GROUP}-${PROJECT_NAME}
-
 if [ -f ${RC_SCRIPT} ]; then
   ${RC_SCRIPT} reload
 fi
 
-if [ "x${1}" == "xca" ]; then
-  bin/rake assets:clean assets:precompile
-fi
-
 bin/rake airbrake:deploy TO=production
+
+popd

data/lib/openteam-commons/engine.rb

@@ -6,21 +6,17 @@ module OpenteamCommons
     isolate_namespace OpenteamCommons
 
     config.before_configuration do
-      define_settings
-    end
-
-    config.before_initialize do
-      setup_airbrake
+      read_settings
     end
 
     config.after_initialize do
+      setup_airbrake
       setup_locale
-      setup_log_level
       setup_secret
     end
 
     private
-      def define_settings
+      def read_settings
         Settings.read(Rails.root.join('config', 'settings.yml')) if Rails.root.join('config', 'settings.yml').exist?
 
         Settings.defaults Settings.extract!(Rails.env)[Rails.env] || {}
@@ -39,9 +35,6 @@ module OpenteamCommons
         Settings.define 'sso.url',          :env_var => 'SSO_URL'
 
         Settings.define 'storage.url',      :env_var => 'STORAGE_URL'
-
-        Settings.define 'unicorn.workers',  :env_var => 'UNICORN_WORKERS'
-        Settings.define 'unicorn.timeout',  :env_var => 'UNICORN_TIMEOUT'
       end
 
       def setup_airbrake
@@ -65,9 +58,5 @@ module OpenteamCommons
       def setup_locale
         I18n.locale = I18n.default_locale
       end
-
-      def setup_log_level
-        Rails.logger.level = ActiveSupport::BufferedLogger::Severity::WARN if Rails.env.production?
-      end
   end
 end

data/lib/openteam-commons/version.rb

@@ -1,3 +1,3 @@
 module OpenteamCommons
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openteam-commons
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &10401900 !ruby/object:Gem::Requirement
+  requirement: &16411500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10401900
+  version_requirements: *16411500
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &10401020 !ruby/object:Gem::Requirement
+  requirement: &16409980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10401020
+  version_requirements: *16409980
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10399560 !ruby/object:Gem::Requirement
+  requirement: &16408000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10399560
+  version_requirements: *16408000
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &10397640 !ruby/object:Gem::Requirement
+  requirement: &16406500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10397640
+  version_requirements: *16406500
 description: Description of OpenteamCommons.
 email:
 - mail@openteam.ru
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2710984293411495000
+      hash: -316006890504474889
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2710984293411495000
+      hash: -316006890504474889
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15