capistrano-forkcms 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -3
  3. data/README.md +33 -16
  4. data/Rakefile +1 -1
  5. data/capistrano-forkcms.gemspec +12 -12
  6. data/lib/capistrano/forkcms/version.rb +1 -1
  7. data/lib/capistrano/tasks/configure.rake +1 -1
  8. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1cbeace749aab6719de0cb6265d7bb6d0f16ce75
4
- data.tar.gz: adbad68db7dbe231a41a0e51c7ecfcffe0978d5b
3
+ metadata.gz: 01a1470d79a72c626f0b4d7f320fb9c36da374f3
4
+ data.tar.gz: aa70ae7807a44ce30ad23bf4dd7ad80be1900bf9
5
5
  SHA512:
6
- metadata.gz: e9630a72c93b4a54c0579d95c209952723974fe12ec4fe6d50c994d13cf71a663eca3f3fc3f75ff3c94df5fa942fa14c316658d5687a206351a24cfcbaff3d4f
7
- data.tar.gz: c53fe431936772ff03e000b8412a4d255ff4d2532ac9dc0ddfb7d1faa4743f17b80e57b763c80b616761abb772d5d8d5743280c90df48c545157e69b6babf2ea
6
+ metadata.gz: 3b2e3f53e445fd88fb27b6e1c2e8f6ce16857e673d8cb4b6769f7fec2d3c532a1ebd62bc56acc02847cc83df120fd68a60468f1b1550407ff5a8e7f025600526
7
+ data.tar.gz: dbd2d5aac1e63a445f12d27f180148aa5399579726184facb2b610d04a32be62456586d7995b56e1544de3fbfb3549fccde2bde0a31bc066b6de047b87beb6df
data/Gemfile CHANGED
@@ -2,12 +2,11 @@
2
2
  source "https://rubygems.org"
3
3
 
4
4
  # Specify your gem's dependencies in capistrano-forkcms.gemspec
5
- gem 'capistrano', '~> 3.1'
5
+ gem 'capistrano', '~> 3.8'
6
6
  gem 'capistrano-composer', '~> 0.0.6'
7
- gem 'capistrano-cachetool', '~> 1.0.0'
7
+ gem 'capistrano-cachetool', '~> 1.0'
8
8
 
9
9
  group :development do
10
10
  gem 'rake', '~> 12.0'
11
11
  gem 'rspec', '~> 3.0'
12
12
  end
13
-
data/README.md CHANGED
@@ -49,22 +49,21 @@ Configuration options:
49
49
  1. Create a Capfile with the content below:
50
50
 
51
51
  ```
52
- # Load DSL and set up stages
53
- require "capistrano/setup"
52
+ set :deploy_config_path, 'app/config/capistrano/deploy.rb'
53
+ set :stage_config_path, 'app/config/capistrano/stages'
54
54
 
55
- # Include default deployment tasks
56
- require "capistrano/deploy"
57
-
58
- require "capistrano/scm/git"
55
+ require 'capistrano/setup'
56
+ require 'capistrano/deploy'
57
+ require 'capistrano/scm/git'
59
58
  install_plugin Capistrano::SCM::Git
59
+ require 'capistrano/forkcms'
60
60
 
61
- require "capistrano/forkcms"
61
+ set :format_options, log_file: 'app/logs/capistrano.log'
62
62
 
63
- # Load custom tasks from `lib/capistrano/tasks` if you have any defined
64
- Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
63
+ Dir.glob('app/config/capistrano/tasks/*.rake').each { |r| import r }
65
64
  ```
66
65
 
67
- 2. Create a file called `config/deploy.rb`, with the content below:
66
+ 2. Create a file called `app/config/capistrano/deploy.rb`, with the content below:
68
67
 
69
68
  ```
70
69
  set :application, "$your-application-name"
@@ -73,16 +72,34 @@ set :repo_url, "$your-repo-url"
73
72
  set :keep_releases, 3
74
73
  ```
75
74
 
76
- 3. Create a file called `config/deploy/production.rb`, with the content below:
75
+ 3. Create a file called `app/config/capistrano/stages/production.rb`, with the content below:
77
76
 
78
77
  ```
79
- ... @todo, fix this
78
+ server "$your-server-hostname", user: "$your-user", roles: %w{app db web}
79
+
80
+ set :deploy_to, "$your-path-where-everything-should-be-deployed" # eg: /home/johndoe/apps/website
81
+ set :document_root, "$your-document-root" # eg: /var/www
82
+
83
+ set :opcache_reset_strategy, "fcgi"
84
+ set :opcache_reset_fcgi_connection_string, "$your-php-fpm-socket-or-connection-string" # eg: /var/run/php_71_fpm_sites.sock
85
+
86
+ # or if you are not using FCGI/FPM
87
+ #set :opcache_reset_strategy, "file"
88
+ #set :opcache_reset_base_url, "$your-public-url" # eg: "http://www.fork-cms.com"
89
+
90
+ ### DO NOT EDIT BELOW ###
91
+ set :branch, "master"
92
+ set :keep_releases, 3
93
+ set :php_bin, "php"
94
+
95
+ SSHKit.config.command_map[:composer] = "#{fetch :php_bin} #{shared_path.join("composer.phar")}"
96
+ SSHKit.config.command_map[:php] = fetch(:php_bin)
80
97
  ```
81
98
 
