panter-rails-deploy 1.0.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bcedbf15ea4ae698b66a5d478ea3e8a2c3c2007
-  data.tar.gz: c0f558c4d3f6c915429b6b301dc3a96ae27f1bb6
+  metadata.gz: 03a34036ddc89c840ae8fcee3a02d44440d0cf1d
+  data.tar.gz: 39e9b9fe948b5783869a79384b578a5ddc5ea147
 SHA512:
-  metadata.gz: f0b71b7e563b088c2276d568beb6756116c4bf2cd85e2564518624fe662d375e48045d197c3f7d60f7c340bd2c0d9a76271e2ce69a64ebc82dab3adadc507284
-  data.tar.gz: 5d7f05ce844d112939cb23792f840881ae0c3c6b48d38475006bf2f4e92a92e07713fb9e31e8a4681f2089464d3be8f72e2ec741e492cbc812d5830211d28bd4
+  metadata.gz: aab1a93efa2ba26a5f89b79e524c0bd53acb51b2054ef9523d1842bb07ea41d002f95a9347d7c0cea1d7df439ba18e790a8bf45d4c5d9103ecf91f38ee2600cf
+  data.tar.gz: 1f724779c5b0ec9167d69a72f8dd3d10e972f1ea5319725d5ad1ebedd3a7dc454a2b4ed36162eece5b0a5d79cecd3cb1c28478d7cfa60fba92c8d5beb3cc4da1

data/LICENSE

@@ -1,8 +1,21 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <mak@panter.ch> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.
- * ----------------------------------------------------------------------------
- */
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 Markus Koller
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,46 +1,49 @@
 # Panter Rails Deploy
 
-This gem sets up everything you need to deploy your application on the Panter rails hosting:
+This gem sets up everything you need to deploy your application on the Panter Rails hosting:
 
-- capistrano 3
-- unicorn
-- rbenv
-- dotenv
-- therubyracer
+- [Capistrano 3](https://github.com/capistrano/capistrano) setup for:
+  - [Rails](https://github.com/capistrano/rails)
+  - [Bundler](https://github.com/capistrano/bundler)
+  - [rbenv](https://github.com/capistrano/rbenv)
+  - [ruby-install](https://github.com/capistrano-plugins/capistrano-rbenv-install)
+- [unicorn-rails](https://github.com/samuelkadolph/unicorn-rails)
+- [dotenv-rails](https://github.com/bkeepers/dotenv)
+- [therubyracer](https://github.com/cowboyd/therubyracer) for [ExecJS](https://github.com/rails/execjs), used for asset compilation on the server
 
 ## How to use
 
-- Add to your Gemfile (global, not in a group):
+- Add to your Gemfile **(globally, not in a group)**:
   ```ruby
   gem 'panter-rails-deploy'
   ```
 
-- Capify your project (Bundler is required here, [rbenv-binstubs](https://github.com/ianheggie/rbenv-binstubs) is recommended):
+- Capify your project (`bundle exec` is required here, unless you use [rbenv-binstubs](https://github.com/ianheggie/rbenv-binstubs)):
   ```sh
   bundle exec cap install
   ```
 
-- Add one of these to your `Capfile` - below the line 'Include tasks from other gems included in your Gemfile':
+- Add one of these to your `Capfile` - below the line "Include tasks from other gems included in your Gemfile":
   
-  For rails projects with asset compilation
+  For a standard Rails project with asset compilation:
 
   ```ruby
   require 'panter-rails-deploy'
   ```
 
-  For rails projects without asset compilation
+  For a Rails project that doesn't use asset compilation:
 
   ```ruby
   require 'panter-rails-deploy/without-assets'
   ```
 
-  For other Rack applications
+  For other Rack applications:
   
   ```ruby
   require 'panter-rails-deploy/without-rails'
   ```
 
-- Set `:application` and `:repo_url` in `config/deploy.rb`
+- Set `:application` and `:repo_url` in `config/deploy.rb` (note that in previous Capistrano versions it was called `:repository` instead)
 
 - Set up your stages in `config/deploy` folder (e.g. `config/deploy/production.rb`):
   ```ruby
@@ -56,12 +59,16 @@ This gem sets up everything you need to deploy your application on the Panter ra
 
 ## dotenv setup
 
-This is optional, but recommended:
+Using `dotenv` is the [recommended approach](http://12factor.net/config) to store sensitive configuration in the environment instead of code repositories.
 
 - Add a file on your servers in `/home/app/app/shared/.env` with your keys:
   ```sh
-  RAILS_SECRET_KEY_BASE: ...
+  RAILS_SECRET_KEY_BASE: 89d20f0...
   ```
+  
+  - You can add any other key-value pairs, they'll simply be injected into `ENV`
+  - You can use `rake secret` / `rails secret` (Rails 5) to generate a new secure key
+  - Rails uses `SECRET_KEY_BASE` by default, but adding a `RAILS_` prefix is recommended since `dotenv` itself is framework-agnostic
 
 - If you need keys in development as well, add `.env` locally and add it to `.gitignore`
 
@@ -75,3 +82,5 @@ This is optional, but recommended:
   ```ruby
   set :linked_files, fetch(:linked_files, []).push('.env')
   ```
+
+  - The `fetch(..., []).push(...)` approach is needed for `:linked_files` and `:linked_dirs` to keep the values added by this Gem

data/lib/capistrano/tasks/panter-rails-deploy.rake

@@ -7,7 +7,7 @@ namespace :load do
     set :log_level, :info
 
     set :linked_files, %w[ config/database.yml ]
-    set :linked_dirs, %w[ log tmp/cache ]
+    set :linked_dirs, %w[ log tmp/cache tmp/pids ]
 
     # Setup capistrano-rails
     set :rails_env, 'production'

data/panter-rails-deploy.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |gem|
   gem.name        = 'panter-rails-deploy'
-  gem.version     = '1.0.6'
-  gem.date        = '2015-07-26'
+  gem.version     = '1.2.0'
+  gem.date        = '2016-02-11'
   gem.summary     = 'Capistrano setup for Panter Rails Hosting'
   gem.authors     = [ 'Markus Koller', 'Beat Seeliger' ]
   gem.email       = 'mak@panter.ch'
   gem.homepage    = 'https://github.com/panter/panter-rails-deploy'
-  gem.license     = 'Beerware'
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.license     = 'MIT'
+  gem.required_ruby_version = '>= 2.0.0'
 
   gem.files         = `git ls-files`.split($/)
   gem.require_paths = [ 'lib' ]
@@ -21,11 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'unicorn-rails'
   gem.add_dependency 'dotenv-rails'
 
-  # work around problem with sshkit 1.8.0,
-  # see https://github.com/capistrano/sshkit/issues/303
-  # and https://github.com/capistrano/rbenv/pull/59
-  gem.add_dependency 'sshkit', '~> 1.7.1'
-
   # Asset pipeline dependencies
   gem.add_dependency 'therubyracer'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panter-rails-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Markus Koller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -109,20 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sshkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +142,7 @@ files:
 - panter-rails-deploy.gemspec
 homepage: https://github.com/panter/panter-rails-deploy
 licenses:
-- Beerware
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -166,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="