chicken_soup 0.8.5 → 0.8.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/chicken_soup/capabilities/shared/db-checks.rb +5 -3
  2. data/lib/chicken_soup/environment/checks.rb +2 -2
  3. data/lib/chicken_soup/environment/defaults.rb +14 -6
  4. data/lib/chicken_soup/version.rb +1 -1
  5. metadata +13 -13
data/lib/chicken_soup/capabilities/shared/db-checks.rb CHANGED
@@ -29,10 +29,12 @@ Capistrano::Configuration.instance(:must_exist).load do
29
29
  [internal] Checks to see if the DB is ready for deployment.
30
30
  DESC
31
31
  task :db, :roles => :db, :only => {:primary => true} do
32
- backup_task_exists = capture("cd #{current_path} && #{rake} -T | grep db:backup | wc -l").chomp
33
- abort("There must be a task named db:backup in order to deploy. If you do not want to backup your DB during deployments, set the skip_backup_before_migration variable to true in your deploy.rb.") if backup_task_exists == '0'
32
+ unless skip_backup_before_migration
33
+ backup_task_exists = capture("cd #{current_path} && #{rake} -T | grep db:backup | wc -l").chomp
34
+ abort("There must be a task named db:backup in order to deploy. If you do not want to backup your DB during deployments, set the skip_backup_before_migration variable to true in your deploy.rb.") if backup_task_exists == '0'
34
35
 
35
- run "if [ ! -d #{db_backups_path} ]; then mkdir #{db_backups_path}; fi"
36
+ run "if [ ! -d #{db_backups_path} ]; then mkdir #{db_backups_path}; fi"
37
+ end
36
38
  end
37
39
  end
38
40
  end
data/lib/chicken_soup/environment/checks.rb CHANGED
@@ -15,7 +15,7 @@
15
15
  #
16
16
  ######################################################################
17
17
  Capistrano::Configuration.instance(:must_exist).load do
18
- on :start, 'environment:variable:check', :except => ['staging', 'production']
18
+ on :start, 'environment:variable:check', :except => ['staging', 'princess', 'production']
19
19
  before 'deploy', 'environment:deployment:check'
20
20
  before 'deploy:cold', 'environment:deployment:check'
21
21
  before 'deploy:subzero', 'environment:deployment:check'
@@ -27,7 +27,7 @@ Capistrano::Configuration.instance(:must_exist).load do
27
27
  namespace :variable do
28
28
  desc "[internal] Checks for environment variables shared among all deployment types."
29
29
  task :check do
30
- abort "You need to specify staging or production when you deploy. ie 'cap staging db:backup'" unless exists?(:rails_env)
30
+ abort "You need to specify staging, princess or production when you deploy. ie 'cap staging db:backup'" unless exists?(:rails_env)
31
31
  abort "You need to specify a deployment type in your application's 'deploy.rb' file. ie 'set :deployment_type, :heroku'" unless exists?(:deployment_type)
32
32
 
33
33
  required_variables = [
data/lib/chicken_soup/environment/defaults.rb CHANGED
@@ -6,13 +6,13 @@
6
6
  # None of these defaults are specific to any of the capabilities we
7
7
  # will add in later.
8
8
  #
9
- # The main tasks of note are the :staging and :production tasks. Both
10
- # of which will set the :rails_env variable so that the rest of the
11
- # tasks know in what environment they are operating.
9
+ # The main tasks of note are the :staging, :princess and :production
10
+ # tasks. Both of which will set the :rails_env variable so that the
11
+ # rest of the tasks know in what environment they are operating.
12
12
  #
13
- # Note: That these are the 'environment:defaults:staging' and
14
- # 'environment:defaults:production' tasks and not the 'staging' and
15
- # 'production' tasks.
13
+ # Note: That these are the 'environment:defaults:staging',
14
+ # 'environment:defaults:princess' and 'environment:defaults:production'
15
+ # tasks and not the 'staging', 'princess' and 'production' tasks.
16
16
  #
17
17
  # The latter should be set in the application's deploy.rb file.
18
18
  #
@@ -21,6 +21,7 @@ require 'etc'
21
21
 
22
22
  Capistrano::Configuration.instance(:must_exist).load do
23
23
  after 'production', 'environment:defaults:production', 'environment:init'
24
+ after 'princess', 'environment:defaults:princess', 'environment:init'
24
25
  after 'staging', 'environment:defaults:staging', 'environment:init'
25
26
 
26
27
  after 'environment:defaults', 'capabilities:defaults', 'notifiers:defaults', 'tools:defaults'
@@ -34,6 +35,13 @@ Capistrano::Configuration.instance(:must_exist).load do
34
35
  _cset(:domain) { "staging.#{application}.com" }
35
36
  end
36
37
 
38
+ desc "[internal] Used to set up the intelligent princess defaults we like for our projects"
39
+ task :princess do
40
+ set :rails_env, 'princess'
41
+
42
+ _cset(:domain) { "princess.#{application}.com" }
43
+ end
44
+
37
45
  desc "[internal] Used to set up the intelligent production defaults we like for our projects"
38
46
  task :production do
39
47
  set :rails_env, 'production'
data/lib/chicken_soup/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ChickenSoup
2
- VERSION = "0.8.5"
2
+ VERSION = "0.8.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chicken_soup
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.5
4
+ version: 0.8.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-01-16 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: capistrano
17
- requirement: &2156055480 !ruby/object:Gem::Requirement
17
+ requirement: &2156145460 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 2.9.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2156055480
25
+ version_requirements: *2156145460
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: mail
28
- requirement: &2156046280 !ruby/object:Gem::Requirement
28
+ requirement: &2156144860 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '2.2'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2156046280
36
+ version_requirements: *2156144860
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: activesupport
39
- requirement: &2156045320 !ruby/object:Gem::Requirement
39
+ requirement: &2156142660 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '3.0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *2156045320
47
+ version_requirements: *2156142660
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: bundler
50
- requirement: &2156044600 !ruby/object:Gem::Requirement
50
+ requirement: &2156139780 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 1.0.10
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *2156044600
58
+ version_requirements: *2156139780
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec
61
- requirement: &2156043980 !ruby/object:Gem::Requirement
61
+ requirement: &2156062880 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 2.6.0
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2156043980
69
+ version_requirements: *2156062880
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: yard
72
- requirement: &2156043300 !ruby/object:Gem::Requirement
72
+ requirement: &2156062300 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,7 +77,7 @@ dependencies:
77
77
  version: 0.7.1
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2156043300
80
+ version_requirements: *2156062300
81
81
  description: Why do you keep typing all that crap into your Capistrano recipes? Are
82
82
  you too cool for standards? Well, ARE YA!?
83
83
  email: support@thekompanee.com