mina 1.2.3 → 1.2.5

data/tasks/mina/rails.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'mina/deploy'
 require 'mina/bundler'
 
 set :rails_env, 'production'
-set :bundle_prefix, -> { %{RAILS_ENV="#{fetch(:rails_env)}" #{fetch(:bundle_bin)} exec} }
+set :bundle_prefix, -> { %(RAILS_ENV="#{fetch(:rails_env)}" #{fetch(:bundle_bin)} exec) }
 set :rake, -> { "#{fetch(:bundle_prefix)} rake" }
 set :rails, -> { "#{fetch(:bundle_prefix)} rails" }
 set :compiled_asset_path, 'public/assets'
@@ -14,8 +16,8 @@ set :shared_dirs, fetch(:shared_dirs, []).push('log', 'tmp/cache', fetch(:compil
 desc 'Starts an interactive console.'
 task :console do
   set :execution_mode, :exec
-  in_path "#{fetch(:current_path)}" do
-    command %{#{fetch(:rails)} console}
+  in_path fetch(:current_path) do
+    command %(#{fetch(:rails)} console)
   end
 end
 
@@ -23,7 +25,7 @@ desc 'Tail log from server'
 task :log do
   set :execution_mode, :exec
   in_path "#{fetch(:shared_path)}/log" do
-    command %{tail -f #{fetch(:rails_env)}.log}
+    command %(tail -f #{fetch(:rails_env)}.log)
   end
 end
 
@@ -32,72 +34,72 @@ namespace :rails do
   task :db_migrate do
     ensure!(:deploy_block, message: "Can't be run outside deploy do block. Please use mina 'rake[db_migrate]' instead")
     if fetch(:force_migrate)
-      comment %{Migrating database}
-      command %{#{fetch(:rake)} db:migrate}
+      comment %(Migrating database)
+      command %(#{fetch(:rake)} db:migrate)
     else
       command check_for_changes_script(
         at: fetch(:migration_dirs),
-        skip: %{echo "-----> DB migrations unchanged; skipping DB migration"},
-        changed: %{echo "-----> Migrating database"
-          #{echo_cmd("#{fetch(:rake)} db:migrate")}}
+        skip: %(echo "-----> DB migrations unchanged; skipping DB migration"),
+        changed: %(echo "-----> Migrating database"
+          #{echo_cmd("#{fetch(:rake)} db:migrate")})
       ), quiet: true
     end
   end
 
   desc 'Create database'
   task :db_create do
-    comment %{Creating database}
-    command %{#{fetch(:rake)} db:create}
+    comment %(Creating database)
+    command %(#{fetch(:rake)} db:create)
   end
 
   desc 'Rollback database'
   task :db_rollback do
-    comment %{Rollbacking database}
-    command %{#{fetch(:rake)} db:rollback}
+    comment %(Rollbacking database)
+    command %(#{fetch(:rake)} db:rollback)
   end
 
   desc 'Precompiles assets (skips if nothing has changed since the last release).'
   task :assets_precompile do
     ensure!(:deploy_block, message: "Can't be run outside deploy do block. Please use mina 'rake[assets_precompile]' instead")
     if fetch(:force_asset_precompile)
-      comment %{Precompiling asset files}
-      command %{#{fetch(:rake)} assets:precompile}
+      comment %(Precompiling asset files)
+      command %(#{fetch(:rake)} assets:precompile)
     else
       command check_for_changes_script(
         at: fetch(:asset_dirs),
-        skip: %{echo "-----> Skipping asset precompilation"},
-        changed: %{echo "-----> Precompiling asset files"
-          #{echo_cmd "#{fetch(:rake)} assets:precompile"}}
+        skip: %(echo "-----> Skipping asset precompilation"),
+        changed: %(echo "-----> Precompiling asset files"
+          #{echo_cmd "#{fetch(:rake)} assets:precompile"})
       ), quiet: true
     end
   end
 
   desc 'Clear older assets'
   task :assets_clean do
-    comment %{Removing older assets}
-    command %{#{fetch(:rake)} assets:clean}
+    comment %(Removing older assets)
+    command %(#{fetch(:rake)} assets:clean)
   end
 
   desc 'DB schema load'
   task :db_schema_load do
-    comment %{DB schema load}
-    command %{#{fetch(:rake)} db:schema:load}
+    comment %(DB schema load)
+    command %(#{fetch(:rake)} db:schema:load)
   end
 end
 
 def check_for_changes_script(options)
   diffs = options[:at].map do |path|
-    %{diff -qrN "#{fetch(:current_path)}/#{path}" "./#{path}" 2>/dev/null}
+    %(diff -qrN "#{fetch(:current_path)}/#{path}" "./#{path}" 2>/dev/null)
   end.join(' && ')
 
-  %{
+  %(
     if #{diffs}
     then
       #{options[:skip]}
     else
       #{options[:changed]}
     fi
-  }
+  )
 end
 
 # Macro used later by :rails, :rake, etc
@@ -107,10 +109,10 @@ make_run_task = lambda { |name, example|
 
     arguments = args[:arguments]
     unless arguments
-      puts %{You need to provide arguments. Try: mina "#{name}[#{example}]"}
+      puts %(You need to provide arguments. Try: mina "#{name}[#{example}]")
       exit 1
     end
-    in_path "#{fetch(:current_path)}" do
+    in_path fetch(:current_path) do
       command %(#{fetch(name)} #{arguments})
     end
   end

data/tasks/mina/rbenv.rb

@@ -1,15 +1,17 @@
-set :rbenv_path, "$HOME/.rbenv"
+# frozen_string_literal: true
+
+set :rbenv_path, '$HOME/.rbenv'
 
 task :'rbenv:load' do
-  comment %{Loading rbenv}
-  command %{export RBENV_ROOT="#{fetch(:rbenv_path)}"}
-  command %{export PATH="#{fetch(:rbenv_path)}/bin:$PATH"}
-  command %{
+  comment %(Loading rbenv)
+  command %(export RBENV_ROOT="#{fetch(:rbenv_path)}")
+  command %(export PATH="#{fetch(:rbenv_path)}/bin:$PATH")
+  command %(
     if ! which rbenv >/dev/null; then
       echo "! rbenv not found"
       echo "! If rbenv is installed, check your :rbenv_path setting."
       exit 1
     fi
-  }
+  )
   command %{eval "$(rbenv init -)"}
 end

data/tasks/mina/rvm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :rvm_use_path, '$HOME/.rvm/scripts/rvm'
 
 task :'rvm:use', :env do |_, args|
@@ -7,33 +9,33 @@ task :'rvm:use', :env do |_, args|
     exit 1
   end
 
-  comment %{Using RVM environment \\\"#{args[:env]}\\\"}
-  command %{
+  comment %(Using RVM environment \\\"#{args[:env]}\\\")
+  command %(
     if [[ ! -s "#{fetch(:rvm_use_path)}" ]]; then
       echo "! Ruby Version Manager not found"
       echo "! If RVM is installed, check your :rvm_use_path setting."
       exit 1
     fi
-  }
-  command %{source #{fetch(:rvm_use_path)}}
-  command %{rvm use "#{args[:env]}" --create}
+  )
+  command %(source #{fetch(:rvm_use_path)})
+  command %(rvm use "#{args[:env]}" --create)
 end
 
 task :'rvm:wrapper', :env, :name, :bin do |_, args|
   unless args[:env] && args[:name] && args[:bin]
-    puts "Task 'rvm:wrapper' needs an RVM environment name, an wrapper name and the binary name as arguments"
+    puts "Task 'rvm:wrapper' needs an RVM environment name, a wrapper name and the binary name as arguments"
     puts "Example: invoke :'rvm:wrapper', 'ruby-1.9.2@myapp,myapp,unicorn_rails'"
     exit 1
   end
 
-  comment %{creating RVM wrapper "#{args[:name]}_#{args[:bin]}" using \\"#{args[:env]}\\"}
-  command %{
+  comment %(creating RVM wrapper "#{args[:name]}_#{args[:bin]}" using \\"#{args[:env]}\\")
+  command %(
     if [[ ! -s "#{fetch(:rvm_use_path)}" ]]; then
       echo "! Ruby Version Manager not found"
       echo "! If RVM is installed, check your :rvm_use_path setting."
       exit 1
     fi
-  }
-  command %{source #{fetch(:rvm_use_path)}}
-  command %{rvm wrapper #{args[:env]} #{args[:name]} #{args[:bin]} || exit 1}
+  )
+  command %(source #{fetch(:rvm_use_path)})
+  command %(rvm wrapper #{args[:env]} #{args[:name]} #{args[:bin]} || exit 1)
 end

data/tasks/mina/ry.rb

@@ -1,26 +1,26 @@
+# frozen_string_literal: true
+
 set :ry_path, '$HOME/.local'
 
 task :ry, :env do |_, args|
-  unless args[:env]
-    puts "Task 'ry' without argument will use default Ruby version."
-  end
+  puts "Task 'ry' without argument will use default Ruby version." unless args[:env]
 
-  comment %{ry to version: \\"#{args[:env] || '**not specified**'}\\"}
-  comment %{Loading ry}
+  comment %(ry to version: \\"#{args[:env] || '**not specified**'}\\")
+  comment %(Loading ry)
 
-  command %{
+  command %(
     if [[ ! -e "#{fetch(:ry_path)}/bin" ]]; then
       echo "! ry not found"
       echo "! If ry is installed, check your :ry_path setting."
       exit 1
     fi
-  }
-  command %{export PATH="#{fetch(:ry_path)}/bin:$PATH"}
+  )
+  command %(export PATH="#{fetch(:ry_path)}/bin:$PATH")
   command %{eval "$(ry setup)"}
-  command %{RY_RUBY="#{args[:env]}"}
-  command %{
+  command %(RY_RUBY="#{args[:env]}")
+  command %(
     if [ -n "$RY_RUBY" ]; then
       #{echo_cmd 'ry use $RY_RUBY'} || exit 1
     fi
-  }
+  )
 end

data/test_env/config/deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # # NOTE:
 # # Yes, you can deploy this project. It will deploy into the ./deploy/
 # # directory.  The commands have been stubbed, so it's harmless. No rails or
@@ -23,11 +25,10 @@ require 'mina/rvm'
 require 'mina/rbenv'
 require 'mina/chruby'
 require 'pry'
-#
 
 set :domain, 'localhost'
 set :deploy_to, "#{Dir.pwd}/deploy"
-set :repository, "#{Mina.root_path}"
+set :repository, Mina.root_path.to_s
 set :shared_paths, ['config/database.yml', 'log']
 set :keep_releases, 2
 
@@ -49,7 +50,7 @@ task :deploy do
     invoke :'deploy:cleanup'
 
     on :launch do
-      comment %{in launch}
+      comment %(in launch)
     end
   end
 end
@@ -57,17 +58,17 @@ end
 desc 'Task description'
 task :test do
   run :remote do
-    comment %{PWD}
+    comment %(PWD)
     in_path('/Users') do
-      command %{ls -al}
+      command %(ls -al)
     end
     on :after do
-      command %{pwd}
+      command %(pwd)
     end
   end
 
   run :local do
-    command %{ls -al}
+    command %(ls -al)
   end
 end
 
@@ -75,7 +76,7 @@ desc 'Fails test'
 task :fail do
   run :remote do
     run :local do
-      command "pwd"
+      command 'pwd'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Stjepan Hadjić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,35 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,12 +103,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - PRE_1_CHANGELOG.md
 - Rakefile
@@ -132,6 +120,7 @@ files:
 - data/deploy.sh.erb
 - docs/3rd_party_plugins.md
 - docs/Readme.md
+- docs/assets/images/mina.png
 - docs/cookbook.md
 - docs/default_plugins.md
 - docs/deploying.md
@@ -158,47 +147,91 @@ files:
 - lib/mina/version.rb
 - lib/mina/windows_patches.rb
 - mina.gemspec
+- spec/configs/default.rb
+- spec/configs/dsl.rb
+- spec/configs/e2e.rb
+- spec/e2e/docker-compose.yml
+- spec/e2e/e2e_run.sh
+- spec/e2e/e2e_spec.rb
+- spec/e2e/ssh
+- spec/e2e/ssh.pub
 - spec/lib/mina/application_spec.rb
 - spec/lib/mina/backend/local_spec.rb
 - spec/lib/mina/backend/remote_spec.rb
 - spec/lib/mina/commands_spec.rb
 - spec/lib/mina/configuration_spec.rb
+- spec/lib/mina/dsl_spec.rb
 - spec/lib/mina/helpers/internal_spec.rb
 - spec/lib/mina/helpers/output_spec.rb
+- spec/lib/mina/runner/exec_spec.rb
+- spec/lib/mina/runner/pretty_spec.rb
+- spec/lib/mina/runner/printer_spec.rb
+- spec/lib/mina/runner/system_spec.rb
 - spec/lib/mina/runner_spec.rb
 - spec/spec_helper.rb
 - spec/support/outputs/bundle_clean.txt
 - spec/support/outputs/bundle_install.txt
-- spec/support/outputs/chruby.txt
-- spec/support/outputs/console.txt
+- spec/support/outputs/chruby_with_env.txt
+- spec/support/outputs/chruby_without_env.txt
+- spec/support/outputs/debug_configuration_variables.txt
 - spec/support/outputs/deploy_cleanup.txt
 - spec/support/outputs/deploy_force_unlock.txt
 - spec/support/outputs/deploy_link_shared_paths.txt
+- spec/support/outputs/dsl_deploy.txt
+- spec/support/outputs/dsl_in_path.txt
+- spec/support/outputs/dsl_local_run.txt
+- spec/support/outputs/dsl_on.txt
+- spec/support/outputs/dsl_remote_run.txt
+- spec/support/outputs/dsl_reset.txt
+- spec/support/outputs/e2e_deploy_after_setup.txt
+- spec/support/outputs/e2e_deploy_without_setup.txt
+- spec/support/outputs/e2e_setup.txt
+- spec/support/outputs/environment.txt
 - spec/support/outputs/git_clone.txt
 - spec/support/outputs/git_clone_commit.txt
+- spec/support/outputs/git_ensure_pushed.txt
 - spec/support/outputs/git_revision.txt
-- spec/support/outputs/log.txt
 - spec/support/outputs/rails_assets_clean.txt
 - spec/support/outputs/rails_assets_precompile.txt
+- spec/support/outputs/rails_assets_precompile_force_precompile.txt
+- spec/support/outputs/rails_assets_precompile_outside_deploy_block.txt
+- spec/support/outputs/rails_assets_precompile_with_diff.txt
+- spec/support/outputs/rails_console.txt
 - spec/support/outputs/rails_db_create.txt
-- spec/support/outputs/rails_db_migrate.txt
+- spec/support/outputs/rails_db_migrate_force_migrate.txt
+- spec/support/outputs/rails_db_migrate_outside_deploy_block.txt
+- spec/support/outputs/rails_db_migrate_with_diff.txt
 - spec/support/outputs/rails_db_rollback.txt
 - spec/support/outputs/rails_db_schema_load.txt
+- spec/support/outputs/rails_log.txt
+- spec/support/outputs/rails_with_arguments.txt
+- spec/support/outputs/rails_without_arguments.txt
+- spec/support/outputs/rake_with_arguments.txt
+- spec/support/outputs/rake_without_arguments.txt
 - spec/support/outputs/rbenv_load.txt
 - spec/support/outputs/rollback.txt
 - spec/support/outputs/run.txt
-- spec/support/outputs/rvm_use.txt
-- spec/support/outputs/ry.txt
+- spec/support/outputs/rvm_use_with_env.txt
+- spec/support/outputs/rvm_use_without_env.txt
+- spec/support/outputs/rvm_wrapper_with_arguments.txt
+- spec/support/outputs/rvm_wrapper_without_arguments.txt
+- spec/support/outputs/ry_with_env.txt
+- spec/support/outputs/ry_without_env.txt
 - spec/support/outputs/setup.txt
+- spec/support/outputs/ssh.txt
+- spec/support/outputs/ssh_keyscan_domain.txt
 - spec/support/outputs/ssh_keyscan_repo.txt
 - spec/support/rake_example_group.rb
 - spec/tasks/bundler_spec.rb
+- spec/tasks/chruby_spec.rb
 - spec/tasks/default_spec.rb
 - spec/tasks/deploy_spec.rb
 - spec/tasks/git_spec.rb
 - spec/tasks/init_spec.rb
 - spec/tasks/rails_spec.rb
-- spec/tasks/ruby_managers_spec.rb
+- spec/tasks/rbenv_spec.rb
+- spec/tasks/rvm_spec.rb
+- spec/tasks/ry_spec.rb
 - tasks/mina/bundler.rb
 - tasks/mina/chruby.rb
 - tasks/mina/default.rb
@@ -214,7 +247,7 @@ homepage: https://github.com/mina-deploy/mina
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,9 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Blazing fast application deployment tool.
 test_files: []

data/spec/support/outputs/chruby.txt

@@ -1,9 +0,0 @@
-echo "-----> chruby to version: "123""
-
-    if [[ ! -s "/etc/profile.d/chruby.sh" ]]; then
-      echo "! chruby.sh init file not found"
-      exit 1
-    fi
-
-source /etc/profile.d/chruby.sh
-chruby "123" || exit 1

data/spec/support/outputs/console.txt

@@ -1 +0,0 @@
-\(cd\ .*/deploy/current\ &&\ RAILS_ENV="production"\ bundle\ exec\ rails\ console\ &&\ cd\ -\)

data/spec/support/outputs/log.txt

@@ -1 +0,0 @@
-\(cd\ .*deploy/shared/log\ &&\ tail\ \-f\ production\.log\ &&\ cd\ -\)

data/spec/support/outputs/rails_db_migrate.txt

@@ -1 +0,0 @@
-if\ diff\ \-qrN\ ".*deploy/current/db/migrate"\ "\./db/migrate"\ 2>/dev/null\s*then\s*echo\ "\-\-\-\-\->\ DB\ migrations\ unchanged;\ skipping\ DB\ migration"\s*else\s*echo\ "\-\-\-\-\->\ Migrating\ database"\s*RAILS_ENV="production"\ bundle\ exec\ rake\ db:migrate\s*fi

data/spec/support/outputs/rvm_use.txt

@@ -1 +0,0 @@
-echo\ "\-\-\-\-\->\ Using\ RVM\ environment\ \\\"123\\\"\"\s*if\ \[\[\ !\ \-s\ "\$HOME/\.rvm/scripts/rvm"\ \]\];\ then\s*echo\ "!\ Ruby\ Version\ Manager\ not\ found"\s*echo\ "!\ If\ RVM\ is\ installed,\ check\ your\ :rvm_use_path\ setting\."\s*exit 1\s*fi\s*source\ \$HOME/\.rvm/scripts/rvm\n\s*rvm\ use\ \"123\"\ \-\-create

data/spec/support/outputs/ry.txt

@@ -1,15 +0,0 @@
-echo "-----> Loading ry"
-
-    if [[ ! -e "$HOME/.local/bin" ]]; then
-      echo "! ry not found"
-      echo "! If ry is installed, check your :ry_path setting."
-      exit 1
-    fi
-
-export PATH="$HOME/.local/bin:$PATH"
-eval "$(ry setup)"
-RY_RUBY=""
-
-    if [ -n "$RY_RUBY" ]; then
-      ry use $RY_RUBY || exit 1
-    fi

data/spec/tasks/ruby_managers_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'ruby_managers', type: :rake do
-  describe 'ry' do
-    it 'ry' do
-      expect { invoke_all }.to output(output_file('ry')).to_stdout
-    end
-  end
-
-  describe 'rbenv:load' do
-    it 'rbenv:load' do
-      expect { invoke_all }.to output(output_file('rbenv_load')).to_stdout
-    end
-  end
-
-  describe 'chruby' do
-    it 'chruby' do
-      expect { invoke_all('123') }.to output(output_file('chruby')).to_stdout
-    end
-  end
-
-  describe 'rvm:use' do
-    it 'rvm:use' do
-      expect { invoke_all('123') }.to output(output_file('rvm_use')).to_stdout
-    end
-  end
-
-  # describe 'rvm:wrapper' do
-  #   it 'rails db migrate' do
-  #     expect { invoke_all('123') }.to output('').to_stdout
-  #   end
-  # end
-end