daddy 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adebf94afd27d89f889ea11223950555d34a33c5
-  data.tar.gz: 7242fa1f7bb280e389ac351f9af2b43d5a2448af
+  metadata.gz: 9a78a31cdfa48e44f67c9ad5c945d9e310dbc82e
+  data.tar.gz: 2736fd828a981ea2a9de5f122627d058b2e0692f
 SHA512:
-  metadata.gz: 5f29678c5d49c00800672439c38dbcc07a32db0f3be094009786e12cdfc9d9005883261cb422a91db3dd082ac8c20bf0c4d4e656ac70e4c3d6e6fe4c93ed4d34
-  data.tar.gz: 5c690f51b37b6fa374f158b2220710dcabf82c632c3e3869ff4bc0f0edf00da414b0c7ec206878f4dae158168c450ad7aece8a84c65f56a4cd742dfdcb5727e3
+  metadata.gz: 30bf825a24c47fa9d398de69c428cbe4b5cb199ab87cb7bf4b9918c2ed12bab41dbc609f048f353809488203532caa11c0a646ba9db1fee5951dccdd7b1d6035
+  data.tar.gz: 745f663df717ffc4076cd694a37172ff2eae71b87f1286bcb42c490795a262264a1eaa6829bb60bf204d810b7cea0c7a0391cb67f0bf7c1b1f9b438c40e62c5b

data/itamae/cookbooks/nginx/config.rb

@@ -16,5 +16,6 @@ template "/etc/nginx/conf.d/servers/#{ENV['APP_NAME']}.conf" do
   variables :app_name => ENV['APP_NAME'],
       :server_name => ENV['SERVER_NAME'],
       :rails_env => ENV['RAILS_ENV'],
-      :rails_root => ENV['RAILS_ROOT']
+      :rails_root => ENV['RAILS_ROOT'],
+      :behind_load_balancer => false
 end

data/itamae/cookbooks/nginx/templates/app.conf.erb

@@ -36,8 +36,12 @@ server {
     proxy_pass http://<%= @app_name %>;
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    <%- if @behind_load_balancer %>
+    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+    <%- else -%>
+    proxy_set_header X-Forwarded-Proto $scheme;
+    <%- end %>
   }
 
 <%- if @rails_env == 'production' -%>

data/itamae/cookbooks/unicorn/install.rb

@@ -15,7 +15,7 @@ when /rhel-6\.(.*?)/
     variables :app_name => ENV['APP_NAME'],
         :rails_env => ENV['RAILS_ENV'],
         :rails_root => ENV['RAILS_ROOT'],
-        :worker_processes => ENV['RAILS_ROOT'] == 'production' ? 2 : 1
+        :worker_processes => ENV['RAILS_ENV'] == 'production' ? 2 : 1
   end
 when /rhel-7\.(.*?)/
   template "/etc/systemd/system/#{ENV['APP_NAME']}.service" do
@@ -28,7 +28,7 @@ when /rhel-7\.(.*?)/
         :rails_env => ENV['RAILS_ENV'],
         :rails_root => ENV['RAILS_ROOT'],
         :user => ENV['USER'],
-        :worker_processes => ENV['RAILS_ROOT'] == 'production' ? 2 : 1
+        :worker_processes => ENV['RAILS_ENV'] == 'production' ? 2 : 1
   end
 
   execute 'systemctl daemon-reload' do

data/lib/daddy/test_help.rb

@@ -1,4 +1,4 @@
-if ENV["COVERAGE"]
+if ENV['COVERAGE']
   begin
     require 'simplecov'
   rescue LoadError => e

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.17'
+  VERSION = '0.5.18'
 end

data/lib/tasks/resque.rake

@@ -1,5 +1,4 @@
-require 'rake'
-require 'yaml'
+require_relative 'task_helper'
 
 namespace :dad do
   namespace :resque do
@@ -19,31 +18,33 @@ namespace :dad do
   end
 end
 
-require 'resque/tasks'
-require 'resque/scheduler/tasks'
-
-namespace :resque do
-  task :setup do
-    require 'resque'
-    require 'resque/scheduler'
-
-    # If you want to be able to dynamically change the schedule,
-    # uncomment this line.  A dynamic schedule can be updated via the
-    # Resque::Scheduler.set_schedule (and remove_schedule) methods.
-    # When dynamic is set to true, the scheduler process looks for
-    # schedule changes and applies them on the fly.
-    # Note: This feature is only available in >=2.0.0.
-    Resque::Scheduler.dynamic = true
-
-    # The schedule doesn't need to be stored in a YAML, it just needs to
-    # be a hash.  YAML is usually the easiest.
-    #Resque.schedule = YAML.load_file('your_resque_schedule.yml')
-
-    # If your schedule already has +queue+ set for each job, you don't
-    # need to require your jobs.  This can be an advantage since it's
-    # less code that resque-scheduler needs to know about. But in a small
-    # project, it's usually easier to just include you job classes here.
-    # So, something like this:
-    #require 'jobs'
+if defined?(Resque::Scheduler)
+  require 'resque/tasks'
+  require 'resque/scheduler/tasks'
+  
+  namespace :resque do
+    task :setup do
+      require 'resque'
+      require 'resque/scheduler'
+  
+      # If you want to be able to dynamically change the schedule,
+      # uncomment this line.  A dynamic schedule can be updated via the
+      # Resque::Scheduler.set_schedule (and remove_schedule) methods.
+      # When dynamic is set to true, the scheduler process looks for
+      # schedule changes and applies them on the fly.
+      # Note: This feature is only available in >=2.0.0.
+      Resque::Scheduler.dynamic = true
+  
+      # The schedule doesn't need to be stored in a YAML, it just needs to
+      # be a hash.  YAML is usually the easiest.
+      #Resque.schedule = YAML.load_file('your_resque_schedule.yml')
+  
+      # If your schedule already has +queue+ set for each job, you don't
+      # need to require your jobs.  This can be an advantage since it's
+      # less code that resque-scheduler needs to know about. But in a small
+      # project, it's usually easier to just include you job classes here.
+      # So, something like this:
+      #require 'jobs'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -140,72 +140,78 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :runtime
+        version: '1.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: resque-scheduler
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '1.26'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.51'
-  type: :runtime
+        version: '4.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.51'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.51'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement