opswalrus 1.0.56 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00c706c6ebe569e50f6a10f453d7fd06295cab27ace5dda3e9df6eacd5b4503d
-  data.tar.gz: 601c71bedb296ca074fa6b641f90821aa507636c14a4dee8b88eef328e58febf
+  metadata.gz: 561e5d52fb2898d5c93e6a1b683194ed4dccf1ba476f68be79261cd58de8afba
+  data.tar.gz: 0cddaa43d4fac68a82c4dd0755486a8dd25c229e46e55c9698e74e69c7eef2bd
 SHA512:
-  metadata.gz: 8da23d67767a131d5c76e7358837e77da95a605ff1816206c72aada88b926c13f3427bd762198d36c1320205f10c40df3b57c44c9fbe7f85e64e4a7a9f0d2869
-  data.tar.gz: 783388c416d1dfd59d1838271d818171675c62436cbf1efc68225fd64b9f67c3a97d8c8553529ec7d1d7e536be306bc342a7c7e153d54001a93716885e59edc3
+  metadata.gz: 258d673028667b25f58cdf93b2d4fd82dfca0c6058687bccd3f4267d935f807c83ffc7981cbd638099186b6f93ab965a4b3d6f4bd7da2c26018e8378249bc57e
+  data.tar.gz: 8d234040ba815a0e83cbe15338c51cfdafee068720417ed2ce384e03bb7295a4b7b2ac68a6eca4555a52d56c2656ccc49e5a99887f013c25f4dcd7fe19f1c32c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.56)
+    opswalrus (1.0.58)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/_run_remote.ops

@@ -4,6 +4,8 @@ params:
 ...
 ssh in: :sequence do
 # ssh_noprep do
+  # puts params.stringify_keys!
   # desc "Running `#{params.ops_file.ops_file_path} #{params.operation_kv_args.join(' ')}` on #{to_s} (alias=#{self.alias})"
+  # run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
   _invoke_remote(params.ops_file, *params.operation_kv_args)
 end

data/lib/opswalrus/app.rb

@@ -266,7 +266,7 @@ module OpsWalrus
       internal_ops_file = OpsFile.new(self, __FILE__.to_pathname.dirname.join("_run_remote.ops"))
 
       op = OperationRunner.new(self, internal_ops_file)
-      result = op.run([], params_json_hash: {ops_file: ops_file, operation_kv_args: operation_kv_args})
+      result = op.run([], params_json_hash: {ops_file: ops_file, operation_kv_args: operation_kv_args}.stringify_keys)
       exit_status = result.exit_status
 
       debug "Op exit_status"

data/lib/opswalrus/host.rb

