capistrano-forkcms 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0adbc416fef6b18cf432dfa74924a7e36711eb52
-  data.tar.gz: 724dba6b24dfa9d04dd29bf665559103966881b3
+  metadata.gz: c7d10d03ae8938d1dd1a20ebd66c571fccfa1243
+  data.tar.gz: abcce021846282cf0488c407b1dd091e9cca9e21
 SHA512:
-  metadata.gz: 294dc28ba5f80776698813de6918fca12d6ac2d84e6bafe7576c486909a8667c14cc89856dc1386e42ea7a33b3344d518f4595ffe7af200437085c5fd5d49b21
-  data.tar.gz: 43c71454a43298214d5b04effcd07ac4e30d0a9aa0617cc2c2374ee2306f69a1a501540c993471b68b2285a99608d50a59c268793dc5ee137b07da1111e2d130
+  metadata.gz: e0e3f61c2e8ab875930efc25ceeecd25ce30a1a3bd1b6a13076ebca4eb4d159507b3941de72ef7278478030f150a4c50d690a8572834e08cdfee036d7fc43d20
+  data.tar.gz: 23ee1c1b6f7cd2bb43f3095d08f171d0afee184f58d089f6e195a392c6c45f684a76e13c13e2cf85f4bbec0adacdd8a522ea8c2664f7aae01258baf997367610

data/.gitignore

@@ -7,4 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.gem
+
+# rspec failure tracking
+.rspec_status

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.13.7
+  - 2.4.1
+before_install: gem install bundler -v 1.14.6

data/Gemfile

@@ -1,8 +1,13 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-forkcms.gemspec
-gemspec
-
 gem 'capistrano', '~> 3.1'
 gem 'capistrano-composer', '~> 0.0.6'
 gem 'capistrano-cachetool', '~> 1.0.0'
+
+group :development do
+    gem 'rake', '~> 12.0'
+    gem 'rspec', '~> 3.0'
+end
+

data/{LICENSE.txt → LICENSE.md}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tijs Verkoyen
+Copyright (c) Tijs Verkoyen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

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

data/capistrano-forkcms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 

data/lib/capistrano/forkcms.rb

@@ -1,13 +1,14 @@
-require "capistrano/composer"
-require "capistrano/cachetool"
+require 'rake'
+require 'capistrano/composer'
+require 'capistrano/cachetool'
 
 namespace :load do
   task :defaults do
     set :php_bin_path, -> {
       php_bin_path = fetch(:php_bin_custom_path)
-      php_bin_path ||= "php"
+      php_bin_path ||= 'php'
     }
 
-    load "capistrano/forkcms/defaults.rb"
+    load 'capistrano/forkcms/defaults.rb'
   end
 end

data/lib/capistrano/forkcms/defaults.rb

@@ -1,27 +1,26 @@
 # Set some Capistrano defaults
 set :linked_files, []
-set :linked_files, -> { ["app/config/parameters.yml"] }
+set :linked_files,  %w(app/config/parameters.yml)
 set :linked_dirs, []
-set :linked_dirs, -> { ["app/logs", "app/sessions", "src/Frontend/Files"] }
-
+set :linked_dirs, %w(app/logs app/sessions src/Frontend/Files)
 
 # Run required tasks after the stage
 Capistrano::DSL.stages.each do |stage|
-  after stage, "forkcms:configure:composer"
-  after stage, "forkcms:configure:cachetool"
+  after stage, 'forkcms:configure:composer'
+  after stage, 'forkcms:configure:cachetool'
 end
 
 
 # Make sure the composer executable is installed
 namespace :deploy do
-  after :starting, "composer:install_executable"
-  after :starting, "cachetool:install_executable"
-  after :publishing, "forkcms:symlink:document_root"
-  after :publishing, "forkcms:opcache:reset"
+  after :starting, 'composer:install_executable'
+  after :starting, 'cachetool:install_executable'
+  after :publishing, 'forkcms:symlink:document_root'
+  after :publishing, 'forkcms:opcache:reset'
 end
 
 
 # Load the tasks
-load File.expand_path("../../tasks/configure.rake", __FILE__)
-load File.expand_path("../../tasks/opcache.rake", __FILE__)
-load File.expand_path("../../tasks/symlink.rake", __FILE__)
+load File.expand_path('../../tasks/configure.rake', __FILE__)
+load File.expand_path('../../tasks/opcache.rake', __FILE__)
+load File.expand_path('../../tasks/symlink.rake', __FILE__)

