daddy 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17b97a68f169215e11b94bdf84083b1418e62c9
-  data.tar.gz: 465b880657f3de549b3458c9f11b23bb90cc94b9
+  metadata.gz: cd6a94ac7baeaaec00d5ec791de338eeb162d51b
+  data.tar.gz: 788cb084e3a647ba30b9e837bddc1e9def26f874
 SHA512:
-  metadata.gz: bf2079d6e138e81db0a9e106ceda8934a8713abb17bfd1e2ebcf9dacbd88443fef9499d09c331d0a8ed64e7458cd978794de9f1dfc1ed93787922a70b9b3b625
-  data.tar.gz: fe3b744bee7381d46364d6b7e88ff8c00f1ef34818a5cbac98a3926ec96a544ad8747901a9a1bb9047ab832e0b5111600ee65461f589dc64c216a41a6920cab7
+  metadata.gz: 30d845baa18b8b9246d5ef9d221eb56cdec50acd4af0cc2138ef11d9aa647647bf2be0c5c2a849739c38fce2f6b187b89b7e583270318aa60d434a2176be3b18
+  data.tar.gz: 3f1c7665340961c4bf0223d9bb6f38272560641d9762b5f54bd9511499e8809876e736d3e0ed1264d04aab182178794d2d90ee299403860d3aa063bad86b95d6

data/lib/daddy/models/query_extension.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   module Models
     

data/lib/tasks/god.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 namespace :dad do
@@ -7,31 +5,8 @@ namespace :dad do
 
     desc "Godをインストールします。"
     task :install do
-      script = <<-EOF
-#!/bin/bash
-
-if [ -e /var/run/god.pid ]; then
-  sudo /etc/init.d/god stop
-fi
-
-sudo gem install god
-sudo mkdir -p /etc/god
-
-sudo cp -f #{File.join(File.dirname(__FILE__), 'god')} /etc/init.d/god
-sudo chown root:root /etc/init.d/god
-sudo chmod 755 /etc/init.d/god
-
-sudo cp -f #{File.join(File.dirname(__FILE__), 'god.logrotate')} /etc/logrotate.d/god
-sudo chown root:root /etc/logrotate.d/god
-sudo chmod 644 /etc/logrotate.d/god
-
-sudo /sbin/chkconfig god on
-sudo /etc/init.d/god start
-EOF
-
-      tmpfile = File.join(Rails.root, 'tmp', 'dad-god-install-' + Daddy::Utils::StringUtils.current_time + '.sh')
-      File.write(tmpfile, ERB.new(script).result)
-      fail unless system("bash #{tmpfile}")
+      script = File.join(File.dirname(__FILE__), 'god', 'install.sh')
+      system("bash -x #{script} #{rails_env} #{rails_root}")
     end
 
   end

data/lib/tasks/{god → god/god}

@@ -6,33 +6,30 @@
 # description: god monitors your system
 #              
 
