forkcms_3_deploy 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/forkcms_3_deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forkcms_3_deploy"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tijs Verkoyen", "Sam Tubbax"]
-  s.date = "2011-11-12"
+  s.date = "2012-09-04"
   s.description = "Deployment for Fork 3.x.x with Capistrano"
   s.email = "info@sumocoders.be"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/sumocoders/forkcms_3_deploy"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Deployment for Fork 3.x.x with Capistrano"
 
   if s.respond_to? :specification_version then

data/lib/forkcms_3_deploy/defaults.rb

@@ -1,25 +1,31 @@
 configuration = Capistrano::Configuration.respond_to?(:instance) ? Capistrano::Configuration.instance(:must_exist) : Capistrano.configuration(:must_exist)
 
 configuration.load do
-	# don't use sudo, on most shared setups we won't have sudo-access
-	set :use_sudo, false
+  def _cset(name, *args, &block)
+    unless exists?(name)
+      set(name, *args, &block)
+    end
+  end
 
-	# we're on a share setup so group_writable isn't allowed
-	set :group_writable, false
+  # don't use sudo, on most shared setups we won't have sudo-access
+  _cset(:use_sudo) { false }
 
-	# 3 releases should be enough.
-	set :keep_releases, 3
+  # we're on a share setup so group_writable isn't allowed
+  _cset(:group_writable) { false }
 
-	# remote caching will keep a local git repo on the server you're deploying to and simply run a fetch from that 
-	# rather than an entire clone. This is probably the best option and will only fetch the differences each deploy
-	set :deploy_via, :remote_cache
+  # 3 releases should be enough.
+  _cset(:keep_releases) { 3 }
 
-	# set the value for pseudo terminals in Capistrano
-	default_run_options[:pty] = true
+  # remote caching will keep a local git repo on the server you're deploying to and simply run a fetch from that
+  # rather than an entire clone. This is probably the best option and will only fetch the differences each deploy
+  _cset(:deploy_via) { remote_cache }
+
+  # set the value for pseudo terminals in Capistrano
+  default_run_options[:pty] = true
+
+  # your computer must be running ssh-agent for the git checkout to work from the server to the git server
+  set :ssh_options, { :forward_agent => true }
 
-	# your computer must be running ssh-agent for the git checkout to work from the server to the git server
-	set :ssh_options, { :forward_agent => true }
-	
   # set version control type and copy strategy
   set :scm, :git
   set :copy_strategy, :checkout

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forkcms_3_deploy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tijs Verkoyen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 Z
+date: 2012-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Deployment for Fork 3.x.x with Capistrano