daddy 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e885835ed4714480a4b71c8af1797987ad3dae59d1c45d8e23bac6a20510da08
-  data.tar.gz: a7c1fc8a1e4f547321fb0ae01b7ded96490980d81a07ae711030385bb0e8ed1c
+  metadata.gz: df9b937c32b9dadfef306086ee594350e845a51130d3a4c98ced408a78ff7fca
+  data.tar.gz: 22d56c90351d04b107eba2efe3ffa0c5dee447c2df69c9b4fa2ddc46ace6af3f
 SHA512:
-  metadata.gz: 2c2c09b6f9bd29bc948d601369169238db19fd93270e052dfe713fa94364c3bca8eb17e3688177a5649fa6bf8bf4008c85c94f72279e9b7836a9eb45b7b254f6
-  data.tar.gz: 103afd614a566b9e8a08e8b6f72e79ba2990dd7e13e9a1d8b6e2107e2ebc50fa4b31259ac352db1c396170d947f980f93ef24ae476bd729bf576c2915d51b65c
+  metadata.gz: fe79926e324a6dc3fba62da82e67256ced4ebcecb199725c51db297db04fcf0a440f666f5d527033b4c45518c35bf5eab9bb966dee51d77d77029343caa47f36
+  data.tar.gz: 58802d72bdf88fa654bf4a2b6f56ada91f6942e2c5dabd84a18dabafe70a81a621a3c8d3bf6060825410fc7005da43acdbcc4eccd7713fc7bffb7ae35c1cf5d5

data/itamae/cookbooks/nginx/{config.rb → config/rails.rb}

@@ -8,7 +8,7 @@ directory '/etc/nginx/conf.d/servers' do
 end
 
 template "/etc/nginx/conf.d/servers/#{ENV['SERVER_NAME']}.conf" do
-  source ::File.join(File.dirname(__FILE__), 'templates/etc/nginx/conf.d/servers/passenger.conf.erb')
+  source ::File.join('templates', '_passenger.conf.erb')
   user 'root'
   owner 'root'
   group 'root'

data/lib/daddy/cucumber.rb

@@ -1,9 +1,5 @@
-require 'capybara/cucumber'
 require_relative 'cucumber/helpers'
 
-Capybara.default_selector = :css
-Capybara.server = :puma if defined?(Puma)
-
 Before do
   resize_window(1280, 720)
 end

data/lib/daddy/cucumber/rails.rb

@@ -1,9 +1,12 @@
+require 'minitest'
+MultiTest.disable_autorun
+
 require 'closer'
 
 begin
   require 'cucumber/rails'
+  puts 'cucumber-rails loaded.'
 rescue LoadError => e
-  puts 'cucumber-rails not found.'
 end
 
 DatabaseCleaner.strategy = :truncation

data/lib/daddy/helpers/html_helper.rb

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

data/lib/daddy/version.rb

@@ -1,8 +1,8 @@
 module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
-    VERSION_MINOR = '6',
-    VERSION_REVISION = '6'
+    VERSION_MINOR = '7',
+    VERSION_REVISION = '0'
   ].join('.')
 
   BAZEL_VERSION = [

data/lib/tasks/locale/en.yml

@@ -17,9 +17,9 @@ en:
     install: install MySQL/MariaDB
   nginx:
     config:
-      default: setting Passenger for app to Nginx
       gitbucket: setting GitBucket as reverse proxy
-      nginx: setting Jenkins as reverse proxy
+      jenkins: setting Jenkins as reverse proxy
+      rails: setting Passenger for rails app
     install: install Nginx
   obs_studio:
     install: install OBS-Studio

data/lib/tasks/locale/ja.yml

@@ -17,9 +17,9 @@ ja:
     install: MySQL/MariaDBをインストールします
   nginx:
     config:
-      default: Nginxにアプリの設定ファイルをインストールします
       gitbucket: NginxにGitBucketのリバースプロキシを設定します
       jenkins: NginxにJenkinsのリバースプロキシを設定します
+      rails: NginxにRailsアプリを設定します
     install: Nginxをインストールします
   obs_studio:
     install: OBS-Studioをインストールします

data/lib/tasks/nginx.rake

@@ -8,15 +8,6 @@ namespace :dad do
       run_itamae 'nginx/install'
     end
 
-    desc I18n.t('nginx.config.default')
-    task :config do
-      ENV['APP_NAME'] ||= app_name
-      ENV['SERVER_NAME'] ||= ask('SERVER_NAME', :default => 'localhost', :required => true)
-      ENV['RAILS_ENV'] ||= rails_env(:default => 'development')
-      ENV['RAILS_ROOT'] ||= rails_root
-      run_itamae 'nginx/config'
-    end
-
     namespace :config do
 
       desc I18n.t('nginx.config.gitbucket')
@@ -32,6 +23,15 @@ namespace :dad do
         run_itamae 'nginx/config/jenkins'
       end
 
+      desc I18n.t('nginx.config.rails')
+      task :rails do
+        ENV['APP_NAME'] ||= app_name
+        ENV['SERVER_NAME'] ||= ask('SERVER_NAME', :default => 'localhost', :required => true)
+        ENV['RAILS_ENV'] ||= rails_env(:default => 'development')
+        ENV['RAILS_ROOT'] ||= rails_root
+        run_itamae 'nginx/config/rails'
+      end
+
     end
   end
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: closer
   requirement: !ruby/object:Gem::Requirement
@@ -307,16 +293,16 @@ files:
 - itamae/cookbooks/mysql/mysql_secure_installation.sh
 - itamae/cookbooks/netdata/install.rb
 - itamae/cookbooks/netdata/netdata-installer.sh
-- itamae/cookbooks/nginx/config.rb
 - itamae/cookbooks/nginx/config/gitbucket.rb
 - itamae/cookbooks/nginx/config/jenkins.rb
+- itamae/cookbooks/nginx/config/rails.rb
+- itamae/cookbooks/nginx/config/templates/_passenger.conf.erb
+- itamae/cookbooks/nginx/config/templates/unicorn.conf.erb
 - itamae/cookbooks/nginx/install.rb
 - itamae/cookbooks/nginx/modules/nginx-rtmp-module.rb
 - itamae/cookbooks/nginx/modules/passenger.rb
 - itamae/cookbooks/nginx/nginx-1.13.5_sha256sum.txt
 - itamae/cookbooks/nginx/nginx-1.13.9_sha256sum.txt
-- itamae/cookbooks/nginx/templates/etc/nginx/conf.d/servers/passenger.conf.erb
-- itamae/cookbooks/nginx/templates/etc/nginx/conf.d/servers/unicorn.conf.erb
 - itamae/cookbooks/obs_studio/install.rb
 - itamae/cookbooks/phantomjs/install.rb
 - itamae/cookbooks/python/Python-3.6.3_sha256sum.txt