data/lib/capistrano/forkcms/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Forkcms
-    VERSION = "2.0.0"
+    VERSION = '2.0.1'
   end
 end

data/lib/capistrano/tasks/configure.rake

@@ -32,12 +32,12 @@ 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 "To link it, issue the following command:"
+          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
-          execute :mkdir, "-p", File.dirname(fetch(:document_root))
-          execute :ln, "-sf", "#{current_path}/", fetch(:document_root)
+          execute :mkdir, '-p', File.dirname(fetch(:document_root))
+          execute :ln, '-sf', "#{current_path}/", fetch(:document_root)
         end
       end
     end

data/lib/capistrano/tasks/opcache.rake

@@ -4,37 +4,39 @@ namespace :forkcms do
       Reset the opcache
     DESC
     task :reset do
-      if fetch(:opcache_reset_strategy) === "file"
-        invoke "forkcms:opcache:reset_with_file"
-      elsif fetch(:opcache_reset_strategy) === "fcgi"
-        invoke "forkcms:opcache:reset_with_fcgi"
+      if fetch(:opcache_reset_strategy) === 'file'
+        invoke 'forkcms:opcache:reset_with_file'
+      elsif fetch(:opcache_reset_strategy) === 'fcgi'
+        invoke 'forkcms:opcache:reset_with_fcgi'
+      elseif fetch(:opcache_reset_strategy) === 'none'
+        # do nothing
       else
-        raise "Invalid value for :opcache_reset_strategy, possible values are: file, fcgi."
+        raise 'Invalid value for :opcache_reset_strategy, possible values are: file, fcgi, none.'
       end
     end
 
     task :reset_with_file do
       # make sure that we have all needed variables
-      raise "opcache_reset_base_url not set" unless fetch(:opcache_reset_base_url)
+      raise 'opcache_reset_base_url not set' unless fetch(:opcache_reset_base_url)
 
       on roles(:web) do
         stream = StringIO.new("<?php clearstatcache(true); if (function_exists('opcache_reset')) { opcache_reset(); }")
         upload! stream, "#{current_path}/php-opcache-reset.php"
-        execute :curl, "-L --fail --silent --show-error", "#{fetch :opcache_reset_base_url}/php-opcache-reset.php"
+        execute :curl, '-L --fail --silent --show-error', "#{fetch :opcache_reset_base_url}/php-opcache-reset.php"
         execute :rm, "#{current_path}/php-opcache-reset.php"
       end
     end
 
     task :reset_with_fcgi do
       # make sure that we have all needed variables
-      raise "opcache_reset_fcgi_connection_string not set" unless fetch(:opcache_reset_fcgi_connection_string)
+      raise 'opcache_reset_fcgi_connection_string not set' unless fetch(:opcache_reset_fcgi_connection_string)
 
-      invoke "cachetool:run", "opcache:reset", "--fcgi=#{fetch :opcache_reset_fcgi_connection_string}"
+      invoke 'cachetool:run', 'opcache:reset', "--fcgi=#{fetch :opcache_reset_fcgi_connection_string}"
 
       # reenable our command, see https://github.com/capistrano/capistrano/issues/1686 for more information
-      Rake::Task["cachetool:run"].reenable
+      Rake::Task['cachetool:run'].reenable
 
-      invoke "cachetool:run", "stat:clear", "--fcgi=#{fetch :opcache_reset_fcgi_connection_string}"
+      invoke 'cachetool:run', 'stat:clear', "--fcgi=#{fetch :opcache_reset_fcgi_connection_string}"
     end
   end
 end

data/lib/capistrano/tasks/symlink.rake

@@ -9,12 +9,12 @@ 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 "To link it, issue the following command:"
+          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
-          execute :mkdir, "-p", File.dirname(fetch(:document_root))
-          execute :ln, "-sf", "#{current_path}/", fetch(:document_root)
+          execute :mkdir, '-p', File.dirname(fetch(:document_root))
+          execute :ln, '-sf', "#{current_path}/", fetch(:document_root)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-forkcms
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Tijs Verkoyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - capistrano-forkcms.gemspec