openteam-commons 0.1.9 → 0.2.0

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

@@ -12,13 +12,11 @@ module OpenteamCommons
       end
 
       def create_libs
-        copy_file 'lib/tasks/cron.rake'
+        directory 'lib'
       end
 
       def create_configs
-        copy_file 'config/schedule.rb'
-        copy_file 'config/settings.yml.example'
-        copy_file 'config/unicorn.rb'
+        directory 'config'
         copy_file 'Procfile'
       end
     end

data/lib/generators/openteam_commons/install/templates/config/directories.rb

@@ -0,0 +1,40 @@
+class Directories
+  def root
+    @root ||= File.expand_path('../..', __FILE__)
+  end
+
+  def group
+    @group ||= root.split('/')[-2]
+  end
+
+  def project
+    @project ||= root.split('/')[-1]
+  end
+
+  def config(file=nil)
+    "#{root}/config/#{file}"
+  end
+
+  def log(file=nil)
+    @log_dir ||= begin
+                   FileUtils.mkdir_p("/var/log/#{group}/#{project}")
+                   "/var/log/#{group}/#{project}/#{file}"
+                 rescue Errno::EACCES
+                   "#{root}/log/#{file}"
+                 end
+  end
+
+  def pid_file
+    @pid_file ||= begin
+                    FileUtils.mkdir_p("/var/run/#{group}")
+                    p "/var/run/#{group}/#{project}.pid"
+                  rescue Errno::EACCES
+                    p "/tmp/#{group}-#{project}.pid"
+                  end
+  end
+
+  def heroku?
+    ENV['PORT']
+  end
+
+end

data/lib/generators/openteam_commons/install/templates/config/schedule.rb

@@ -1,7 +1,11 @@
+require File.expand_path('../directories.rb', __FILE__)
+
+dir = Directories.new
+
 if RUBY_PLATFORM =~ /freebsd/
-  set :job_template, "/usr/local/bin/bash -l -i -c ':job'"
+  set :job_template, "/usr/local/bin/bash -l -i -c ':job' 1>#{dir.log('schedule.log')} 2>#{dir.log('schedule-errors.log')}"
 else
-  set :job_template, "/bin/bash -l -i -c ':job'"
+  set :job_template, "/bin/bash -l -i -c ':job' 1>#{dir.log('schedule.log')} 2>#{dir.log('schedule-errors.log')}"
 end
 
 every :day do

data/lib/generators/openteam_commons/install/templates/config/unicorn.rb

@@ -1,52 +1,35 @@
-def current_dir
-  File.expand_path('../..', __FILE__)
-end
+require File.expand_path('../directories.rb', __FILE__)
 
-def group
-  current_dir.split('/')[-2]
-end
+dir = Directories.new
 
-def project
-  current_dir.split('/')[-1]
+def dir.settings
+  heroku? ? {} : (YAML.load_file(config('settings.yml'))['unicorn'] || {})
 end
-
-def config_file_path
-  "#{current_dir}/config/settings.yml"
+def dir.old_pid
+  "#{pid_file}.oldbin"
 end
 
-def heroku?
-  ENV['PORT']
-end
 
-def settings
-  heroku? ? {} : (YAML.load_file(config_file_path)['unicorn'] || {})
-end
-
-def pid_file
-  heroku? ? "/tmp/#{group}-#{project}.pid" : "/var/run/#{group}/#{project}.pid"
-end
-
-worker_processes  (settings['workers'] || ENV['UNICORN_WORKERS'] || 2).to_i
-timeout           (settings['timeout'] || ENV['UNICORN_TIMEOUT'] || 300).to_i
+worker_processes  (dir.settings['workers'] || ENV['UNICORN_WORKERS'] || 2).to_i
+timeout           (dir.settings['timeout'] || ENV['UNICORN_TIMEOUT'] || 300).to_i
 preload_app       true
-pid               pid_file
+pid               dir.pid_file
+
+listen            ENV['PORT'].to_i, :tcp_nopush => false if ENV['PORT'].to_i > 0
 
-if heroku?
-  listen            ENV['PORT'].to_i, :tcp_nopush => false
-else
-  listen            "/tmp/#{group}-#{project}.sock", :backlog => 64
+unless dir.heroku?
+  listen            "/tmp/#{dir.group}-#{dir.project}.sock", :backlog => 64
 
-  stdout_path       "/var/log/#{group}/#{project}/stdout.log"
-  stderr_path       "/var/log/#{group}/#{project}/stderr.log"
+  stdout_path       dir.log('stdout.log')
+  stderr_path       dir.log('stderr.log')
 end
 
 before_fork do |server, worker|
   defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
 
-  old_pid = "#{pid_file}.oldbin"
-  if File.exists?(old_pid) && server.pid != old_pid
+  if File.exists?(dir.old_pid) && server.pid != dir.old_pid
     begin
-      Process.kill("QUIT", File.read(old_pid).to_i)
+      Process.kill("QUIT", File.read(dir.old_pid).to_i)
     rescue Errno::ENOENT, Errno::ESRCH
       # someone else did our job for us
     end

data/lib/openteam-commons/version.rb

@@ -1,3 +1,3 @@
 module OpenteamCommons
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openteam-commons
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &4749560 !ruby/object:Gem::Requirement
+  requirement: &11580300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4749560
+  version_requirements: *11580300
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &4745960 !ruby/object:Gem::Requirement
+  requirement: &11577240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4745960
+  version_requirements: *11577240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &4766020 !ruby/object:Gem::Requirement
+  requirement: &11596380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4766020
+  version_requirements: *11596380
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &4762180 !ruby/object:Gem::Requirement
+  requirement: &11592740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4762180
+  version_requirements: *11592740
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &4427600 !ruby/object:Gem::Requirement
+  requirement: &11259500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4427600
+  version_requirements: *11259500
 description: Description of OpenteamCommons.
 email:
 - mail@openteam.ru
@@ -80,6 +80,7 @@ files:
 - lib/generators/openteam_commons/install/templates/config/unicorn.rb
 - lib/generators/openteam_commons/install/templates/config/settings.yml.example
 - lib/generators/openteam_commons/install/templates/config/schedule.rb
+- lib/generators/openteam_commons/install/templates/config/directories.rb
 - lib/generators/openteam_commons/install/templates/Procfile
 - lib/generators/openteam_commons/install/templates/script/update_site
 - lib/generators/openteam_commons/install/templates/script/start_site
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3830103022444745722
+      hash: 3825267558657801059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3830103022444745722
+      hash: 3825267558657801059
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15