opswalrus 1.0.26 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf52aaeace4ab759fb7928eacf69000112241ce9054982565524b4d110aeb2e
-  data.tar.gz: '0089b4e7af6418588cc6c42e6f985b4d9f631d27cb54a23bfb22db5f84689773'
+  metadata.gz: 0ed3ebf666e1e12461a109ace60e4429008e5016fde3c4f0605e1b1f0e8c3a01
+  data.tar.gz: 88a949890ddb41d16d69e667e6440e4894a4d1ef369b0e4db301ce5f751c5570
 SHA512:
-  metadata.gz: 1c494ed2f70bc4c425ef7a197501d43e26ed718e8409d4478675289bf6d6d88f1a8b9e07d7ae5f5122381e2d2e17b9fdfa60bcd1743a6679cb96167f21d116b6
-  data.tar.gz: aa98abe60dbf25b6cbf42dd819d08bf3809cda5a6b2b218d43e126b221a3fe2d595ae1088bb3027d9aedf1d001c2197ab0b2cd48da61b2d482f5742c37469f80
+  metadata.gz: 8625724d93eea350e367d57468b8c4072a3f1e4946469afba2e950305b93d564e056afd368ee5af5c44483364ed41b3aa003bedeabb6e40281c0d65c6a10f8be
+  data.tar.gz: c75cfe115140ec4bcb09059e9f3ce96ea2b51bca4c60552221a53f4415c91b3da55ad1acef2f61fcf08cb93cfb20580390317862fa9f288f56a8787959189324

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.26)
+    opswalrus (1.0.28)
       amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
       citrus (~> 3.0)

data/lib/opswalrus/app.rb

@@ -57,6 +57,7 @@ module OpsWalrus
       @local_hostname = "localhost"
       @mode = :report     # :report | :script
       @dry_run = false
+      @zip_mutex = Thread::Mutex.new
     end
 
     def to_s
@@ -414,9 +415,13 @@ module OpsWalrus
     end
 
     def zip
-      tmpzip = pwd.join("tmpops.zip")
-      FileUtils.rm(tmpzip) if tmpzip.exist?
-      @zip_bundle_path ||= DirZipper.zip(pwd, tmpzip)
+      @zip ||= begin
+        @zip_mutex.synchronize do
+          tmpzip = pwd.join("tmpops.zip")
+          FileUtils.rm(tmpzip) if tmpzip.exist?
+          DirZipper.zip(pwd, tmpzip)
+        end
+      end
     end
 
   end

data/lib/opswalrus/bootstrap.ops

@@ -1,4 +1,5 @@
-ssh_noprep in: :sequence do
+# ssh_noprep in: :sequence do
+ssh_noprep do
   puts "Bootstrapping #{to_s} (alias=#{self.alias})"
   _bootstrap_host()
 end

data/lib/opswalrus/bootstrap.sh

@@ -1,19 +1,37 @@
 #!/usr/bin/env bash
 
-# if brew is already installed, initialize this shell environment with brew
-if [ -x "$(command -v /home/linuxbrew/.linuxbrew/bin/brew)" ]; then
-  eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-
-  # exit early if ruby already exists
-  if [ -x "$(command -v $HOME/.rubies/ruby-3.2.2/bin/ruby)" ]; then
-    echo 'Ruby is already installed.' >&2
-
-    # make sure the latest opswalrus gem is installed
-    # todo: figure out how to install this differently, so that test versions will work
-    # gem install opswalrus
-    $HOME/.rubies/ruby-3.2.2/bin/gem install opswalrus
-
-    exit 0
+export PATH="$HOME/.local/share/rtx/bin:$PATH"    # this is key for activating rtx without running `eval "$($RTX activate bash)"`
+RTX="$HOME/.local/share/rtx/bin/rtx"
+rtx_init() { eval "$($RTX activate bash)"; }
+# RTX_RUBY="$HOME/.local/share/rtx/bin/rtx x ruby -- ruby"
+# RTX_GEM="$HOME/.local/share/rtx/bin/rtx x ruby -- gem"
+RTX_RUBY="$HOME/.local/share/rtx/shims/ruby"
+RTX_GEM="$HOME/.local/share/rtx/shims/gem"
+RUBY_CMD=$RTX_RUBY
+GEM_CMD=$RTX_GEM
+# RUBY_CMD="ruby"
+# GEM_CMD="gem"
+
+if [ -x $RTX ]; then
+  # rtx_init;
+  # eval "$($RTX activate bash)"
+  # if brew is already installed, initialize this shell environment with brew
+  # if [ -x "$(command -v /home/linuxbrew/.linuxbrew/bin/brew)" ]; then
+  if $RUBY_CMD -e "major, minor, patch = RUBY_VERSION.split('.'); exit 1 unless major.to_i >= 3"; then
+    # eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+    # exit early if ruby already exists
+    # if [ -x "$(command -v $HOME/.rubies/ruby-3.2.2/bin/ruby)" ]; then
+      echo 'Ruby is already installed.'
+
+      # make sure the latest opswalrus gem is installed
+      # todo: figure out how to install this differently, so that test versions will work
+      # gem install opswalrus
+      $GEM_CMD install opswalrus
+      $RTX reshim
+
+      exit 0
+    # fi
   fi
 fi
 
