capistrano-didi 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c85a330cab148fa1bd8682b4244daf71d01eb31
-  data.tar.gz: d58dbe11263dcd85f293f0d36016ac5e3bc1c852
+  metadata.gz: 3c458ff2ea0bc3b5db38f60dba8082b9b5a1ff67
+  data.tar.gz: e3c01859f434d3a451ea52894020ee9dceee6428
 SHA512:
-  metadata.gz: eb7e23328a3633d000d2cc27fdccd23507d922fc56de3f65cb1ee1c1766797d08b3ed58eb82a1117c1f6c8cd39cf5c1cbd363361313ef71ca8eb755c38373704
-  data.tar.gz: 39ab474d9d36f8bd6b86f45efc5c25282f22f0fc31aa1ce6410e7620c198028c11c48c9ebb18cbcfe2cd3d078f4bd9b78ca583e733c807eb049194df9c105a0d
+  metadata.gz: e41247595fd602c90debe81ad7807a32a6f661b65e3c48797fe60802ac81184871bb56ae31406d92a120b6a9932c386dcbc1472cc1da47ca3f8e17d77a0c5023
+  data.tar.gz: 9294605a88946ea56aa30c74a3b01fea0fd06c3bdd8770aff8388abce6f69bfb04d321e92b594608fe33195a0e1581b266cc36ac3ae221d68a5c6619ac7b675a

data/Gemfile

@@ -1,6 +1,8 @@
 source "http://rubygems.org"
 group :development do
   gem "capistrano", "~> 3.6.1"
+  gem 'capistrano-composer', '~> 0.0.6'
+  gem 'capistrano-ssh-doctor', '~> 1.0'
   gem "shoulda", "~> 3.0"
   gem "bundler", "~> 1"
   gem "jeweler", "~> 2"

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/capistrano-didi.gemspec

@@ -9,7 +9,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "capistrano-didi"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -56,17 +56,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<capistrano>, ["~> 3.6"])
+      s.add_development_dependency(%q<capistrano-composer>, ["~> 0.0.6"])
+      s.add_development_dependency(%q<capistrano-ssh-doctor>, ["~> 1.0"])
       s.add_development_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, ["~> 2"])
     else
       s.add_dependency(%q<capistrano>, ["~> 3.6"])
+      s.add_dependency(%q<capistrano-composer>, ["~> 0.0.6"])
+      s.add_dependency(%q<capistrano-ssh-doctor>, ["~> 1.0"])
       s.add_dependency(%q<shoulda>, ["~> 3.0"])
       s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<jeweler>, ["~> 2"])
     end
   else
     s.add_dependency(%q<capistrano>, ["~> 3.6"])
+    s.add_dependency(%q<capistrano-composer>, ["~> 0.0.6"])
+    s.add_dependency(%q<capistrano-ssh-doctor>, ["~> 1.0"])
     s.add_dependency(%q<shoulda>, ["~> 3.0"])
     s.add_dependency(%q<bundler>, ["~> 1"])
     s.add_dependency(%q<jeweler>, ["~> 2"])

data/lib/capistrano/tasks/didi.rake

@@ -7,20 +7,22 @@ namespace :load do
     set :install_composer, true
     set :install_drush, true
 
-    set :drupal_path, 'docroot'
+    set :drupal_path, -> { "docroot" }
 
-    set :db_backup_path, "db_backups"
+    set :db_backup_path, -> { "db_backups" }
 
     set :linked_files, fetch(:linked_files, []).push(
-      "#{fetch(:drupal_path)}/sites/default/files/settings.php"
+      "#{fetch(:drupal_path)}/sites/default/settings.php",
+      "#{fetch(:drupal_path)}/sites/default/default.services.yml"
     )
+
     set :linked_dirs, fetch(:linked_dirs, []).push(
       "#{fetch(:drupal_path)}/sites/default/files"
     )
 
-    if fetch(:install_drush)
-      set :drush, "#{shared_path}/vendor/bin/drush"
-    end
+    # if fetch(:install_drush)
+    #   set :drush, -> { "#{shared_path.join("vendor/bin/drush") }" }
+    # end
   end
 end
 
@@ -57,6 +59,10 @@ end
 
 # Specific Drupal tasks
 namespace :drupal do
+  desc 'Test task'
+  task :flip do
+    puts "test drupal task"
+  end
 
   desc 'Run any drush command'
   task :drush do
@@ -111,7 +117,7 @@ namespace :drupal do
     task :import do
       on roles(:app) do
         within release_path.join(fetch(:drupal_path)) do
-          execute :drush, 'config-import'
+          execute :drush, 'config-import -y'
         end
       end
     end
@@ -131,7 +137,7 @@ namespace :drupal do
     task :updatedb do
       on roles(:app) do
         within release_path.join(fetch(:drupal_path)) do
-          execute :drush, 'updatedb'
+          execute :drush, 'updatedb -y'
         end
       end
     end
@@ -194,7 +200,7 @@ namespace :drush do
   task :install do
     on roles(:app) do
       within shared_path do
-        execute :composer, 'require drush/drush:~8'
+        execute :composer, "require drush/drush:~8"
       end
     end
   end
@@ -205,6 +211,4 @@ after "deploy:finished", "deploy:drupal"
 
 #before "deploy:starting", "drupal:site:backup_db"
 #after "drupal:site:enable", "drupal:cache:clear"
-#after "drupal:site:disable", "drupal:cache:clear"
-
-
+#after "drupal:site:disable", "drupal:cache:clear"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-didi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ausy Belgium
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: capistrano-composer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: capistrano-ssh-doctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement