recap 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6606826af353db87e4cb782732a19207ce156869
-  data.tar.gz: ccab176fe7120b06b759832ebc051dd209b7d280
+  metadata.gz: 1ce0fd67a3a5eca2575897507013976d255d2cdf
+  data.tar.gz: 84fe27ce735df0abeafe7728f56bcaf69f4e1086
 SHA512:
-  metadata.gz: 22297c0c8dcdefccb845c8a3aedf4883b61dc6153e0fc7d192fad377f68971b9cba1bdd81bd73500c297ad26b916c72f44445357503de95424414b14f3ba8f5c
-  data.tar.gz: 161eac0c9fbf088129e75a656becbe9106df4c8491a238b4ad3dbbc7218b32526e11274ed84758a437c2bcdcd00b9eafe043430eb8dda16f946daf4043a1ae0d
+  metadata.gz: df47ca9c62c0ac5160c64d48f659d7562302b1713e27bb571b06e06f46942a357868f1bba30254d5e481dfa340a28f4e1d60209b3ee25ffd66510aea8967356a
+  data.tar.gz: 00db9075c0fdc5c0591c52f77750ffacf5d0562b0cf65bca026bd1aa69403fa91fd90e10947858c116ffd1df5c5c58c577359fa4a20a9f7ad25126adce4f1005

data/lib/recap/support/capistrano_extensions.rb

@@ -1,7 +1,7 @@
 require 'tempfile'
 
 # These methods are used by recap tasks to run commands and detect when files have changed
-# as part of a deployments
+# as part of a deployment.
 
 module Recap::Support::CapistranoExtensions
   # Run a command as the application user
@@ -113,5 +113,11 @@ and try again.
     end
   end
 
+  def _cset(name, *args, &block)
+    unless exists?(name)
+      set(name, *args, &block)
+    end
+  end
+
   Capistrano::Configuration.send :include, self
 end

data/lib/recap/support/compatibility.rb

@@ -10,5 +10,5 @@ module Recap::Support::Compatibility
 
   # As `git` to manages releases, all deployments are placed directly in the `deploy_to` folder.  The
   # `current_path` is always this directory (no symlinking required).
-  set(:current_path) { deploy_to }
-end
+  _cset(:current_path) { deploy_to }
+end

data/lib/recap/tasks/bootstrap.rb

@@ -15,10 +15,10 @@ module Recap::Tasks::Bootstrap
   extend Recap::Support::Namespace
 
   # The bootstrap namespace has a couple of task that help configure application and personal accounts
-  # and personal accounts to meet these requirements.
+  # to meet these requirements.
   namespace :bootstrap do
-    set(:remote_username) { capture('whoami').strip }
-    set(:application_home) { "/home/#{application_user}"}
+    _cset(:remote_username) { capture('whoami').strip }
+    _cset(:application_home) { "/home/#{application_user}"}
 
     # The `bootstrap:application` task sets up the account on the server the application itself uses.  This
     # account should be dedicated to running this application.

data/lib/recap/tasks/bundler.rb

@@ -7,22 +7,22 @@ module Recap::Tasks::Bundler
 
   namespace :bundle do
     # Each bundle is declared in a `Gemfile`, by default in the root of the application directory.
-    set(:bundle_gemfile) { "Gemfile" }
+    _cset(:bundle_gemfile) { "Gemfile" }
 
     # As well as a `Gemfile`, application repositories should also contain a `Gemfile.lock`.
-    set(:bundle_gemfile_lock) { "#{bundle_gemfile}.lock" }
+    _cset(:bundle_gemfile_lock) { "#{bundle_gemfile}.lock" }
 
     # An application's gems are installed within the application directory.  By default they are
     # placed under `vendor/gems`.
-    set(:bundle_path) { "#{deploy_to}/vendor/gems" }
+    _cset(:bundle_path) { "#{deploy_to}/vendor/gems" }
 
     # Not all gems are needed for production environments, so by default the `development`, `test` and
     # `assets` groups are skipped.
-    set(:bundle_without) { "development test" }
+    _cset(:bundle_without) { "development test" }
 
     # The main bundle install command uses all the settings above, together with the `--deployment`,
     # `--binstubs` and `--quiet` flags
