daddy 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e8dd983e1179051e585b3ac7ed0ea38d70fff4
-  data.tar.gz: 5649a648bee817b0efaa3e95a31c04871e8f47c5
+  metadata.gz: a69facadf20ce56a143d6bf7df4d1f965334563e
+  data.tar.gz: 579f1a44d83f46cefd7a0de75d2c0d537d191e17
 SHA512:
-  metadata.gz: de63a0e8518b99343af0a7e98615e815c5af4d5e42df8b4c04da1e71da2510434507e6903fb44a8b74ab9c45bd06702054844786caead7c20c770f2e0a3250d8
-  data.tar.gz: 78881695c5e0838d904084364567dc684890130677d46e605a7daf5a8d02a8e093091868c9dae03efbb5dcf5725b86eb193558832f08bf185b6501db3236fb3a
+  metadata.gz: 72e0f4e7264fcb6ce60bc955375ef4cb0ba5ef9dd0aaadd6b8ef4a6440e0255e688ead5539fc7705bbdb25bf9c10fcba51719829c75e126974d6374ccbeee53d
+  data.tar.gz: 5b995517b3c8b63945109bc2544c90d6461c46a4125d2181b2008198840ec38122b010d3061709e83b61119ae6993769ec097abaad24b9c98f20737b40019344

data/app/assets/stylesheets/datepicker.css.scss

@@ -6,7 +6,7 @@
 .ui-datepicker {
   select.ui-datepicker-year {
     margin-right: 0.5em;
-    width: 4em;
+    width: auto;
   }
   select.ui-datepicker-month {
     margin-left: 1em;

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.20'.freeze
+  VERSION = '0.3.21'.freeze
 end

data/lib/tasks/task_helper.rb

@@ -71,6 +71,8 @@ def self.ask(prompt, options = {})
 end
 
 def self.run(*commands)
+  return if dry_run?
+
   commands.each do |c|
     puts c
     fail unless system(c)

data/lib/tasks/unicorn.rake

@@ -1,28 +1,21 @@
-require 'rake'
+require_relative 'task_helper'
 
 namespace :dad do
   namespace :unicorn do
 
-    desc 'Unicornをインストールします。'
-    task :install => :environment do
-      rails_env = ENV['RAILS_ENV'] || Rails.env
-      rails_root = ENV['RAILS_ROOT'] || Rails.root
-      init_script = 'unicorn_' + YAML.load_file("config/database.yml")[Rails.env]['database']
+    desc 'Unicornの設定を行います。'
+    task :config => :environment 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/"
 
-      commands = [
-        "RAILS_ENV=#{rails_env} RAILS_ROOT=#{rails_root} erb -T - #{File.dirname(__FILE__)}/unicorn.erb > tmp/#{init_script}",
-        "RAILS_ENV=#{rails_env} RAILS_ROOT=#{rails_root} erb -T - #{File.dirname(__FILE__)}/unicorn.rb.erb > config/unicorn.rb",
+      init_script = File.join('tmp', 'unicorn', "unicorn_#{app_name}")
+      render File.join(File.dirname(__FILE__), 'unicorn', 'unicorn.erb'), :to => init_script
 
-        "sudo cp -f tmp/#{init_script} /etc/init.d/#{init_script}",
-        "sudo chown root:root /etc/init.d/#{init_script}",
-        "sudo chmod 755 /etc/init.d/#{init_script}",
-        "sudo /sbin/chkconfig #{init_script} on",
-      ]
-
-      commands.each do |c|
-        puts c
-        fail unless system(c)
-      end
+      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"
     end  
 
   end

data/lib/tasks/{unicorn.rb.erb → unicorn/unicorn.rb.erb}

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'yaml'
 
 rails_root = "#{File.dirname(File.expand_path(__FILE__))}/.."
@@ -10,6 +8,7 @@ working_directory rails_root
 
 database = YAML.load_file("#{File.dirname(__FILE__)}/database.yml")[rails_env]['database']
 listen "/tmp/#{database}.sock"
+timeout 300
 
 stdout_path rails_root + '/log/unicorn.log'
 stderr_path rails_root + '/log/unicorn.log'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -359,9 +359,9 @@ files:
 - lib/tasks/task_helper.rb
 - lib/tasks/tesseract.rake
 - lib/tasks/test.rake
-- lib/tasks/unicorn.erb
 - lib/tasks/unicorn.rake
-- lib/tasks/unicorn.rb.erb
+- lib/tasks/unicorn/unicorn.erb
+- lib/tasks/unicorn/unicorn.rb.erb
 - ssl/cert.pem
 - templates/Gemfile.erb
 - templates/app/controllers/controller.rb.erb