capistrano-fiftyfive 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29e3fd7ad4df880bfb2665250d10881d574d9345
-  data.tar.gz: 248cb2746bed751d9347586fbb0f96ace8c5c6f5
+  metadata.gz: 37e7a11ca6da560677e7c92b29fdd9f86c9e282b
+  data.tar.gz: 32b016831b52ccf65cad50a5c9c7ce18a18f5674
 SHA512:
-  metadata.gz: 33c8160aed2ddc2dfc8f43758e567dc705b5f4e3a16341cfa525af3757c5964100829766b7e30a361f55082f956b7628aa48134f2008883c7612be1157718b65
-  data.tar.gz: 5aa307f5bc6704fc13db501adeb4567e58fe3ec811e4254c1fdc3f789aba4932691e295f8f377ba2f26febeb9d7da6f03618fd7d9567af4aa063645f6dc60854
+  metadata.gz: 44a70450dbce4ccb4b1797847a7b0af74d01b42f161d243a35c72e3a87ec3cb6e8942698d1c2736ab0056590efe97f59ff4f1107fa9da447ffe42f1d24f3a53b
+  data.tar.gz: f0e5afaee684a66408a9963de88ead097189bb1da6f95f77efaa3f321affe2c69202d8647f611bb9269bc4302e7d556ee641d61eebd0102726407ec039af398a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # capistrano-fiftyfive Changelog
 
+## `0.14.0`
+
+* The `highline` gem is now a dependency ([#3](https://github.com/55minutes/capistrano-fiftyfive/pull/3) from [@ahmozkya](https://github.com/ahmozkya)).
+* Dotenv: only mask input when prompting for keys containing the words "key", "secret", "token", or "password". Input for other keys is echoed for easier data entry.
+* Dotenv: update `.env` files in sequence rather than in parallel, to avoid parallel command output clobbering the input prompt.
+* Nginx/unicorn: tweak reverse-proxy cache settings to prevent cache stampede.
+* Nginx/unicorn: apply far-future expires cache headers only for assets that have fingerprints.
+
 ## `0.13.0`
 
 The provisioning tasks now work for a non-root user that has password-less sudo privileges. Assuming a user named `matt` that can sudo without being prompted for a password ([instructions here](http://askubuntu.com/questions/192050/how-to-run-sudo-command-with-no-password)), simply modify `deploy.rb` with:

data/capistrano-fiftyfive.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano", ">= 3.2.1"
   spec.add_dependency "sshkit", ">= 1.4.0"
   spec.add_dependency "colorize"
+  spec.add_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/capistrano/fiftyfive/dsl.rb

@@ -30,12 +30,11 @@ module Capistrano
       end
 
       # Like capistrano's built-in ask(), but does not echo user input.
-      # Suitable for passwords, etc. Requires the highline gem.
+      # Suitable for passwords, etc. Uses the highline gem.
       #
       #   ask_secretly(:postgresql_password)
       #
       def ask_secretly(key, default=nil)
-        require "highline"
         set key, proc{
           hint = default ? " [#{default}]" : ""
           answer = HighLine.new.ask("Enter #{key}#{hint}: ") do |q|
@@ -46,7 +45,6 @@ module Capistrano
 
       # Delegates to HighLine's agree() method.
       def agree(yes_or_no_question, character=nil)
-        require "highline"
         HighLine.new.agree(yes_or_no_question, character)
       end
 

data/lib/capistrano/fiftyfive/templates/nginx_unicorn.erb

@@ -59,7 +59,7 @@ upstream unicorn_<%= application_basename %> {
       <% end %>
 
       # Far-future expires and gzip for fingerprinted assets
-      location ^~ /<%= fetch(:assets_prefix, "assets") %>/ {
+      location ^~ /<%= fetch(:assets_prefix, "assets") %>/.*-[0-9a-f]{32}.* {
         gzip_static on;
         expires max;
         add_header Cache-Control public;
@@ -88,7 +88,10 @@ upstream unicorn_<%= application_basename %> {
         proxy_redirect off;
 
         # enable caching (honors cache-control headers sent by Rails)
+        # lock and use_stale help prevent a cache stampede
         proxy_cache default;
+        proxy_cache_lock on;
+        proxy_cache_use_stale updating;
         add_header X-Cache-Status $upstream_cache_status;
 
         proxy_pass http://unicorn_<%= application_basename %>;

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
   end
 end

data/lib/capistrano/fiftyfive.rb

@@ -1,4 +1,5 @@
 require "digest"
+require "highline"
 require "monitor"
 require "capistrano/fiftyfive/version"
 require "capistrano/fiftyfive/compatibility"

data/lib/capistrano/tasks/defaults.rake

@@ -35,7 +35,6 @@ namespace :load do
     set :fiftyfive_delayed_job_script, "bin/delayed_job"
 
     set :fiftyfive_dotenv_keys, %w(rails_secret_key_base postmark_api_key)
-    set :fiftyfive_dotenv_monitor, Monitor.new
     set :fiftyfive_dotenv_filename, -> { ".env.#{fetch(:rails_env)}" }
 
     set :fiftyfive_log_file, "log/capistrano.log"

data/lib/capistrano/tasks/dotenv.rake

@@ -7,7 +7,7 @@ namespace :fiftyfive do
   namespace :dotenv do
     desc "Replace/create .env file with values provided at console"
     task :replace do
-      set_up_secret_prompts
+      set_up_prompts
 
       on release_roles(:all) do
         update_dotenv_file
@@ -16,9 +16,9 @@ namespace :fiftyfive do
 
     desc "Update .env file with any missing values"
     task :update do
-      set_up_secret_prompts
+      set_up_prompts
 
-      on release_roles(:all) do
+      on release_roles(:all), :in => :sequence do
         existing_env = if test("[ -f #{shared_dotenv_path} ]")
           download!(shared_dotenv_path)
         end
@@ -30,8 +30,14 @@ namespace :fiftyfive do
       "#{shared_path}/#{fetch(:fiftyfive_dotenv_filename)}"
     end
 
-    def set_up_secret_prompts
-      fetch(:fiftyfive_dotenv_keys).each { |k| ask_secretly(k) }
+    def set_up_prompts
+      fetch(:fiftyfive_dotenv_keys).each do |key|
+        if key.to_s =~ /key|token|secret|password/i
+          ask_secretly(key)
+        else
+          ask(key, nil)
+        end
+      end
     end
 
     def update_dotenv_file(existing="")
@@ -39,10 +45,8 @@ namespace :fiftyfive do
 
       fetch(:fiftyfive_dotenv_keys).each do |key|
         next if existing =~ /^#{Regexp.escape(key.upcase)}=/
-        fetch(:fiftyfive_dotenv_monitor).synchronize do
-          updated << "\n" unless updated.end_with?("\n")
-          updated << "#{key.upcase}=#{fetch(key)}\n"
-        end
+        updated << "\n" unless updated.end_with?("\n")
+        updated << "#{key.upcase}=#{fetch(key)}\n"
       end
 
       unless existing == updated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Additional Capistrano recipes from 55 Minutes