-    set(:bundle_install_command) { "bundle install --gemfile #{bundle_gemfile} --path #{bundle_path} --deployment --quiet --binstubs --without #{bundle_without}" }
+    _cset(:bundle_install_command) { "bundle install --gemfile #{bundle_gemfile} --path #{bundle_path} --deployment --quiet --binstubs --without #{bundle_without}" }
 
     namespace :install do
       # After cloning or updating the code, we only install the bundle if the `Gemfile` or `Gemfile.lock` have changed.
@@ -61,4 +61,4 @@ module Recap::Tasks::Bundler
     after 'deploy:clone_code', 'bundle:install:if_changed'
     after 'deploy:update_code', 'bundle:install:if_changed'
   end
-end
+end

data/lib/recap/tasks/deploy.rb

@@ -17,47 +17,47 @@ module Recap::Tasks::Deploy
 
   namespace :deploy do
     # To use this recipe, both the application's name and its git repository are required.
-    set(:application) { abort "You must set the name of your application in your Capfile, e.g.: set :application, 'tomafro.net'" }
-    set(:repository) { abort "You must set the git respository location in your Capfile, e.g.: set :respository, 'git@github.com/tomafro/tomafro.net'" }
+    _cset(:application) { abort "You must set the name of your application in your Capfile, e.g.: set :application, 'tomafro.net'" }
+    _cset(:repository) { abort "You must set the git respository location in your Capfile, e.g.: set :respository, 'git@github.com/tomafro/tomafro.net'" }
 
     # The recipe assumes that the application code will be run as a dedicated user.  Any user who
     # can deploy the application should be added as a member of the application's group.  By default,
     # both the application user and group take the same name as the application.
-    set(:application_user) { application }
-    set(:application_group) { application_user }
+    _cset(:application_user) { application }
+    _cset(:application_group) { application_user }
 
     # Deployments can be made from any branch. `master` is used by default.
-    set(:branch, 'master')
+    _cset(:branch, 'master')
 
     # Unlike a standard capistrano deployment, all releases are stored directly in the `deploy_to`
     # directory.  The default is `/home/#{application_user}/app`.
-    set(:deploy_to)   { "/home/#{application_user}/app" }
+    _cset(:deploy_to)   { "/home/#{application_user}/app" }
 
     # Each release is marked by a unique tag, generated with the current timestamp.  This should
     # not be changed, as the format is matched in the list of tags to find deploy tags.
