daddy 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a33400464b3cc61d95cfb69f808bbe0c51aa90
-  data.tar.gz: 41e97b62515c994968f3f3025dfe4509e7450c46
+  metadata.gz: e5e8dd983e1179051e585b3ac7ed0ea38d70fff4
+  data.tar.gz: 5649a648bee817b0efaa3e95a31c04871e8f47c5
 SHA512:
-  metadata.gz: e4216e1e0413dd7f4a790bd9a2993292360787c6c0d9f9d3b970e4bd4951190828677451cca1afe4400591a943d614451a00443ea370796c5ff596ff7eee531f
-  data.tar.gz: 91b58e058666402e7c56be725d03a07f7e96c204e60988e40be392ff843fc8f7751468b4f54049468b9814588373a7626c6c355650db3a2c2fe935c7c318206e
+  metadata.gz: de63a0e8518b99343af0a7e98615e815c5af4d5e42df8b4c04da1e71da2510434507e6903fb44a8b74ab9c45bd06702054844786caead7c20c770f2e0a3250d8
+  data.tar.gz: 78881695c5e0838d904084364567dc684890130677d46e605a7daf5a8d02a8e093091868c9dae03efbb5dcf5725b86eb193558832f08bf185b6501db3236fb3a

data/lib/daddy/version.rb

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

data/lib/tasks/nginx.rake

@@ -6,8 +6,8 @@ namespace :dad do
     desc 'Nginxをインストールします。'
     task :install => :environment do
       repo = File.join(File.dirname(__FILE__), 'nginx', 'nginx.repo')
-      fail unless system("sudo cp -f #{repo} /etc/yum.repos.d/")
-      fail unless system("sudo yum install nginx")
+      run "sudo cp -f #{repo} /etc/yum.repos.d/",
+          "sudo yum install nginx"
       
       default_config_files = [
         '/etc/nginx/conf.d/default.conf',
@@ -31,9 +31,13 @@ namespace :dad do
 
     desc 'Nginxにアプリケーションの設定ファイルをインストールします。'
     task :config => :environment do
-      fail unless system("RAILS_ROOT=#{rails_root} RAILS_ENV=#{Rails.env} APP_NAME=#{app_name} erb -T - #{File.dirname(__FILE__)}/nginx.app.conf.erb > tmp/nginx.#{app_name}.conf")
-      system("sudo mkdir -p /etc/nginx/conf.d/servers") 
-      system("sudo cp -f tmp/nginx.#{app_name}.conf /etc/nginx/conf.d/servers/#{app_name}.conf")
+      conf = File.join('tmp', 'nginx', "#{app_name}.conf")
+      render File.join(File.dirname(__FILE__), 'nginx', 'app.conf.erb'), :to => conf
+
+      unless dry_run?
+        run "sudo mkdir -p /etc/nginx/conf.d/servers",
+            "sudo cp -f #{conf} /etc/nginx/conf.d/servers/"
+      end
     end
 
   end

data/lib/tasks/{nginx.app.conf.erb → nginx/app.conf.erb}

@@ -1,22 +1,22 @@
-upstream <%= ENV['APP_NAME'] %> {
-  server unix:/tmp/<%= ENV['APP_NAME'] %>_<%= ENV['RAILS_ENV'][0..2] %>.sock;
+upstream <%= app_name %> {
+  server unix:/tmp/<%= app_name %>.sock;
 }
 
 server {
   listen 80;
   server_name localhost;
   
-  root <%= ENV['RAILS_ROOT'] %>/public;
+  root <%= rails_root %>/public;
   try_files $uri/index.html $uri @app;
   
   location @app {
-    proxy_pass http://<%= ENV['APP_NAME'] %>;
+    proxy_pass http://<%= app_name %>;
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-<% if ENV['RAILS_ENV'] == 'production' %>
+<% if rails_env == 'production' %>
   location ~ ^/(assets)/ {
     gzip_vary on;
     gzip_static on;

data/lib/tasks/task_helper.rb

@@ -18,13 +18,27 @@ def self.template_dir
   File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'templates')
 end
 
+def self.dry_run?
+  %w{ DRY_RUN DR }.each do |key|
+    return true if %w{ true t yes y 1 }.include?(ENV[key].to_s.downcase)
+  end
+  
+  false
+end
+
 def self.task_file(*path)
   File.join(File.dirname(__FILE__), *path)
 end
 
 def self.render(template, options = {})
-  FileUtils.mkdir_p(File.dirname(options[:to]))
-  File.write(options[:to], ERB.new(File.read(template), 0, '-').result)
+  text = ERB.new(File.read(template), 0, '-').result
+
+  if options[:to]
+    FileUtils.mkdir_p(File.dirname(options[:to]))
+    File.write(options[:to], text)
+  end
+
+  text
 end
 
 def self.ask(prompt, options = {})
@@ -61,4 +75,4 @@ def self.run(*commands)
     puts c
     fail unless system(c)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -346,8 +346,8 @@ files:
 - lib/tasks/kibana/configure.sh
 - lib/tasks/kibana/install.sh
 - lib/tasks/kibana/nginx.conf.erb
-- lib/tasks/nginx.app.conf.erb
 - lib/tasks/nginx.rake
+- lib/tasks/nginx/app.conf.erb
 - lib/tasks/nginx/nginx.conf.erb
 - lib/tasks/nginx/nginx.repo
 - lib/tasks/phantomjs.rake