@@ -100,7 +100,7 @@ module OpsWalrus
 
       stdout, stderr, exit_status = [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
 
-      if print_report
+      if print_report && App.instance.info?
         if exit_status == 0
           puts "Bootstrap success - #{to_s} (alias=#{self.alias})"
         else
@@ -288,8 +288,8 @@ module OpsWalrus
             io.puts Style.cyan(out)
             io.puts Style.red(err)
           elsif App.instance.info?
-            # io.puts Style.cyan(out)
-            # io.puts Style.red(err)
+            io.puts Style.cyan(out)
+            io.puts Style.red(err)
           end
           io.print Style.yellow(cmd_id)
           io.print Style.blue(" | Finished in #{seconds} seconds with exit status ")

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -335,8 +335,8 @@ module OpsWalrus
             io.puts Style.cyan(out)
             io.puts Style.red(err)
           elsif App.instance.info?
-            # io.puts Style.cyan(out)
-            # io.puts Style.red(err)
+            io.puts Style.cyan(out)
+            io.puts Style.red(err)
           end
           io.print Style.yellow(cmd_id)
           io.print Style.blue(" | Finished in #{seconds} seconds with exit status ")

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.56"
+  VERSION = "1.0.58"
 end

data/test.rb

@@ -0,0 +1,88 @@
+require 'tty-option'
+
+class Command
+  include TTY::Option
+
+  usage do
+    program "dock"
+
+    command "run"
+
+    desc "Run a command in a new container"
+
+    example "Set working directory (-w)",
+            "  $ dock run -w /path/to/dir/ ubuntu pwd"
+
+    example <<~EOS
+    Mount volume
+      $ dock run -v `pwd`:`pwd` -w `pwd` ubuntu pwd
+    EOS
+  end
+
+  argument :image do
+    required
+    desc "The name of the image to use"
+  end
+
+  argument :command do
+    optional
+    desc "The command to run inside the image"
+  end
+
+  keyword :restart do
+    default "no"
+    permit %w[no on-failure always unless-stopped]
+    desc "Restart policy to apply when a container exits"
+  end
+
+  option :verbose do
+    arity "+"
+    short "-v"
+    desc "Verbose mode"
+  end
+
+  flag :detach do
+    short "-d"
+    long "--detach"
+    desc "Run container in background and print container ID"
+  end
+
+  flag :help do
+    short "-h"
+    long "--help"
+    desc "Print usage"
+  end
+
+  option :name do
+    required
+    long "--name string"
+    desc "Assign a name to the container"
+  end
+
+  option :port do
+    arity one_or_more
+    short "-p"
+    long "--publish list"
+    convert :list
+    desc "Publish a container's port(s) to the host"
+  end
+
+  def run
+    puts params[:verbose].inspect
+    if params[:help]
+      print help
+    elsif params.errors.any?
+      puts params.errors.summary
+    else
+      pp params.to_h
+    end
+  end
+end
+
+def main
+  cmd = Command.new
+  cmd.parse
+  puts cmd.run
+end
+
+main

data/vms/arch/Vagrantfile

@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "archlinux/archlinux"
+
+  config.vm.network "private_network", ip: "192.168.56.10"
+
+  # config.ssh.insert_key = false
+  config.ssh.forward_agent = true
+
+  config.vm.provision "shell" do |s|
+    ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_ops.pub").first.strip
+    s.inline = <<-SHELL
+      echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
+      echo #{ssh_pub_key} >> /root/.ssh/authorized_keys
+
+      sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+      sudo systemctl restart sshd
+
+      # change vagrant user to require sudo password
+      sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD: ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant
+
+      # sudo sh -c 'echo root:foo | chpasswd'
+    SHELL
+  end
+end

data/vms/debian/Vagrantfile

@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "bento/debian-12"
+
+  config.vm.network "private_network", ip: "192.168.56.11"
+
+  config.ssh.forward_agent = true
+
+  config.vm.provision "shell" do |s|
+    ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_ops.pub").first.strip
+    s.inline = <<-SHELL
+      # echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
+      # echo #{ssh_pub_key} >> /root/.ssh/authorized_keys
+
+      sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+      sudo systemctl restart sshd
+
+      # change vagrant user to require sudo password
+      sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD:ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant
+
+      # sudo sh -c 'echo root:foo | chpasswd'
+    SHELL
+  end
+end

data/vms/{web-fedora → fedora}/Vagrantfile

@@ -8,11 +8,11 @@ Vagrant.configure("2") do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "fedora/38-cloud-base"
+  config.vm.box = "bento/fedora-38"
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
-  config.vm.network "private_network", ip: "192.168.56.11"
+  config.vm.network "private_network", ip: "192.168.56.12"
 
   # config.ssh.insert_key = false
   config.ssh.forward_agent = true

data/vms/freebsd/Vagrantfile

@@ -0,0 +1,55 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "bento/freebsd-13"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.56.13"
+
+  # config.ssh.insert_key = false
+  config.ssh.forward_agent = true
+
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+    vb.memory = "1024"
+  end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+    echo "tmpfs /tmp tmpfs rw,nodev,nosuid,size=5G 0 0" | sudo tee -a /etc/fstab
+
+    # this helps to address the issue where new builds of fedora do not honor the vagrant network config settings
+    sudo dnf install -yq NetworkManager-initscripts-ifcfg-rh
+
+    # this migrates the old network management config to the new style
+    sudo nmcli connection migrate
+
+    # # per https://github.com/hashicorp/vagrant/issues/12762#issuecomment-1535957837 :
+    # sudo nmcli conn modify 'Wired connection 2' ipv4.addresses $(cat /etc/sysconfig/network-scripts/ifcfg-eth1 | grep IPADDR | cut -d "=" -f2)
+    # sudo nmcli conn modify 'Wired connection 2' ipv4.method manual
+    # sudo systemctl restart NetworkManager
+
+    sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+    sudo systemctl restart sshd
+
+    nohup sudo -b bash -c 'sleep 3; reboot' &>/dev/null;
+
+    # change vagrant user to require sudo password
+    sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD: ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant-nopasswd
+
+    # sudo sh -c 'echo root:foo | chpasswd'
+  SHELL
+end

data/vms/rocky/Vagrantfile

@@ -0,0 +1,55 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "bento/rockylinux-9"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.56.14"
+
+  # config.ssh.insert_key = false
+  config.ssh.forward_agent = true
+
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+    vb.memory = "1024"
+  end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+    echo "tmpfs /tmp tmpfs rw,nodev,nosuid,size=5G 0 0" | sudo tee -a /etc/fstab
+
+    # this helps to address the issue where new builds of fedora do not honor the vagrant network config settings
+    sudo dnf install -yq NetworkManager-initscripts-ifcfg-rh
+
+    # this migrates the old network management config to the new style
+    sudo nmcli connection migrate
+
+    # # per https://github.com/hashicorp/vagrant/issues/12762#issuecomment-1535957837 :
+    # sudo nmcli conn modify 'Wired connection 2' ipv4.addresses $(cat /etc/sysconfig/network-scripts/ifcfg-eth1 | grep IPADDR | cut -d "=" -f2)
+    # sudo nmcli conn modify 'Wired connection 2' ipv4.method manual
+    # sudo systemctl restart NetworkManager
+
+    sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+    sudo systemctl restart sshd
+
+    nohup sudo -b bash -c 'sleep 3; reboot' &>/dev/null;
+
+    # change vagrant user to require sudo password
+    sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD: ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant-nopasswd
+
+    # sudo sh -c 'echo root:foo | chpasswd'
+  SHELL
+end

data/vms/ubuntu/Vagrantfile

@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "bento/ubuntu-22.04"
+
+  config.vm.network "private_network", ip: "192.168.56.15"
+
+  config.ssh.forward_agent = true
+
+  config.vm.provision "shell" do |s|
+    ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_ops.pub").first.strip
+    s.inline = <<-SHELL
+      # echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
+      # echo #{ssh_pub_key} >> /root/.ssh/authorized_keys
+
+      sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+      sudo systemctl restart sshd
+
+      # change vagrant user to require sudo password
+      sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD:ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant
+
+      # sudo sh -c 'echo root:foo | chpasswd'
+    SHELL
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.56
+  version: 1.0.58
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -229,9 +229,13 @@ files:
 - lib/opswalrus/zip.rb
 - opswalrus.gemspec
 - sig/opswalrus.rbs
-- vms/web-arch/Vagrantfile
-- vms/web-fedora/Vagrantfile
-- vms/web-ubuntu/Vagrantfile
+- test.rb
+- vms/arch/Vagrantfile
+- vms/debian/Vagrantfile
+- vms/fedora/Vagrantfile
+- vms/freebsd/Vagrantfile
+- vms/rocky/Vagrantfile
+- vms/ubuntu/Vagrantfile
 homepage: https://github.com/opswalrus/opswalrus
 licenses:
 - EPL-2.0

data/vms/web-arch/Vagrantfile

@@ -1,92 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "generic/arch"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # NOTE: This will enable public access to the opened port
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine and only allow access
-  # via 127.0.0.1 to disable public access
-  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  config.vm.network "private_network", ip: "192.168.56.12"
-
-  # config.ssh.insert_key = false
-  config.ssh.forward_agent = true
-
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Disable the default share of the current code directory. Doing this
-  # provides improved isolation between the vagrant box and your host
-  # by making sure your Vagrantfile isn't accessable to the vagrant box.
-  # If you use this you may want to enable additional shared subfolders as
-  # shown above.
-  # config.vm.synced_folder ".", "/vagrant", disabled: true
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell" do |s|
-    ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_ops.pub").first.strip
-    s.inline = <<-SHELL
-      echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
-      echo #{ssh_pub_key} >> /root/.ssh/authorized_keys
-
-      sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
-      sudo systemctl restart sshd
-
-      # change vagrant user to require sudo password
-      sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD: ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant
-
-      # sudo sh -c 'echo root:foo | chpasswd'
-    SHELL
-  end
-end

data/vms/web-ubuntu/Vagrantfile

@@ -1,38 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "ubuntu/jammy64"
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  config.vm.network "private_network", ip: "192.168.56.10"
-
-  # config.ssh.insert_key = false
-  config.ssh.forward_agent = true
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell" do |s|
-    ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_ops.pub").first.strip
-    s.inline = <<-SHELL
-      # echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
-      # echo #{ssh_pub_key} >> /root/.ssh/authorized_keys
-
-      sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
-      sudo systemctl restart sshd
-
-      # change vagrant user to require sudo password
-      sudo sed -i 's/vagrant ALL=(ALL) NOPASSWD:ALL/vagrant ALL=(ALL:ALL) ALL/g' /etc/sudoers.d/vagrant
-
-      # sudo sh -c 'echo root:foo | chpasswd'
-    SHELL
-  end
-end