capistrano-forkcms 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cbeace749aab6719de0cb6265d7bb6d0f16ce75
-  data.tar.gz: adbad68db7dbe231a41a0e51c7ecfcffe0978d5b
+  metadata.gz: 01a1470d79a72c626f0b4d7f320fb9c36da374f3
+  data.tar.gz: aa70ae7807a44ce30ad23bf4dd7ad80be1900bf9
 SHA512:
-  metadata.gz: e9630a72c93b4a54c0579d95c209952723974fe12ec4fe6d50c994d13cf71a663eca3f3fc3f75ff3c94df5fa942fa14c316658d5687a206351a24cfcbaff3d4f
-  data.tar.gz: c53fe431936772ff03e000b8412a4d255ff4d2532ac9dc0ddfb7d1faa4743f17b80e57b763c80b616761abb772d5d8d5743280c90df48c545157e69b6babf2ea
+  metadata.gz: 3b2e3f53e445fd88fb27b6e1c2e8f6ce16857e673d8cb4b6769f7fec2d3c532a1ebd62bc56acc02847cc83df120fd68a60468f1b1550407ff5a8e7f025600526
+  data.tar.gz: dbd2d5aac1e63a445f12d27f180148aa5399579726184facb2b610d04a32be62456586d7995b56e1544de3fbfb3549fccde2bde0a31bc066b6de047b87beb6df

data/Gemfile

@@ -2,12 +2,11 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-forkcms.gemspec
-gem 'capistrano', '~> 3.1'
+gem 'capistrano', '~> 3.8'
 gem 'capistrano-composer', '~> 0.0.6'
-gem 'capistrano-cachetool', '~> 1.0.0'
+gem 'capistrano-cachetool', '~> 1.0'
 
 group :development do
     gem 'rake', '~> 12.0'
     gem 'rspec', '~> 3.0'
 end
-

data/README.md

@@ -49,22 +49,21 @@ Configuration options:
 1. Create a Capfile with the content below:
 
 ```
-# Load DSL and set up stages
-require "capistrano/setup"
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/stages'
 
-# Include default deployment tasks
-require "capistrano/deploy"
-
-require "capistrano/scm/git"
+require 'capistrano/setup'
+require 'capistrano/deploy'
+require 'capistrano/scm/git'
 install_plugin Capistrano::SCM::Git
+require 'capistrano/forkcms'
 
-require "capistrano/forkcms"
+set :format_options, log_file: 'app/logs/capistrano.log'
 
-# Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
+Dir.glob('app/config/capistrano/tasks/*.rake').each { |r| import r }
 ```
 
-2. Create a file called `config/deploy.rb`, with the content below:
+2. Create a file called `app/config/capistrano/deploy.rb`, with the content below:
 
 ```
 set :application, "$your-application-name"
@@ -73,16 +72,34 @@ set :repo_url, "$your-repo-url"
 set :keep_releases, 3
 ```
 
-3. Create a file called `config/deploy/production.rb`, with the content below:
+3. Create a file called `app/config/capistrano/stages/production.rb`, with the content below:
 
 ```
-... @todo, fix this
+server "$your-server-hostname", user: "$your-user", roles: %w{app db web}
+
+set :deploy_to, "$your-path-where-everything-should-be-deployed" # eg: /home/johndoe/apps/website
+set :document_root, "$your-document-root" # eg: /var/www
+
+set :opcache_reset_strategy, "fcgi"
+set :opcache_reset_fcgi_connection_string, "$your-php-fpm-socket-or-connection-string" # eg: /var/run/php_71_fpm_sites.sock
+
+# or if you are not using FCGI/FPM
+#set :opcache_reset_strategy, "file"
+#set :opcache_reset_base_url, "$your-public-url" # eg: "http://www.fork-cms.com"
+
+### DO NOT EDIT BELOW ###
+set :branch, "master"
+set :keep_releases, 3
+set :php_bin, "php"
+
+SSHKit.config.command_map[:composer] = "#{fetch :php_bin} #{shared_path.join("composer.phar")}"
+SSHKit.config.command_map[:php] = fetch(:php_bin)
 ```
 
-4. Create a file called `config/deploy/staging.rb`, with the content below:
+4. Create a file called `app/config/capistrano/stages/staging.rb`, with the content below:
 
 ```
-server "$your-server-hostname", user: "sites", roles: %w{app db web}
+server "$your-server-hostname", user: "$your-user", roles: %w{app db web}
 set :deploy_to, "$your-path-where-everything-should-be-deployed" # eg: /home/johndoe/apps/website
 set :document_root, "$your-document-root" # eg: /var/www
 
@@ -93,9 +110,9 @@ set :opcache_reset_fcgi_connection_string, "$your-php-fpm-socket-or-connection-s
 #set :opcache_reset_strategy, "file"
 #set :opcache_reset_base_url, "$your-public-url" # eg: "http://www.fork-cms.com"
 
+set :branch, "staging"
 ```
 
-
 ## Contributing
 
 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
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:test) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => :test

data/capistrano-forkcms.gemspec

@@ -4,26 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capistrano/forkcms/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "capistrano-forkcms"
+  spec.name          = 'capistrano-forkcms'
   spec.version       = Capistrano::Forkcms::VERSION
-  spec.authors       = ["Tijs Verkoyen"]
-  spec.email         = ["capistrano-forcms@verkoyen.eu"]
+  spec.authors       = ['Tijs Verkoyen']
+  spec.email         = ['capistrano-forcms@verkoyen.eu']
 
   spec.summary       = %q{Fork CMS specific Capistrano tasks}
   spec.description   = %q{Capistrano ForkCMS - Easy deployment of ForkCMS 5+ apps with Ruby over SSH}
-  spec.homepage      = "https://github.com/tijsverkoyen/capistrano-forkcms"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/tijsverkoyen/capistrano-forkcms'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_dependency "capistrano", "~> 3.1"
-  spec.add_dependency "capistrano-composer", "~> 0.0.6"
-  spec.add_dependency "capistrano-cachetool", "~> 1.0.0"
+  spec.add_dependency 'capistrano', '~> 3.8'
+  spec.add_dependency 'capistrano-composer', '~> 0.0.6'
+  spec.add_dependency 'capistrano-cachetool', '~> 1.0'
 end

data/lib/capistrano/forkcms/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Forkcms
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
   end
 end

data/lib/capistrano/tasks/configure.rake

@@ -32,7 +32,7 @@ namespace :forkcms do
         if test("[ -L #{fetch :document_root} ]") && capture("readlink -- #{fetch :document_root}") == "#{current_path}/"
           # all is well, the symlink is correct
         elsif test("[ -d #{fetch :document_root} ]") || test("[ -f #{fetch :document_root} ]")
-          error 'Document root #{fetch :document_root} already exists.'
+          error "Document root #{fetch :document_root} already exists."
           error 'To link it, issue the following command:'
           error "ln -sf #{current_path}/ #{fetch :document_root}"
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-forkcms
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Tijs Verkoyen
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: capistrano-composer
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: Capistrano ForkCMS - Easy deployment of ForkCMS 5+ apps with Ruby over
   SSH
 email: