minestrone 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1c0aa45e3a7ce26a5241ab6656d206d0b2db2c38687384f0cbba242bd67537
-  data.tar.gz: 5cef64bc80b01887fe19456cd67c8734cb9123af190bca72a3f3c9f45b63aa27
+  metadata.gz: e3c8964c359e7dabb2d3d14bd09a093d4d4bbabbb8ce75bf47e2949eb2e711ea
+  data.tar.gz: 8772884a6badaf622abc7b794c5dc971bbab040fc403537402cfade082014a66
 SHA512:
-  metadata.gz: 4e1a874230014eb04210586cbfbecb5ec23bea4fcb2038db1b8a442966210d12c714e9024907d9f4364686d7c076fe64589adb6a253c1789524dc7ec52be499d
-  data.tar.gz: 17bf22d3069227d7e8f84bb268d21deddae4d3970563810bfe58fa7605425b118bd931a7198eca519a18db941276a5faaf277b935fc4628a2d0e2880b264cb52
+  metadata.gz: 7c5aff5e3ac5ab932ac0d9f1adaf88b8fbdc646ee5056e219858a3c85574f90a60882aa35c9c38df1c293101eec28d91afbb844b2e9bb9cea13417ee12cebfd0
+  data.tar.gz: 587306f72ed2e29c81c29593e5a7cf7c765a184544b37fa94bbd5b45d0c1334bed073ed1928a38c539e737b220246c4506fa7ec8c06cfc044042ec8ca4a4a7af

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+## [0.0.3] - 2026-10-24
+
+- updated `capify` script to generate an updated and simplified deploy config
+- bumped up `net-ssh`, `net-scp` and `net-sftp` required versions
+- bumped up required Ruby version to 3.3+
+- `ed25519` and `bcrypt_pbkdf` don't need to be separately included in the Gemfile
+
 ## [0.0.2] - 2026-07-26
 
 - added `upload_file` as an alias for `upload` (which in deploy tasks is shadowed by the `deploy:upload` task)
 - added `append` & `remove` for adding/removing to array variables (from Capistrano 3)
-- renamed `_cset` to `set_if_empty` and make it a public API (also from Capistrano 3)
+- renamed `_cset` to `set_if_empty` and made it a public API (also from Capistrano 3)
 - in migration and assets tasks, use `RACK_ENV` instead of `RAILS_ENV`, unless `rails_env` is explicitly defined (Rails also accepts `RACK_ENV`, but Sinatra/Rack doesn't accept `RAILS_ENV`)
 - `:use_sudo` is now disabled by default
 - renamed `version_dir` to `releases_dir` for consistency
@@ -10,8 +17,7 @@
 - removed `deploy:cold`, `deploy:start` and `deploy:stop` tasks
 - removed `:normalize_asset_timestamps` and `:public_children`
 
-
-## Minestrone 0.0.1 - 2026-05-25
+## Minestrone [0.0.1] - 2026-05-25
 
 Changes from Capistrano 2.15.11:
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in minestrone.gemspec
 gemspec

data/README.md

@@ -36,7 +36,8 @@ Minestrone is a tool for deploying Ruby applications to a server, based on the c
 * added `upload_file` as alias for `upload`
 * added `append` and `remove` for adding/removing items from array variables
 * renamed `_cset` to `set_if_empty`
-* Ruby 3.0+ is required
+* Ruby 3.3+ is required
+* `ed25519` and `bcrypt_pbkdf` don't need to be separately included in the Gemfile
 
 
 ### Project status

data/SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+## How To Report a Vulnerability
+
+If you find a potential vulnerability in one of my projects, it's recommended not to report it through a standard publicly-readable issue report, in order to avoid giving possible clues to any potential attackers who could abuse it before it's fixed (see: ["Just a rumour of a bug is enough to find a security exploit these days"](https://anil.recoil.org/notes/rumour-is-the-exploit)).
+
+You can use one of these to contact me instead:
+
+- [@mackuba.eu](https://bsky.app/profile/did:plc:oio4hkxaop4ao4wz2pp3f4cr) on Bluesky (my DMs should be open, or mention me discretely with a request for contact)
+- [@mackuba@martianbase.net](https://martianbase.net/@mackuba) on Mastodon (my personal instance)
+- email: mackuba `@` protonmail.ch (optionally with [this PGP key](https://mail-api.proton.me/pks/lookup?op=get&search=mackuba@protonmail.ch))
+- ["Report a vulnerability"](https://github.com/mackuba/minestrone/security/advisories/new) form on GitHub
+
+I do not check my Twitter/X or LinkedIn accounts regularly.
+
+Note: please don't submit AI-reported issues that have not been verified manually :)

data/bin/capify

@@ -32,49 +32,46 @@ end
 
 def unindent(string)
   indentation = string[/\A\s*/]
-  string.strip.gsub(/^#{indentation}/, "")
+  string.strip.gsub(/^#{indentation}/, "") + "\n"
 end
 
 files = {
   "Capfile" => unindent(<<-FILE),
-
     load 'deploy'
+    load 'deploy/bundler'
 
-    # Uncomment if you are using Rails' asset pipeline
+    # Uncomment if you are using Rails asset pipeline
     # load 'deploy/assets'
 
-    load 'config/deploy' # remove this line to skip loading any of the default tasks
+    load 'config/deploy'
   FILE
 
-  "config/deploy.rb" => 'set :application, "set your application name here"
-set :repository,  "set your repository location here"
-
-# set :scm, :git # You can set :scm explicitly or Capistrano will make an intelligent guess based on known version control directory names
-# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
+  "config/deploy.rb" => unindent(<<-FILE),
+    server "host.example.com"
 
-role :web, "your web-server here"                          # Your HTTP server, Apache/etc
-role :app, "your app-server here"                          # This may be the same as your `Web` server
-role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
-role :db,  "your slave db-server here"
+    set :application, "set your application name here"
+    set :repository,  "set your git repository URL here"
 
-# if you want to clean up old releases on each deploy uncomment this:
-# after "deploy:restart", "deploy:cleanup"
+    # customize if needed
+    # set :keep_releases, 5
+    # set :rake, "RACK_ENV=production bundle exec rake"
+    # append :shared_children, "data"
 
-# if you\'re still using the script/reaper helper you will need
-# these http://github.com/rails/irs_process_scripts
-
-# If you are using Passenger mod_rails uncomment this:
-# namespace :deploy do
-#   task :start do ; end
-#   task :stop do ; end
-#   task :restart, :roles => :app, :except => { :no_release => true } do
-#     run "#{try_sudo} touch #{File.join(current_path,\'tmp\',\'restart.txt\')}"
-#   end
-# end'}
+    namespace :deploy do
+      task :restart do
+        # implement depending on the Ruby app server you use
+        # e.g. for Passenger:
+        # run "touch \#{current_path}/tmp/restart.txt"
+      end
+    end
+  FILE
+}
 
 base = ARGV.shift
+
 files.each do |file, content|
   file = File.join(base, file)
+
   if File.exist?(file)
     warn "[skip] '#{file}' already exists"
   elsif File.exist?(file.downcase)
@@ -84,6 +81,7 @@ files.each do |file, content|
       puts "[add] making directory '#{File.dirname(file)}'"
       FileUtils.mkdir(File.dirname(file))
     end
+
     puts "[add] writing '#{file}'"
     File.open(file, "w") { |f| f.write(content) }
   end

data/docs/lib-codebase-map.md

@@ -23,7 +23,7 @@ Built-in recipes live under `lib/minestrone/recipes`. The deploy recipe composes
 | `lib/minestrone/cli/options.rb` | `Minestrone::CLI::Options` | Defines `OptionParser` switches, default config discovery, environment variable extraction, and simple value coercion for `-s` and `-S`. | Mixed into `CLI`; requires `optparse`; uses `Logger`, `Version`, `CLI.password_prompt` |
 | `lib/minestrone/command.rb` | `Minestrone::Command` | Single-session remote command runner. Opens one SSH command channel, handles stdout/stderr callbacks, optional pty, environment injection, placeholder replacement, and remote command errors. | `errors`, `processable`, `Configuration.default_io_proc`, SSH session from `connections` |
 | `lib/minestrone/configuration.rb` | `Minestrone::Configuration` | Central DSL object. Owns logger/debug/dry-run state, explicitly calls each included module's initialization hook, mixes in all configuration and action modules, and unblocks namespace method shadowing. | `logger`; all `configuration/*`; `configuration/actions/*` |
-| `lib/minestrone/configuration/actions/file_transfer.rb` | `Minestrone::Configuration::Actions::FileTransfer` | Adds `put`, `get`, `upload`, `download`, and `transfer` DSL actions. Delegates actual work to `Minestrone::Transfer`. | `transfer`, `Connections#execute_on_server`, `Connections#session`, `run` |
+| `lib/minestrone/configuration/actions/file_transfer.rb` | `Minestrone::Configuration::Actions::FileTransfer` | Adds `put`, `get`, `upload`/`upload_file`, `download`, and `transfer` DSL actions. `upload_file` avoids ambiguity with the `deploy:upload` task. Delegates actual work to `Minestrone::Transfer`. | `transfer`, `Connections#execute_on_server`, `Connections#session`, `run` |
 | `lib/minestrone/configuration/actions/inspect.rb` | `Minestrone::Configuration::Actions::Inspect` | Adds `stream` and `capture` actions for running commands and consuming streamed or captured single-server output. | `errors`, `Invocation#invoke_command`, `sudo` |
 | `lib/minestrone/configuration/actions/invocation.rb` | `Minestrone::Configuration::Actions::Invocation` | Adds `run`, `invoke_command`, `sudo`, command defaults, sudo prompt handling, and debug prompting. Converts DSL command calls into sequential `Command` execution. | `command`, `Servers#active_server`, `Connections#execute_on_server`, `CLI.debug_prompt`, `Variables` |
 | `lib/minestrone/configuration/alias_task.rb` | `Minestrone::Configuration::AliasTask` | Adds `alias_task`, duplicating an existing task under a new name. | `Namespaces#find_task`, `#define_task`, `NoSuchTaskError` |
@@ -33,15 +33,16 @@ Built-in recipes live under `lib/minestrone/recipes`. The deploy recipe composes
 | `lib/minestrone/configuration/loading.rb` | `Minestrone::Configuration::Loading`, `Loading::ClassMethods` | Loads recipes from files, strings, or procs. Provides a Minestrone-aware `require` that lets multiple configuration instances reload recipe DSL effects. | Used by `CLI`, recipes, extensions |
 | `lib/minestrone/configuration/log_formatters.rb` | `Minestrone::Configuration::LogFormatters` | DSL for adding logger formatters and disabling formatting. | `logger` |
 | `lib/minestrone/configuration/namespaces.rb` | `Minestrone::Configuration::Namespaces`, `Namespaces::Namespace`, `Kernel.method_added` hook | Implements `namespace`, `task`, `desc`, task lookup, namespace lookup, default tasks, and nested namespace forwarding to parent configuration. | `task_definition`, `alias_task`, `execution` |
-| `lib/minestrone/configuration/servers.rb` | `Minestrone::Configuration::Servers` | Adds the single-host `server` DSL and resolves the configured server, with `HOST` as a one-host environment override. | `ServerDefinition`, `errors` |
-| `lib/minestrone/configuration/variables.rb` | `Minestrone::Configuration::Variables` | Configuration variables with lazy proc evaluation, reset/unset, `fetch`, `[]`, and variable-backed `method_missing`. | Used by nearly every DSL and recipe file |
+| `lib/minestrone/configuration/servers.rb` | `Minestrone::Configuration::Servers` | Adds the single-host `server` DSL and resolves the configured server, with `SERVER` as the preferred environment override and `HOSTS` as a compatibility fallback. | `ServerDefinition`, `errors` |
+| `lib/minestrone/configuration/variables.rb` | `Minestrone::Configuration::Variables` | Configuration variables with lazy proc evaluation, conditional defaults through `set_if_empty`, array updates through `append`/`remove`, reset/unset, `fetch`, `[]`, and variable-backed `method_missing`. | Used by nearly every DSL and recipe file |
 | `lib/minestrone/errors.rb` | `Minestrone::Error`, `CaptureError`, `NoSuchTaskError`, `NoMatchingServersError`, `RemoteError`, `ConnectionError`, `TransferError`, `CommandError`, `LocalArgumentError` | Shared exception hierarchy. Remote errors carry affected hosts. | Used by command, transfer, connections, execution, recipes, deploy adapters |
 | `lib/minestrone/ext/string.rb` | reopens `String` | Adds `String#compact`, collapsing whitespace. Used to make heredoc shell commands one line. | Used by deploy assets and recipe command heredocs |
 | `lib/minestrone/extensions.rb` | `Minestrone::ExtensionProxy`, `Minestrone::EXTENSIONS`, plugin methods | Plugin registration system. Adds proxy methods to `Configuration` instances and delegates unknown plugin method calls back to the configuration. | `Configuration`, `Error` |
 | `lib/minestrone/logger.rb` | `Minestrone::Logger` | Level-based logger with TTY color/style formatters, timestamp/prepend/append/replace support, and default formatter registration. | Used by `Configuration`, CLI options, command/transfer/strategy/scm code |
 | `lib/minestrone/processable.rb` | `Minestrone::Processable`, `Processable::SessionAssociation` | Shared single-session Net::SSH event loop helper. Preprocesses/postprocesses the session with `IO.select` and associates raised errors with that session. | Included by `Command`, `Transfer` |
-| `lib/minestrone/recipes/deploy.rb` | recipe methods and tasks only | Primary deployment recipe. Defines deploy variables, helpers (`scm_default`, `depend`, `with_env`, `run_locally`, `try_sudo`, `try_runner`), and tasks for setup, update, update_code, symlinks, upload, rollback, migrations, cleanup, checks, cold deploy, start/stop, pending diff/log, and web maintenance mode. Defaults to Git when `.git` exists and `none` otherwise. | `deploy/scm`, `deploy/strategy`, `dependencies`, `Command`/`Transfer` through configuration actions |
+| `lib/minestrone/recipes/deploy.rb` | recipe methods and tasks only | Primary deployment recipe. Defines deploy defaults, helpers (`scm_default`, `depend`, `with_env`, `r_env`, `run_locally`, `try_sudo`, `try_runner`), and tasks for setup, update, update_code, symlinks, upload, restart hooks, rollback, migrations, cleanup, checks, and pending diff/log. Defaults to Git when `.git` exists and `none` otherwise. | `deploy/scm`, `deploy/strategy`, `dependencies`, `Command`/`Transfer` through configuration actions |
 | `lib/minestrone/recipes/deploy/assets.rb` | recipe methods and tasks only | Rails asset-pipeline extension. Hooks into deploy lifecycle to symlink shared assets, precompile, maintain manifest mtimes, clean expired assets, clean all assets, and roll back manifests. | Loads `deploy`; `json`, `yaml` via deploy, `Set` via deploy, `String#compact`, callbacks/tasks/actions |
+| `lib/minestrone/recipes/deploy/bundler.rb` | recipe methods and tasks only | Bundler integration. Configures bundle defaults, makes Rake run through Bundler, installs gems into the shared bundle path during deployment, and symlinks that path into each release. | Loads `deploy`; deploy variables, callbacks/tasks/actions |
 | `lib/minestrone/recipes/deploy/dependencies.rb` | `Minestrone::Deploy::Dependencies` | Aggregates local and remote dependency checks and reports pass/fail. | `local_dependency`, `remote_dependency` |
 | `lib/minestrone/recipes/deploy/local_dependency.rb` | `Minestrone::Deploy::LocalDependency` | Checks local command availability in `PATH`. | Used by `Dependencies`, `Strategy::Copy#check!` |
 | `lib/minestrone/recipes/deploy/remote_dependency.rb` | `Minestrone::Deploy::RemoteDependency` | Checks remote directories, files, writability, commands, gems, deb/rpm packages, and expected command output. | `errors`, `Configuration#invoke_command`, `CommandError` |
@@ -54,12 +55,11 @@ Built-in recipes live under `lib/minestrone/recipes`. The deploy recipe composes
 | `lib/minestrone/recipes/deploy/strategy/copy.rb` | `Minestrone::Deploy::Strategy::Copy`, `Copy::Compression` | Local-copy strategy. Checks out/export locally or refreshes a local cache, optionally builds, excludes files, archives, uploads, extracts remotely, and cleans staging artifacts. | `strategy/base`, `fileutils`, `tempfile`, `LocalDependency`, `FileTransfer#upload`, SCM local proxy |
 | `lib/minestrone/recipes/deploy/strategy/remote_cache.rb` | `Minestrone::Deploy::Strategy::RemoteCache` | Remote strategy maintaining a shared cached checkout under `shared_path`, then copying/rsyncing it to each release. Handles SCM prompt filtering and writes `REVISION`. | `strategy/base`, SCM `sync`/`checkout`/`handle_data`, remote `rsync` when exclusions exist |
 | `lib/minestrone/recipes/standard.rb` | recipe tasks only | Standard recipe loaded by CLI. Defines `invoke` for one-off remote commands. | `configuration/actions/invocation` |
-| `lib/minestrone/recipes/templates/maintenance.rhtml` | none | ERB/XHTML maintenance-page template used by `deploy:web:disable`. | Read by `recipes/deploy.rb` |
 | `lib/minestrone/server_definition.rb` | `Minestrone::ServerDefinition` | Parses and stores `user@host:port` plus server options. Provides comparison, equality/hash, default user, and string rendering. | Used by `Servers`, `SSH`, `Connections` |
 | `lib/minestrone/ssh.rb` | `Minestrone::SSH`, `SSH::Server` | SSH connection helper. Applies the originating `ServerDefinition` to the Net::SSH session and builds public-key-only connection options. | `net/ssh`, `ServerDefinition` |
 | `lib/minestrone/task_definition.rb` | `Minestrone::TaskDefinition` | Stores task metadata: name, namespace, options, body, description, and rollback behavior. Formats descriptions and computes fully qualified names. | `server_definition`; used by `configuration/namespaces` and `execution` |
 | `lib/minestrone/transfer.rb` | `Minestrone::Transfer`, `Transfer::SFTPTransferWrapper` | Single-session upload/download engine over SFTP or SCP. Normalizes host placeholders and IOs, tracks transfer failure, delegates event processing to `Processable`, and raises `TransferError`. | `net/scp`, `net/sftp`, `processable`, `errors`, SSH session |
-| `lib/minestrone/version.rb` | `Minestrone::Version`, `Minestrone::VERSION` | Version constants and string rendering for Minestrone 2.15.11. | Used by CLI `--version` |
+| `lib/minestrone/version.rb` | `Minestrone::Version`, `Minestrone::VERSION` | Version constants and string rendering for Minestrone 0.0.2. | Used by CLI `--version` |
 
 ## Dependency Graph
 
@@ -105,6 +105,7 @@ flowchart TD
   deploy_recipe --> strategy_factory["Deploy::Strategy factory"]
   deploy_recipe --> config
   assets_recipe["recipes/deploy/assets.rb"] --> deploy_recipe
+  bundler_recipe["recipes/deploy/bundler.rb"] --> deploy_recipe
 
   scm_factory --> scm_base["SCM::Base"]
   scm_base --> scm_adapters["Git, None"]
@@ -137,7 +138,8 @@ These are the code-level edges visible from `require` and `load`, excluding Ruby
 | `lib/minestrone/configuration/namespaces.rb` | `minestrone/configuration/alias_task`, `minestrone/task_definition` |
 | `lib/minestrone/configuration/servers.rb` | `minestrone/server_definition`, `minestrone/errors` |
 | `lib/minestrone/recipes/deploy.rb` | `minestrone/recipes/deploy/scm`, `minestrone/recipes/deploy/strategy` |
-| `lib/minestrone/recipes/deploy/assets.rb` | `load 'deploy'` unless `_cset` already exists |
+| `lib/minestrone/recipes/deploy/assets.rb` | `load 'deploy'` unless the `try_sudo` deploy helper already exists |
+| `lib/minestrone/recipes/deploy/bundler.rb` | `load 'deploy'` unless the `try_sudo` deploy helper already exists |
 | `lib/minestrone/recipes/deploy/dependencies.rb` | `minestrone/recipes/deploy/local_dependency`, `minestrone/recipes/deploy/remote_dependency` |
 | `lib/minestrone/recipes/deploy/remote_dependency.rb` | `minestrone/errors` |
 | `lib/minestrone/recipes/deploy/scm.rb` | dynamically `minestrone/recipes/deploy/scm/<name>` |
@@ -154,9 +156,9 @@ These are the code-level edges visible from `require` and `load`, excluding Ruby
 
 - `Configuration` is the central dependency hub. Most recipe and strategy code calls into it through DSL methods mixed in from its modules.
 - `Command` and `Transfer` depend on `Processable` because they share the same single-session Net::SSH event-loop pattern.
-- `ServerDefinition` is the single configured server identity object. It carries host/user/port/options into the `HOST` override path, SSH connection setup, command placeholders, transfer logging, and error reporting.
+- `ServerDefinition` is the single configured server identity object. It carries host/user/port/options into the `SERVER`/`HOSTS` override path, SSH connection setup, command placeholders, transfer logging, and error reporting.
 - `Callbacks` wraps `Execution#invoke_task_directly`; task lifecycle hooks therefore apply to all direct task execution paths, including CLI actions and recipe-invoked task aliases.
 - `Deploy::SCM` and `Deploy::Strategy` are factories. They load adapter files by name and instantiate classes from generated constant names.
 - SCM adapters generally do not execute commands. They return shell command strings and prompt handlers. Strategies decide whether those commands run locally, remotely, through caches, or through uploaded archives.
 - `Strategy::Copy` is the main bridge from local SCM commands to remote deployment: it uses the SCM's local proxy, local filesystem staging, compression utilities, `upload`, and remote decompression.
-- `recipes/deploy/assets.rb` is not a class extension. It is a recipe that mutates the current configuration by setting defaults, registering callbacks, adding helper methods, and defining `deploy:assets:*` tasks.
+- `recipes/deploy/assets.rb` and `recipes/deploy/bundler.rb` are not class extensions. They are recipes that mutate the current configuration by setting defaults, registering callbacks, adding helper methods, and defining deployment tasks.

data/lib/minestrone/configuration/variables.rb

@@ -36,6 +36,9 @@ module Minestrone
 
       alias :[]= :set
 
+      # Sets a variable only when it has not already been defined. Existing
+      # values, including nil and false, are preserved. Accepts either a value
+      # or a block, following the same rules as #set.
       def set_if_empty(variable, *args, &block)
         set(variable, *args, &block) unless exists?(variable)
       end
@@ -47,10 +50,16 @@ module Minestrone
         @variables.delete(sym)
       end
 
+      # Appends one or more values to an array variable. Missing variables are
+      # treated as empty arrays, and existing scalar values are wrapped in an
+      # array before the new values are appended.
       def append(variable, *values)
         set(variable, Array(fetch(variable, [])).concat(values))
       end
 
+      # Removes all occurrences of the given values from an array variable.
+      # Missing variables are treated as empty arrays, and existing scalar
+      # values are wrapped in an array before removal.
       def remove(variable, *values)
         set(variable, Array(fetch(variable, [])) - values)
       end

data/lib/minestrone/version.rb

@@ -3,7 +3,7 @@
 module Minestrone
   class Version
     def self.to_s
-      "0.0.2"
+      "0.0.3"
     end
   end
 

data/minestrone.gemspec

@@ -1,32 +1,44 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path("lib", __dir__)
-require "minestrone/version"
+require_relative 'lib/minestrone/version'
 
 Gem::Specification.new do |spec|
   spec.name = "minestrone"
   spec.version = Minestrone::Version.to_s
   spec.platform = Gem::Platform::RUBY
   spec.authors = ["Jamis Buck", "Lee Hambley", "Kuba Suder"]
-  spec.homepage = "http://github.com/mackuba/minestrone"
-  spec.summary = "Minestrone - Welcome to easy deployment with Ruby over SSH"
-  spec.description = "Minestrone is a utility and framework for executing commands on a remote machine, via SSH."
+
+  spec.summary = "Simple deployment tool for Ruby apps (based on Capistrano)"
+  spec.description = %(
+    Minestrone is a simplified fork of old Capistrano from before the 3.0 rewrite. It retains most of the old, simpler API,
+    while also removing some more advanced features, and focusing on the relatively simplest but common scenario of a single
+    production server. It also removes a lot of old cruft, support for less commonly used or less recommended things,
+    and modernizes some of the code.
+  )
+
+  spec.homepage = "https://github.com/mackuba/minestrone"
+  spec.license = "MIT"
+
+  spec.metadata = {
+    "bug_tracker_uri"   => "https://github.com/mackuba/minestrone/issues",
+    "changelog_uri"     => "https://github.com/mackuba/minestrone/blob/master/CHANGELOG.md",
+    "source_code_uri"   => "https://github.com/mackuba/minestrone",
+    "rubygems_mfa_required" => "true"
+  }
+
   spec.files = `git ls-files`.split("\n")
-  spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.executables = `git ls-files -- bin/*`.split("\n").map { |file| File.basename(file) }
+  spec.executables = ['min', 'capify']
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files = [
     "README.md"
   ]
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.3.0"
 
   spec.add_dependency 'benchmark', '~> 0.5'
-  spec.add_dependency 'highline', '>= 0'
-  spec.add_dependency 'net-ssh', '>= 7.2'
-  spec.add_dependency 'net-sftp', '>= 3.0'
-  spec.add_dependency 'net-scp', '>= 3.0'
-
-  # used silently by net-ssh but undeclared
-  spec.add_dependency 'logger'
+  spec.add_dependency 'highline', '~> 3.0'
+  spec.add_dependency 'net-ssh', '~> 8.0'
+  spec.add_dependency 'net-sftp', '~> 4.0'
+  spec.add_dependency 'net-scp', '~> 4.0'
+  spec.add_dependency 'bcrypt_pbkdf', '~> 1.1'
 end

data/test/configuration/actions/file_transfer_test.rb

@@ -47,6 +47,12 @@ class ConfigurationActionsFileTransferTest < Test::Unit::TestCase
     @config.upload("testl.txt", "testr.txt", :mode => "g+w", :foo => "bar")
   end
 
+  def test_upload_file_should_alias_upload
+    @config.expects(:transfer).with(:up, "testl.txt", "testr.txt", { :foo => "bar" })
+    @config.expects(:run).with("chmod 775 testr.txt", { :foo => "bar" })
+    @config.upload_file("testl.txt", "testr.txt", :mode => 0775, :foo => "bar")
+  end
+
   def test_download_should_delegate_to_transfer
     @config.expects(:transfer).with(:down, "testr.txt", "testl.txt", { :foo => "bar" })
     @config.download("testr.txt", "testl.txt", :foo => "bar")

data/test/configuration/variables_test.rb

@@ -96,6 +96,60 @@ class ConfigurationVariablesTest < Test::Unit::TestCase
     end
   end
 
+  def test_set_if_empty_should_set_missing_variable
+    @config.set_if_empty :sample, :value
+    assert_equal :value, @config.fetch(:sample)
+  end
+
+  def test_set_if_empty_should_accept_lazy_block
+    @config.set_if_empty(:sample) { :value }
+    assert_instance_of Proc, @config.variables[:sample]
+    assert_equal :value, @config.fetch(:sample)
+  end
+
+  def test_set_if_empty_should_not_replace_existing_false_or_nil
+    @config.set :false_value, false
+    @config.set :nil_value, nil
+
+    @config.set_if_empty :false_value, :replacement
+    replacement_called = false
+    @config.set_if_empty(:nil_value) { replacement_called = true }
+
+    assert_equal false, @config.fetch(:false_value)
+    assert_nil @config.fetch(:nil_value)
+    assert_equal false, replacement_called
+  end
+
+  def test_append_should_add_values_to_missing_or_existing_array
+    @config.append :missing, :one, :two
+    @config.set :existing, [:one]
+    @config.append :existing, :two, :three
+
+    assert_equal [:one, :two], @config.fetch(:missing)
+    assert_equal [:one, :two, :three], @config.fetch(:existing)
+  end
+
+  def test_append_should_wrap_existing_scalar_var_in_array
+    @config.set :sample, :one
+    @config.append :sample, :two
+    assert_equal [:one, :two], @config.fetch(:sample)
+  end
+
+  def test_remove_should_remove_values_from_missing_or_existing_array
+    @config.remove :missing, :one
+    @config.set :existing, [:one, :two, :one, :three]
+    @config.remove :existing, :one, :three
+
+    assert_equal [], @config.fetch(:missing)
+    assert_equal [:two], @config.fetch(:existing)
+  end
+
+  def test_remove_should_wrap_existing_scalar
+    @config.set :sample, :one
+    @config.remove :sample, :two
+    assert_equal [:one], @config.fetch(:sample)
+  end
+
   def test_unset_should_remove_variable_from_hash
     @config.set :sample, :value
     assert @config.variables.key?(:sample)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minestrone
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jamis Buck
@@ -29,74 +29,78 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Minestrone is a utility and framework for executing commands on a remote
-  machine, via SSH.
+        version: '1.1'
+description: "\n    Minestrone is a simplified fork of old Capistrano from before
+  the 3.0 rewrite. It retains most of the old, simpler API,\n    while also removing
+  some more advanced features, and focusing on the relatively simplest but common
+  scenario of a single\n    production server. It also removes a lot of old cruft,
+  support for less commonly used or less recommended things,\n    and modernizes some
+  of the code.\n  "
 executables:
 - capify
 - min
@@ -111,6 +115,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/capify
 - bin/min
 - docs/lib-codebase-map.md
@@ -198,9 +203,14 @@ files:
 - test/transfer_test.rb
 - test/utils.rb
 - test/version_test.rb
-homepage: http://github.com/mackuba/minestrone
-licenses: []
-metadata: {}
+homepage: https://github.com/mackuba/minestrone
+licenses:
+- MIT
+metadata:
+  bug_tracker_uri: https://github.com/mackuba/minestrone/issues
+  changelog_uri: https://github.com/mackuba/minestrone/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/mackuba/minestrone
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -208,51 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.23
 specification_version: 4
-summary: Minestrone - Welcome to easy deployment with Ruby over SSH
-test_files:
-- test/cli/execute_test.rb
-- test/cli/help_test.rb
-- test/cli/options_test.rb
-- test/cli/ui_test.rb
-- test/cli_test.rb
-- test/command_test.rb
-- test/configuration/actions/file_transfer_test.rb
-- test/configuration/actions/inspect_test.rb
-- test/configuration/actions/invocation_test.rb
-- test/configuration/alias_task_test.rb
-- test/configuration/callbacks_test.rb
-- test/configuration/connections_test.rb
-- test/configuration/execution_test.rb
-- test/configuration/loading_test.rb
-- test/configuration/namespace_dsl_test.rb
-- test/configuration/servers_test.rb
-- test/configuration/variables_test.rb
-- test/configuration_test.rb
-- test/deploy/local_dependency_test.rb
-- test/deploy/remote_dependency_test.rb
-- test/deploy/scm/base_test.rb
-- test/deploy/scm/git_test.rb
-- test/deploy/scm/none_test.rb
-- test/deploy/strategy/copy_test.rb
-- test/extensions_test.rb
-- test/fixtures/cli_integration.rb
-- test/fixtures/config.rb
-- test/fixtures/custom.rb
-- test/logger_formatting_test.rb
-- test/logger_test.rb
-- test/recipes_test.rb
-- test/server_definition_test.rb
-- test/ssh_test.rb
-- test/task_definition_test.rb
-- test/transfer_test.rb
-- test/utils.rb
-- test/version_test.rb
+summary: Simple deployment tool for Ruby apps (based on Capistrano)
+test_files: []