@@ -42,7 +60,7 @@ elif echo $OS | grep -q 'fedora'; then
   sudo dnf groupinstall -y 'Development Tools'
   sudo dnf -yq install procps-ng curl file git
 elif echo $OS | grep -q 'arch'; then
-  sudo pacman -Syu --noconfirm base-devel procps-ng curl file git
+  sudo pacman -Syu --noconfirm --needed base-devel procps-ng curl file git
 else
   echo "unsupported OS"
   exit 1
@@ -50,14 +68,15 @@ fi
 
 
 # install homebrew
-NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+# NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
 # initialize brew in shell session
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+# install gcc, age
+# brew install gcc
+# brew install age    # https://github.com/FiloSottile/age
 
-# install gcc, ruby, age
-brew install gcc
-brew install age    # https://github.com/FiloSottile/age
 
 ### install ruby
 
@@ -67,14 +86,76 @@ brew install age    # https://github.com/FiloSottile/age
 
 # 2. via ruby-install
 # brew install bash grep wget curl md5sha1sum sha2 gnu-tar bzip2 xz patchutils gcc
-brew install ruby-install
-ruby-install --update
-ruby-install ruby 3.2.2
+# brew install ruby-install
+# ruby-install --update
+# ruby-install ruby 3.2.2
 
 # 3. rvm
 # gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 # \curl -sSL https://get.rvm.io | bash -s stable --autolibs=homebrew
 # rvm install 3.2.2
 
+# 4. rtx (asdf clone)
+if echo $OS | grep -q 'ubuntu'; then
+  # update package list
+  sudo apt update -qy
+
+  if [ -f /var/run/reboot-required ]; then
+    echo 'A system reboot is required!'
+    exit 1
+  fi
+
+  # install ruby dependencies
+  # see https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
+  sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq libgdbm6
+  if [ $? -ne 0 ]; then
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq libgdbm5
+  fi
+  sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm-dev libdb-dev uuid-dev
+
+  # restart services that need it
+  sudo needrestart -q -r a
+  sudo needrestart -q -r a
+  sudo needrestart -q -r a
+elif echo $OS | grep -q 'fedora'; then
+  # from https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
+  sudo yum install -y gcc patch bzip2 openssl-devel libyaml-devel libffi-devel readline-devel zlib-devel gdbm-devel ncurses-devel
+elif echo $OS | grep -q 'arch'; then
+  # from https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
+  sudo pacman -Syu --noconfirm --needed base-devel rust libffi libyaml openssl zlib
+else
+  echo "unsupported OS"
+  exit 1
+fi
+curl https://rtx.pub/install.sh | sh
+# eval "$($HOME/.local/share/rtx/bin/rtx activate bash)"
+$RTX use -g ruby@3.2
+$RTX reshim
+
+
+# 5. age
+if echo $OS | grep -q 'ubuntu'; then
+  # update package list
+  sudo apt update -qy
+
+  if [ -f /var/run/reboot-required ]; then
+    echo 'A system reboot is required!'
+    exit 1
+  fi
+
+  sudo DEBIAN_FRONTEND=noninteractive apt install -yq age
+
+  # restart services that need it
+  sudo needrestart -q -r a
+elif echo $OS | grep -q 'fedora'; then
+  sudo dnf -yq install age
+elif echo $OS | grep -q 'arch'; then
+  sudo pacman -Syu --noconfirm --needed age
+else
+  echo "unsupported OS"
+  exit 1
+fi
+
 # install opswalrus gem
-$HOME/.rubies/ruby-3.2.2/bin/gem install opswalrus
+$GEM_CMD install opswalrus
+$RTX reshim

data/lib/opswalrus/host.rb

@@ -6,6 +6,9 @@ require_relative "invocation"
 
 module OpsWalrus
 
+  OPS_GEM="$HOME/.local/share/rtx/shims/gem"
+  OPS_CMD="$HOME/.local/share/rtx/shims/ops"
+
   # the subclasses of HostProxy will define methods that handle method dispatch via HostProxyOpsFileInvocationBuilder objects
   class HostProxy
 
@@ -187,8 +190,9 @@ module OpsWalrus
         host
       end
 
-      # cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; /home/linuxbrew/.linuxbrew/bin/gem --conservative exec -g opswalrus ops"
-      cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; $HOME/.rubies/ruby-3.2.2/bin/gem --conservative exec -g opswalrus ops"
+      # cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; /home/linuxbrew/.linuxbrew/bin/gem exec --conservative -g opswalrus ops"
+      # cmd = "OPS_GEM=\"#{OPS_GEM}\" OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; $OPS_GEM exec --conservative -g opswalrus ops"
+      cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; #{OPS_CMD}"
       cmd << " -v" if verbose
       cmd << " #{ops_command.to_s}"
       cmd << " #{ops_command_options.to_s}" if ops_command_options

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.26"
+  VERSION = "1.0.28"
 end

data/vms/web-fedora/Vagrantfile

@@ -29,6 +29,9 @@ Vagrant.configure("2") do |config|
   # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.28
 platform: ruby
 authors:
 - David Ellis