capistrano-lameco 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b0c15d1c63d5eb1dc8b382c0fc635f09ae0c3c484a076bc5ea6d2715ed7795
-  data.tar.gz: b9918450b3726f2d156d9ae8061195b3f2a958e7eb2ed830fff44c2e064f9989
+  metadata.gz: cda50b115b9871f3a3c9ad23040c403cfa1787f37e424cccc45a3ace69ab2402
+  data.tar.gz: a7cac3ba8a16f1d1643038b602b0126a1a0423e73982010cc1d81bb15da46d3a
 SHA512:
-  metadata.gz: 7e0b53aab8dc9fd1d9f43d6f88ade5e48231529b07c423d8c1b1fcd6805dcfa0576c179ed29d407ae5cf55a008f105d1d74902bc51cddb4a88e97076cf91cec8
-  data.tar.gz: d707902b216637fdf16a1c4b33ca2eb0a522019f3c770473f42e3ef26624bb9f86da8ce708a69eff02b15179dd6441bb0686af2e0664676867ed7aab6a269128
+  metadata.gz: df788af765ae94589b30fa09ab86ad59146ce389f2567b01e1fb11be96bbf1bf74935b8d7b7c65226262584743348d343b97b7b313cffbd0433c1febab5aa84d
+  data.tar.gz: da7a304d80f862ed5db4e16e1a5e6224dd1e15d010cb9c3a7b087096d49c8b72d956440b7f5e1e66c3e3f4c3edc9e63ebc3c0803f09ac93d215008494cf39d6e

data/capistrano-lameco.gemspec

@@ -3,11 +3,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-lameco"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.3"
   spec.authors       = ["Laméco Development B.V."]
   spec.email         = ["development@lameco.nl"]
-  spec.summary       = %q{Common Laméco helpers for Capistrano}
-  spec.homepage      = "https://www.lameco.nl"
+  spec.summary       = %q{Laméco helper tasks for Capistrano}
+  spec.homepage      = "https://bitbucket.org/Lameco/capistrano-lameco/src/main/"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

data/lib/capistrano/lameco/defaults.rb

@@ -1,16 +1,25 @@
 # Project Type
 project_type = if File.exist?('bin/console') && File.exist?('src/Kernel.php')
-   'symfony'
+    'symfony'
 elsif File.exist?('craft')
     'craftcms'
 elsif File.exist?('artisan')
-   'laravel'
+    'laravel'
 else
     fail "Unknown project type"
 end
 set :lameco_project_type, project_type
 puts "Project type: #{fetch(:lameco_project_type)}"
 
+# Project DDEV
+project_ddev = if File.exist?('.ddev/config.yaml')
+  true
+else
+  false
+end
+set :lameco_project_ddev, project_ddev
+puts "Project DDEV: #{fetch(:lameco_project_ddev)}"
+
 # Database dump directory
 dump_dir = case project_type
            when 'symfony' then 'var'

data/lib/capistrano/tasks/lameco.rake

@@ -1,9 +1,6 @@
 namespace :lameco do
   task :db_download_current do
     on roles(:app) do
-      # TODO: Make sure keep_database is read from the command line
-      puts "Keep database: #{fetch(:keep_database)}"
-
       remote_env_content = capture("cat #{fetch(:deploy_to)}/shared/.env")
       remote_env = fetch_env(remote_env_content)
       remote_database_user, remote_database_password, remote_database_name = extract_db_credentials(remote_env)
@@ -19,25 +16,27 @@ namespace :lameco do
       end
     end
     run_locally do
-      local_env_content = capture("cat .env")
-      local_env = fetch_env(local_env_content)
-      local_database_user, local_database_password, local_database_name = extract_db_credentials(local_env)
-
-      if local_database_user && local_database_password && local_database_name
-        execute "gunzip -c #{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)} | mysql -u #{local_database_user} -p#{local_database_password} #{local_database_name}"
-
-        #if not fetch(:keep_database, false)
-        #  execute "rm #{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)}"
-        #end
+      if fetch(:lameco_project_ddev)
+        execute "ddev import-db --file=#{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)}"
+        execute "rm #{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)}"
       else
-        error "Local database credentials could not be extracted."
+        local_env_content = capture("cat .env")
+        local_env = fetch_env(local_env_content)
+        local_database_user, local_database_password, local_database_name = extract_db_credentials(local_env)
+
+        if local_database_user && local_database_password && local_database_name
+         execute "gunzip -c #{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)} | mysql -u #{local_database_user} -p#{local_database_password} #{local_database_name}"
+         execute "rm #{fetch(:lameco_dump_dir)}/#{fetch(:dump_file)}"
+        else
+         error "Local database credentials could not be extracted."
+        end
       end
     end
   end
 
   task :download do
     run_locally do
-        execute "rsync -azh --partial --append --progress -e 'ssh -p #{fetch(:ssh_options)[:port]}' #{fetch:lameco_user}@#{fetch(:server)}:#{fetch(:deploy_to)}/shared/#{fetch(:lameco_public_dir)}/uploads #{fetch(:lameco_public_dir)}"
+        execute "rsync -azh --partial --append --progress -e 'ssh -p #{fetch(:ssh_options)[:port]}' #{fetch(:lameco_user)}@#{fetch(:server)}:#{fetch(:deploy_to)}/shared/#{fetch(:lameco_public_dir)}/uploads #{fetch(:lameco_public_dir)}"
     end
   end
 
@@ -79,4 +78,3 @@ namespace :lameco do
     [nil, nil, nil]
   end
 end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-lameco
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Laméco Development B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -71,11 +71,11 @@ files:
 - lib/capistrano/lameco/defaults.rb
 - lib/capistrano/lameco/lameco.rb
 - lib/capistrano/tasks/lameco.rake
-homepage: https://www.lameco.nl
+homepage: https://bitbucket.org/Lameco/capistrano-lameco/src/main/
 licenses: []
 metadata:
-  homepage_uri: https://www.lameco.nl
-  source_code_uri: https://www.lameco.nl
+  homepage_uri: https://bitbucket.org/Lameco/capistrano-lameco/src/main/
+  source_code_uri: https://bitbucket.org/Lameco/capistrano-lameco/src/main/
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -94,5 +94,5 @@ requirements: []
 rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: Common Laméco helpers for Capistrano
+summary: Laméco helper tasks for Capistrano
 test_files: []