-CONFIG_FILES=/etc/god/*.god
 PID=/var/run/god.pid
+CONFIG=/etc/god/master.conf
 LOG=/var/log/god.log
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 RETVAL=0
 
 case "$1" in
     start)
-      god -P $PID -l $LOG --log-level info
-      for config in $CONFIG_FILES; do
-        god load $config
-      done
+      echo 'Starting god'
+      god -P $PID -c $CONFIG -l $LOG --log-level info
       RETVAL=$?
   ;;
     stop)
-      kill `cat $PID`
+      god quit
       RETVAL=$?
   ;;
     restart)
-      kill `cat $PID`
-      god -P $PID -l $LOG --log-level info
-      for config in $CONFIG_FILES; do
-        god load $config
-      done
+      god quit
+      echo 'Starting god'
+      god -P $PID -c $CONFIG -l $LOG --log-level info
       RETVAL=$?
   ;;
     status)
+      god status
       RETVAL=$?
   ;;
     *)

data/lib/tasks/god/install.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+SCRIPT_BASE=`dirname $0`
+export RAILS_ENV=$1
+export RAILS_ROOT=$2
+
+# stop god
+  if [ -e /var/run/god.pid ]; then
+    sudo /etc/init.d/god stop
+  fi
+
+# install
+  sudo gem install god --no-ri --no-rdoc
+
+# init.d
+  sudo cp -f ${SCRIPT_BASE}/god /etc/init.d/god
+  sudo chown root:root /etc/init.d/god
+  sudo chmod 755 /etc/init.d/god
+
+# master.conf
+  sudo mkdir -p /etc/god
+  sudo cp -f ${SCRIPT_BASE}/master.conf /etc/god/master.conf
+  sudo chown root:root /etc/god/master.conf
+  sudo chmod 644 /etc/god/master.conf
+
+# logrotate
+  sudo cp -f ${SCRIPT_BASE}/logrotate /etc/logrotate.d/god
+  sudo chown root:root /etc/logrotate.d/god
+  sudo chmod 644 /etc/logrotate.d/god
+
+# service
+  sudo /sbin/chkconfig god on
+
+# start
+  sudo /etc/init.d/god start

data/lib/tasks/god/master.conf

@@ -0,0 +1,3 @@
+Dir.glob("/etc/god/*.god").each do |app_config|
+  load app_config
+end

data/lib/tasks/task_helper.rb

@@ -5,6 +5,10 @@ def self.rails_root
   ENV['RAILS_ROOT'] || Rails.root
 end
 
+def self.rails_env
+  ENV['RAILS_ENV'] || 'development'
+end
+
 def self.app_name
   YAML.load_file("#{rails_root}/config/database.yml")[Rails.env]['database']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -366,10 +366,11 @@ files:
 - lib/tasks/generate/templates/routes.rb.erb
 - lib/tasks/generate/templates/show.html.erb
 - lib/tasks/generate/view.rake
-- lib/tasks/god
-- lib/tasks/god.logrotate
 - lib/tasks/god.rake
-- lib/tasks/install.sh
+- lib/tasks/god/god
+- lib/tasks/god/install.sh
+- lib/tasks/god/logrotate
+- lib/tasks/god/master.conf
 - lib/tasks/jenkins
 - lib/tasks/jenkins.conf
 - lib/tasks/jenkins.rake

data/lib/tasks/install.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-echo "既にGodが起動していたら停止します。"
-  if [ -e /var/run/god.pid ]; then
-    sudo /etc/init.d/god stop
-  fi
-
-echo "Godをインストールします。"
-  sudo gem install god
-
-echo "Godの起動スクリプトを /etc/init.d/god に配置します。"
-  sudo cp -f script/god/god /etc/init.d/god
-  sudo chown root:root /etc/init.d/god
-  sudo chmod 755 /etc/init.d/god
-
-echo "Godの設定ファイルを /etc/god/madai.god に配置します。"
-  export RAILS_ENV=$1
-  export RAILS_ROOT=$2
-
-  sudo mkdir -p /etc/god
-  erb -T - script/god/madai.god.erb > tmp/madai.god 
-  sudo cp -f tmp/madai.god /etc/god/madai.god
-  sudo chown -R root:root /etc/god
-  sudo chmod 755 /etc/god
-  sudo chmod -R 644 /etc/god/*
-
-  unset RAILS_ENV
-  unset RAILS_ROOT
-
-echo "Godのログロテート設定を /etc/logrotate.d/god に配置します。"
-  sudo cp -f script/god/logrotate /etc/logrotate.d/god
-  sudo chown root:root /etc/logrotate.d/god
-  sudo chmod 644 /etc/logrotate.d/god
-
-echo "サービスの自動起動設定を行います。"
-  sudo /sbin/chkconfig god on
-
-echo "Godを起動します。"
-  if [ -z ${NO_START} ]; then
-    NO_START=0
-  fi
-
-  if [ ${NO_START} -ne 1 ]; then
-    sudo /etc/init.d/god start
-  fi