82
- 4. Create a file called `config/deploy/staging.rb`, with the content below:
99
+ 4. Create a file called `app/config/capistrano/stages/staging.rb`, with the content below:
83
100
 
84
101
  ```
85
- server "$your-server-hostname", user: "sites", roles: %w{app db web}
102
+ server "$your-server-hostname", user: "$your-user", roles: %w{app db web}
86
103
  set :deploy_to, "$your-path-where-everything-should-be-deployed" # eg: /home/johndoe/apps/website
87
104
  set :document_root, "$your-document-root" # eg: /var/www
88
105
 
@@ -93,9 +110,9 @@ set :opcache_reset_fcgi_connection_string, "$your-php-fpm-socket-or-connection-s
93
110
  #set :opcache_reset_strategy, "file"
94
111
  #set :opcache_reset_base_url, "$your-public-url" # eg: "http://www.fork-cms.com"
95
112
 
113
+ set :branch, "staging"
96
114
  ```
97
115
 
98
-
99
116
  ## Contributing
100
117
 
101
118
  Bug reports and pull requests are welcome on GitHub at [https://github.com/tijsverkoyen/capistrano-forkcms](https://github.com/tijsverkoyen/capistrano-forkcms).
@@ -103,4 +120,4 @@ Bug reports and pull requests are welcome on GitHub at [https://github.com/tijsv
103
120
 
104
121
  ## License
105
122
 
106
- The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
123
+ The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
data/Rakefile CHANGED
@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
3
3
  require 'rspec/core/rake_task'
4
4
 
5
5
  RSpec::Core::RakeTask.new(:test) do |spec|
6
- spec.pattern = "spec/**/*_spec.rb"
6
+ spec.pattern = 'spec/**/*_spec.rb'
7
7
  end
8
8
 
9
9
  task :default => :test
data/capistrano-forkcms.gemspec CHANGED
@@ -4,26 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require 'capistrano/forkcms/version'
5
5
 
6
6
  Gem::Specification.new do |spec|
7
- spec.name = "capistrano-forkcms"
7
+ spec.name = 'capistrano-forkcms'
8
8
  spec.version = Capistrano::Forkcms::VERSION
9
- spec.authors = ["Tijs Verkoyen"]
10
- spec.email = ["capistrano-forcms@verkoyen.eu"]
9
+ spec.authors = ['Tijs Verkoyen']
10
+ spec.email = ['capistrano-forcms@verkoyen.eu']
11
11
 
12
12
  spec.summary = %q{Fork CMS specific Capistrano tasks}
13
13
  spec.description = %q{Capistrano ForkCMS - Easy deployment of ForkCMS 5+ apps with Ruby over SSH}
14
- spec.homepage = "https://github.com/tijsverkoyen/capistrano-forkcms"
15
- spec.license = "MIT"
14
+ spec.homepage = 'https://github.com/tijsverkoyen/capistrano-forkcms'
15
+ spec.license = 'MIT'
16
16
 
17
17
  spec.files = `git ls-files -z`.split("\x0").reject do |f|
18
18
  f.match(%r{^(test|spec|features)/})
19
19
  end
20
- spec.require_paths = ["lib"]
20
+ spec.require_paths = ['lib']
21
21
 
22
- spec.add_development_dependency "bundler", "~> 1.14"
23
- spec.add_development_dependency "rake", "~> 10.0"
24
- spec.add_development_dependency "rspec", "~> 3.0"
22
+ spec.add_development_dependency 'bundler', '~> 1.14'
23
+ spec.add_development_dependency 'rake', '~> 10.0'
24
+ spec.add_development_dependency 'rspec', '~> 3.0'
25
25
 
26
- spec.add_dependency "capistrano", "~> 3.1"
27
- spec.add_dependency "capistrano-composer", "~> 0.0.6"
28
- spec.add_dependency "capistrano-cachetool", "~> 1.0.0"
26
+ spec.add_dependency 'capistrano', '~> 3.8'
27
+ spec.add_dependency 'capistrano-composer', '~> 0.0.6'
28
+ spec.add_dependency 'capistrano-cachetool', '~> 1.0'
29
29
  end
data/lib/capistrano/forkcms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module Forkcms
3
- VERSION = '2.0.3'
3
+ VERSION = '2.0.4'
4
4
  end
5
5
  end
data/lib/capistrano/tasks/configure.rake CHANGED
@@ -32,7 +32,7 @@ namespace :forkcms do
32
32
  if test("[ -L #{fetch :document_root} ]") && capture("readlink -- #{fetch :document_root}") == "#{current_path}/"
33
33
  # all is well, the symlink is correct
34
34
  elsif test("[ -d #{fetch :document_root} ]") || test("[ -f #{fetch :document_root} ]")
35
- error 'Document root #{fetch :document_root} already exists.'
35
+ error "Document root #{fetch :document_root} already exists."
36
36
  error 'To link it, issue the following command:'
37
37
  error "ln -sf #{current_path}/ #{fetch :document_root}"
38
38
  else
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-forkcms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tijs Verkoyen
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '3.1'
61
+ version: '3.8'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '3.1'
68
+ version: '3.8'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: capistrano-composer
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.0.0
89
+ version: '1.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.0.0
96
+ version: '1.0'
97
97
  description: Capistrano ForkCMS - Easy deployment of ForkCMS 5+ apps with Ruby over
98
98
  SSH
99
99
  email: