daddy 0.3.27 → 0.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddcc1a299d62f5d6236c3737303b57f47fe69101
-  data.tar.gz: 813bf1c9f10fc4b2cf8fc221205e385c56c4df88
+  metadata.gz: 37fe86d40f2eca316456d3138a883de98c7345da
+  data.tar.gz: e000efb6059bdd26b0a593469ee9034a2fafcb38
 SHA512:
-  metadata.gz: 1edaf332c854b8ad4af1b491c2998a65e9e46392bcd0ebed7904ff6516a88e5b2b073027900052b004bb63fbe10ab970968dbd2eaf545586d8edb8e2e79689b4
-  data.tar.gz: 7d9cae5f76a36b40751b5062a536b8b5d40d72da35dabe649d535144c96065af19a0964734bedf95635f05ed9563b67daca8ac484d83c8e2f547fdfa65607035
+  metadata.gz: e29e0872c6f7e00e03fe63a540cdbc9416dbed0073a58da5bcb6bf67debea7e4091e41853d10b5f3181913a5b9b5a4fdf14a27a26597dd82af2ef7e5a1d0ed65
+  data.tar.gz: 46e9a63d5d4c51ee212da4bec0f5eaca289183e6380958a30b859083ebb4b1eee13e06ad5d533d6a84f051d1b1fba3c3a9d7e11883ef8acbd73bfd31ed9a61c5

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.27'.freeze
+  VERSION = '0.3.28'.freeze
 end

data/lib/tasks/unicorn.rake

@@ -4,18 +4,30 @@ namespace :dad do
   namespace :unicorn do
 
     desc 'Unicornの設定を行います。'
-    task :config => :environment do
+    task :config do
       config = File.join('tmp', 'unicorn', 'unicorn.rb')
       render File.join(File.dirname(__FILE__), 'unicorn', 'unicorn.rb.erb'), :to => config
-      run "cp -f #{config} config/"
 
       init_script = File.join('tmp', 'unicorn', "unicorn_#{app_name}")
       render File.join(File.dirname(__FILE__), 'unicorn', 'unicorn.erb'), :to => init_script
 
-      run "sudo cp -f #{init_script} /etc/init.d/",
-          "sudo chown root:root /etc/init.d/#{File.basename(init_script)}",
-          "sudo chmod 755 /etc/init.d/#{File.basename(init_script)}",
-          "sudo /sbin/chkconfig #{File.basename(init_script)} on"
+      if dry_run?
+        puts "----------------------------------------"
+        puts config
+        puts "----------------------------------------"
+        puts File.read(config)
+        puts "----------------------------------------"
+        puts init_script
+        puts "----------------------------------------"
+        puts File.read(init_script)
+        puts "----------------------------------------"
+      else
+        run "cp -f #{config} config/",
+            "sudo cp -f #{init_script} /etc/init.d/",
+            "sudo chown root:root /etc/init.d/#{File.basename(init_script)}",
+            "sudo chmod 755 /etc/init.d/#{File.basename(init_script)}",
+            "sudo /sbin/chkconfig #{File.basename(init_script)} on"
+      end
     end  
 
   end

data/lib/tasks/unicorn/unicorn.erb

@@ -6,8 +6,8 @@
 . /etc/rc.d/init.d/functions
 
 RAILS_USER=<%= ENV['USER'] %>
-RAILS_ENV=<%= ENV['RAILS_ENV'] %>
-RAILS_ROOT=<%= ENV['RAILS_ROOT'] %>
+RAILS_ENV=<%= ENV['RAILS_ENV'] || 'development' %>
+RAILS_ROOT=<%= ENV['RAILS_ROOT'] || Rails.root %>
 
 PID=${RAILS_ROOT}/tmp/pids/unicorn.pid
 CONFIG=${RAILS_ROOT}/config/unicorn.rb
@@ -15,7 +15,7 @@ CONFIG=${RAILS_ROOT}/config/unicorn.rb
 export PATH="${PATH}":/usr/local/bin
 
 start() {
-  daemon --user=${RAILS_USER} --pidfile=$PID bundle exec unicorn_rails -c ${CONFIG} -E ${RAILS_ENV} -D
+  daemon --user=${RAILS_USER} --pidfile=$PID bundle exec unicorn -c ${CONFIG} -E ${RAILS_ENV} -D
 }
 
 stop() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.28
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara