capistrano-alchemy 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 684d80312257f263f4c49c0555a294d42bd65a0d
-  data.tar.gz: 4e0b941e723102baf911eeefd1ba18dd5744e9c2
+SHA256:
+  metadata.gz: b73822a4e394141f9c35c6296e9bbb7f86030fda9cc78765c5aa23c70abcd275
+  data.tar.gz: e4422807f16f7915717d7c0d9037d543ac5a879feb30658f7af3f3bff371e297
 SHA512:
-  metadata.gz: e800e509de2c5d1c3ef634d0146339bb9e32e2651ff6ae774117783ef3abd157b540d67b348c3a4a9f25b8bc36eea17c3288ea96e7a90057ebf8254bde29baa3
-  data.tar.gz: 51ea67118c423567d57db00a16192775ec7445c44c8d9dc8bfd7b8ac7ceac295b1700586f8d17152f46ee7e8290cdc5d7661ac50eec3c15277d6f7c4bbde7f79
+  metadata.gz: b35211b07a8189a0c7142893e52e7f452ac0249613b0b00ec8af0dd3d95dc3e4658f4d8e23d54a86e08cbf8437abf3d1822b3b5a497cfcd0e3d5c0fa5418a23c
+  data.tar.gz: 5fb58e7895293a10575830e85b43b1aa1844d12e1eb2820f9739e4c8b923858ee6a3c68b7acf0f2fc2dd0e7b1935a805bb28cc6d0559fd41b8dd4619dae72c41

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/capistrano-alchemy.gemspec

@@ -18,8 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "capistrano-rails", "~> 1.1"
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'alchemy_cms', "~> 3.0"
+  spec.add_dependency "capistrano-db-tasks", "~> 0.6"
 end

data/lib/capistrano/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Alchemy
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/lib/capistrano/alchemy.rb

@@ -1,11 +1,7 @@
 require "capistrano/alchemy/version"
 
 require 'fileutils'
-require 'alchemy/tasks/helpers'
-require 'capistrano/alchemy/deploy_support'
-
-include Alchemy::Tasks::Helpers
-include Capistrano::Alchemy::DeploySupport
+require 'capistrano-db-tasks'
 
 load File.expand_path('../tasks/alchemy.rake', __FILE__)
 load File.expand_path('../tasks/alchemy_capistrano_hooks.rake', __FILE__)

data/lib/capistrano/tasks/alchemy.rake

@@ -2,100 +2,72 @@ namespace :alchemy do
 
   # Prepare Alchemy for deployment
   task :default_paths do
-    set :linked_dirs, fetch(:linked_dirs, []) + %w(uploads)
+    set :linked_dirs, fetch(:linked_dirs, []) + %w(uploads public/pictures)
   end
 
   namespace :db do
     desc "Dumps the database into 'db/dumps' on the server."
     task dump: ['alchemy:default_paths', 'deploy:check'] do
+
       on roles :db do
-        within release_path do
-          timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
-          execute :mkdir, '-p', 'db/dumps'
-          with dump_filename: "db/dumps/#{timestamp}.sql", rails_env: fetch(:rails_env, 'production') do
-            execute :rake, 'alchemy:db:dump'
-          end
-        end
+        Database::Remote.new(self).dump
       end
     end
   end
 
   namespace :import do
     desc "Imports all data (Pictures, attachments and the database) into your local development machine."
-    task all: ['alchemy:default_paths', 'deploy:check'] do
-      on roles [:app, :db] do
-        invoke('alchemy:import:pictures')
-        puts "\n"
-        invoke('alchemy:import:attachments')
-        puts "\n"
-        invoke('alchemy:import:database')
-      end
-    end
+    task all: [
+      'alchemy:import:attachments',
+      'alchemy:import:pictures',
+      'alchemy:import:database'
+    ]
 
     desc "Imports the server database into your local development machine."
-    task database: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :db do |server|
-        puts '## Importing database'
-        puts '   Please wait! This may take some time...'
-        system db_import_cmd(server)
-        puts '   done.'
-      end
-    end
+    task database: ['db:local:sync', 'alchemy:default_paths', 'deploy:check']
 
     desc "Imports attachments into your local machine using rsync."
     task attachments: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :app do |server|
-        get_files(:attachments, server)
+      set :assets_dir, %w(uploads/attachments)
+      set :local_assets_dir, %w(uploads)
+      on roles [:app, :db] do
+        invoke('assets:local:sync')
       end
     end
 
     desc "Imports pictures into your local machine using rsync."
     task pictures: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :app do |server|
-        get_files(:pictures, server)
+      set :assets_dir, %w(public/pictures uploads/pictures)
+      set :local_assets_dir, %w(public uploads)
+      on roles [:app, :db] do
+        invoke('assets:local:sync')
       end
     end
   end
 
   namespace :export do
     desc "Sends all data (Pictures, attachments and the database) to your remote machine."
-    task all: ['alchemy:default_paths', 'deploy:check'] do
-      invoke 'alchemy:export:pictures'
-      invoke 'alchemy:export:attachments'
-      invoke 'alchemy:export:database'
-    end
+    task all: [
+      'alchemy:export:attachments',
+      'alchemy:export:pictures',
+      'alchemy:export:database'
+    ]
 
-    desc "Imports the server database into your local development machine."
-    task database: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :db do |host|
-        within release_path do
-          if ask(:backup_confirm, 'WARNING: This task will overwrite your remote database. Do you want me to make a backup? (y/n)') == "y"
-            backup_database
-            export_database(host)
-          else
-            if ask(:overwrite_confirm, 'Are you sure? (y/n)') == "y"
-              export_database(host)
-            else
-              backup_database
-              export_database(host)
-            end
-          end
-        end
-      end
-    end
+    desc "Exports the local database into your server."
+    task database: ['db:remote:sync', 'alchemy:default_paths', 'deploy:check']
 
     desc "Sends attachments to your remote machine using rsync."
     task attachments: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :app do |host|
-        send_files :attachments, host
-      end
+      set :assets_dir, %w(uploads/attachments)
+      set :local_assets_dir, %w(uploads)
+      invoke('assets:remote:sync')
     end
 
     desc "Sends pictures to your remote machine using rsync."
     task pictures: ['alchemy:default_paths', 'deploy:check'] do
-      on roles :app do |host|
-        send_files :pictures, host
-      end
+      set :assets_dir, %w(public/pictures uploads/attachments)
+      set :local_assets_dir, %w(public uploads)
+      invoke('assets:remote:sync')
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-alchemy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
@@ -26,48 +26,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: capistrano-db-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: alchemy_cms
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
+        version: '0.6'
+description:
 email:
 - mamhoff@googlemail.com
 - thomas@vondeyen.com
@@ -76,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,7 +56,6 @@ files:
 - capistrano-alchemy.gemspec
 - lib/capistrano-alchemy.rb
 - lib/capistrano/alchemy.rb
-- lib/capistrano/alchemy/deploy_support.rb
 - lib/capistrano/alchemy/version.rb
 - lib/capistrano/tasks/alchemy.rake
 - lib/capistrano/tasks/alchemy_capistrano_hooks.rake
@@ -91,7 +63,7 @@ homepage: https://alchemy-cms.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Capistrano Tasks for AlchemyCMS.
 test_files: []

data/lib/capistrano/alchemy/deploy_support.rb

@@ -1,59 +0,0 @@
-module Capistrano::Alchemy::DeploySupport
-  # Makes a backup of the remote database and stores it in db/ folder
-  def backup_database
-    puts 'Backing up database'
-    timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
-    rake "RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump DUMP_FILENAME=db/dump-#{timestamp}.sql"
-  end
-
-  # Sends the database via ssh to the server
-  def export_database(server)
-    puts "Exporting the database. Please wait..."
-    system db_export_cmd(server)
-  end
-
-  def db_import_cmd(server)
-    raise "No server given" if !server
-    env = "RAILS_ENV=#{fetch(:rails_env, 'production')}"
-    dump_cmd = "cd #{release_path} && #{rake_cmd} alchemy:db:dump #{env}"
-    sql_stream = "#{ssh_command(server)} '#{dump_cmd}'"
-    "#{sql_stream} | #{database_import_command(database_config['adapter'])} 1>/dev/null 2>&1"
-  end
-
-  # The actual export command that sends the data
-  def db_export_cmd(server)
-    raise "No server given" if !server
-    env = "RAILS_ENV=#{fetch(:rails_env, 'production')}"
-    import_cmd = "cd #{release_path} && #{rake_cmd} alchemy:db:import #{env}"
-    ssh_cmd = "#{ssh_command(server)} '#{import_cmd}'"
-    "#{database_dump_command(database_config['adapter'])} | #{ssh_cmd}"
-  end
-
-  # Sends files of given type via rsync to server
-  def send_files(type, server)
-    raise "No server given" if !server
-    FileUtils.mkdir_p "./uploads/#{type}"
-    system "rsync --progress -rue 'ssh -p #{ssh_port(server)}' uploads/#{type} #{server.user}@#{server.hostname}:#{shared_path}/uploads/"
-  end
-
-  def get_files(type, server)
-    raise "No server given" if !server
-    FileUtils.mkdir_p "./uploads"
-    puts "Importing #{type}. Please wait..."
-    system "rsync --progress -rue 'ssh -p #{ssh_port(server)}' #{server.user}@#{server.hostname}:#{shared_path}/uploads/#{type} ./uploads/"
-  end
-
-  private
-
-  def ssh_command(server)
-    "ssh -C -p #{ssh_port(server)} #{server.user}@#{server.hostname}"
-  end
-
-  def ssh_port(server)
-    server.port || 22
-  end
-
-  def rake_cmd
-    SSHKit.config.command_map[:rake]
-  end
-end