-    set(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S") }
+    _cset(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S") }
 
     # If `release_tag` is changed, then `release_matcher` must be too, to a regular expression
     # that will match all generated release tags.  In general it's best to leave both unchanged.
-    set(:release_matcher) { /\A[0-9]{14}\Z/ }
+    _cset(:release_matcher) { /\A[0-9]{14}\Z/ }
 
     # On tagging a release, a message is also recorded alongside the tag.  This message can contain
     # anything useful - its contents are not important for the recipe.
-    set(:release_message, "Deployed at #{Time.now}")
+    _cset(:release_message, "Deployed at #{Time.now}")
 
     # Some tasks need to know the `latest_tag` - the most recent successful deployment.  If no
     # deployments have been made, this will be `nil`.
-    set(:latest_tag) { latest_tag_from_repository }
+    _cset(:latest_tag) { latest_tag_from_repository }
 
     # Force a complete deploy, even if no trigger files have changed
-    set(:force_full_deploy, false)
+    _cset(:force_full_deploy, false)
 
     # A lock file is used to ensure deployments don't overlap
-    set(:deploy_lock_file) { "#{deploy_to}/.recap-lock"}
+    _cset(:deploy_lock_file) { "#{deploy_to}/.recap-lock"}
 
     # The lock file is set to include a message that can be displayed
     # if claiming the lock fails
-    set(:deploy_lock_message) { "Deployment in progress (started #{Time.now.to_s})" }
+    _cset(:deploy_lock_message) { "Deployment in progress (started #{Time.now.to_s})" }
 
     # To authenticate with github or other git servers, it is easier (and cleaner) to forward the
     # deploying user's ssh key than manage keys on deployment servers.

data/lib/recap/tasks/env.rb

@@ -24,7 +24,7 @@ module Recap::Tasks::Env
   extend Recap::Support::Namespace
 
   namespace :env do
-    set(:environment_file) { "/home/#{application_user}/.env" }
+    _cset(:environment_file) { "/home/#{application_user}/.env" }
 
     # The `env` task displays the current configuration environment.  Note that this doesn't
     # include all environment variables, only those stored in the `.env` file.
@@ -108,4 +108,4 @@ module Recap::Tasks::Env
   def env_argv
     ARGV[1..-1]
   end
-end
+end

data/lib/recap/tasks/foreman.rb

@@ -7,24 +7,24 @@ module Recap::Tasks::Foreman
 
   namespace :foreman do
     # Processes are declared in a `Procfile`, by default in the root of the application directory.
-    set(:procfile) { "Procfile" }
+    _cset(:procfile) { "Procfile" }
 
     # Foreman startup scripts are exported in `upstart` format by default.
-    set(:foreman_export_format, "upstart")
+    _cset(:foreman_export_format, "upstart")
 
     # Foreman startup scripts are generated based on the standard templates by default
-    set(:foreman_template, nil)
+    _cset(:foreman_template, nil)
 
-    set(:foreman_template_option) { foreman_template ? "--template #{foreman_template}" : nil}
+    _cset(:foreman_template_option) { foreman_template ? "--template #{foreman_template}" : nil}
 
     # Scripts are exported (as the the application user) to a temporary location first.
-    set(:foreman_tmp_location) { "#{deploy_to}/tmp/foreman" }
+    _cset(:foreman_tmp_location) { "#{deploy_to}/tmp/foreman" }
 
     # After exports, the scripts are moved to their final location, usually `/etc/init`.
-    set(:foreman_export_location, "/etc/init")
+    _cset(:foreman_export_location, "/etc/init")
 
     # The standard foreman export.
-    set(:foreman_export_command) { "./bin/foreman export #{foreman_export_format} #{foreman_tmp_location} --procfile #{procfile} --app #{application} --user #{application_user} --log #{deploy_to}/log #{foreman_template_option}" }
+    _cset(:foreman_export_command) { "./bin/foreman export #{foreman_export_format} #{foreman_tmp_location} --procfile #{procfile} --app #{application} --user #{application_user} --log #{deploy_to}/log #{foreman_template_option}" }
 
     namespace :export do
       # After each deployment, the startup scripts are exported if either the `Procfile` or any custom Foreman templates have changed.

data/lib/recap/tasks/preflight.rb

@@ -27,7 +27,7 @@ module Recap::Tasks::Preflight
     before 'deploy:setup', 'preflight:check'
     before 'deploy', 'preflight:check'
 
-    set(:remote_username) { capture('whoami').strip }
+    _cset(:remote_username) { capture('whoami').strip }
 
     task :check do
       # First check the `application_user` exists.

data/lib/recap/tasks/rails.rb

@@ -20,7 +20,7 @@ module Recap::Tasks::Rails
     # assets to be compiled, and which don't.  By default, recap will watch
     # the following files and directories and compile assets if they change
     # between deploys.
-    set(:asset_precompilation_triggers, %w(app/assets vendor/assets Gemfile.lock config))
+    _cset(:asset_precompilation_triggers, %w(app/assets vendor/assets Gemfile.lock config))
 
     namespace :db do
       task :load_schema do

data/lib/recap/tasks/ruby.rb

@@ -2,7 +2,7 @@ module Recap::Tasks::Ruby
   extend Recap::Support::Namespace
 
   namespace :ruby do
-    set(:skip_rails_recipe_not_used_warning, false)
+    _cset(:skip_rails_recipe_not_used_warning, false)
 
     task :preflight do
       if exit_code("grep rails #{deploy_to}/Gemfile") == "0"
@@ -20,4 +20,4 @@ suppress this warning, set :skip_rails_recipe_not_used_warning to true.
 
     after "preflight:check", "ruby:preflight"
   end
-end
+end

data/lib/recap/version.rb

@@ -1,3 +1,3 @@
 module Recap
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/tasks/deploy_spec.rb

@@ -59,6 +59,12 @@ describe Recap::Tasks::Deploy do
       it 'defaults to master' do
         config.branch.should eql('master')
       end
+
+      it 'honours value in pre-set variable' do
+        config.set(:branch, 'branch-from-command-line')
+        Recap::Tasks::Deploy.load_into(config)
+        config.branch.should eql('branch-from-command-line')
+      end
     end
 
     describe '#deploy_to' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recap
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: GIT based deployment recipes for Capistrano