daddy 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1c48fdc7fa3e81d36876d629662a3da63a34da
-  data.tar.gz: e4ac8eb473285f78c9e810c9bf87a3f123cb7498
+  metadata.gz: 81f485d01dff9f61379f178e04116874b19fe5a2
+  data.tar.gz: 225c55fb85bf1b8ea279db9758cf2e7d3ea264ce
 SHA512:
-  metadata.gz: b2829392e6545e7fc7fdae7bb9a245e7eea0dfc4749f0593ddc2e20ae649860a6d9a6d75bcc3f5d78ea1df96474a9e854d798e2bcc1f1b04bd99aa949626d6ce
-  data.tar.gz: af3b146494e4ac205cb1806771ebfb62ea2fa9ca72c76344a9390132852721c1254101b3b2b6655fd01743a2c595c3b81fc96c200be00a87158f682194e44b2b
+  metadata.gz: d544541c9e0b54c0ea3f172620f1ec53c72ab633f4d4612b182f366094d809e09095efef5a8d621af0edfcbbeba1afb6cf35129ddc7f17e0e0c2adfdfd068702
+  data.tar.gz: 1cc967461f9e9c84ec565aa01315ee83a3233e050b33bdc5eafe4033572b613bb38ce07d562443e0e9cd59c2c79d964e84ac7a5f41576b03ead0490196e7a4c6

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/lib/tasks/nginx.rake

@@ -4,39 +4,45 @@ namespace :dad do
   namespace :nginx do
 
     desc 'Nginxをインストールします。'
-    task :install => :environment do
+    task :install do
       repo = File.join(File.dirname(__FILE__), 'nginx', 'nginx.repo')
-      run "sudo cp -f #{repo} /etc/yum.repos.d/",
-          "sudo yum install nginx"
-      
+      run "sudo cp -f #{repo} /etc/yum.repos.d/"
+
+      options = []
+      options << '-y'
+      options << '-q' if quiet?
+      run "sudo yum #{options.join(' ')} install nginx"
+
+      empty_conf = render File.join(File.dirname(__FILE__), 'nginx', 'empty.conf.erb'),
+          :to => 'tmp/daddy/nginx/emtpy.conf'
+
       default_config_files = [
         '/etc/nginx/conf.d/default.conf',
         '/etc/nginx/conf.d/example_ssl.conf'
       ]
       default_config_files.each do |conf|
-        run "sudo mv #{conf} #{conf}.org" if File.exist?(conf)
+        if File.exist?(conf)
+          run "sudo mv #{conf} #{conf}.org" unless File.exist?("#{conf}.org")
+          run "sudo cp -f #{empty_conf.path} #{conf}"
+        end
       end
 
-      template = File.join(File.dirname(__FILE__), 'nginx', 'nginx.conf.erb')
-      render template, :to => 'tmp/nginx.conf'
-      run "sudo cp -f tmp/nginx.conf /etc/nginx/conf.d/nginx.conf"
-      run "sudo mkdir -p /etc/nginx/conf.d/servers"
-
-      publish = ENV['PUBLISH'] || false
-      if publish
-        system("sudo mkdir -p /var/lib/daddy")
-        system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} /var/lib/daddy")
-      end
+      nginx_conf = render File.join(File.dirname(__FILE__), 'nginx', 'nginx.conf.erb'),
+          :to => 'tmp/daddy/nginx/nginx.conf'
+      run "sudo cp -f #{nginx_conf.path} /etc/nginx/conf.d/nginx.conf",
+          "sudo mkdir -p /etc/nginx/conf.d/servers"
     end
 
-    desc 'Nginxにアプリケーションの設定ファイルをインストールします。'
-    task :config => :environment do
-      conf = File.join('tmp', 'nginx', "#{app_name}.conf")
-      render File.join(File.dirname(__FILE__), 'nginx', 'app.conf.erb'), :to => conf
+    desc 'Nginxにアプリの設定ファイルをインストールします。'
+    task :config do
+      @server_name = ENV['SERVER_NAME'] || ask('SERVER_NAME', :default => 'localhost', :required => true)
+      @rails_env = rails_env(:default => 'production')
+      app_conf = render File.join(File.dirname(__FILE__), 'nginx', 'app.conf.erb'),
+          :to => "tmp/daddy/nginx/#{app_name}.conf"
 
       unless dry_run?
         run "sudo mkdir -p /etc/nginx/conf.d/servers",
-            "sudo cp -f #{conf} /etc/nginx/conf.d/servers/"
+            "sudo cp -f #{app_conf.path} /etc/nginx/conf.d/servers/"
       end
     end
 

data/lib/tasks/nginx/app.conf.erb

@@ -4,7 +4,7 @@ upstream <%= app_name %> {
 
 server {
   listen 80;
-  server_name localhost;
+  server_name <%= @server_name %>;
   
   root <%= rails_root %>/public;
   try_files $uri/index.html $uri @app;
@@ -16,7 +16,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-<% if rails_env == 'production' %>
+<% if @rails_env == 'production' -%>
   location ~ ^/(assets)/ {
     gzip_vary on;
     gzip_static on;

data/lib/tasks/nginx/empty.conf.erb

@@ -0,0 +1 @@
+# this file is emptified by daddy-<%= daddy_version %> at <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>.

data/lib/tasks/task_helper.rb

@@ -1,13 +1,18 @@
 require 'rake'
 require 'erb'
 require 'yaml'
+require File.join(File.dirname(File.dirname(__FILE__)), 'daddy', 'version.rb')
+
+def self.daddy_version
+  Daddy::VERSION
+end
 
 def self.rails_root
   ENV['RAILS_ROOT'] || @_rails_root ||= ask('RAILS_ROOT', :default => Rails.root)
 end
 
-def self.rails_env
-  ENV['RAILS_ENV'] || @_rails_env ||= ask('RAILS_ENV', :default => 'development')
+def self.rails_env(options = {})
+  ENV['RAILS_ENV'] || @_rails_env ||= ask('RAILS_ENV', :default => options.fetch(:default, 'development'))
 end
 
 def self.app_name
@@ -36,9 +41,12 @@ def self.render(template, options = {})
   if options[:to]
     FileUtils.mkdir_p(File.dirname(options[:to]))
     File.write(options[:to], text)
+    ret = File.new(options[:to])
+  else
+    ret = text
   end
 
-  text
+  ret
 end
 
 def self.ask(prompt, options = {})

data/lib/tasks/unicorn.rake

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -331,6 +331,7 @@ files:
 - lib/tasks/kibana/nginx.conf.erb
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/app.conf.erb
+- lib/tasks/nginx/empty.conf.erb
 - lib/tasks/nginx/nginx.conf.erb
 - lib/tasks/nginx/nginx.repo
 - lib/tasks/phantomjs.rake