opswalrus 1.0.27 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63f73e2a4fddd7a8faa6a534357ca83e77e4fd218f5e3ffbc341c39f6d6bd7c
-  data.tar.gz: 9f3c9ab5ddb6cc735dc114447ddab95963b2f3179de078b28f1b3c6ce0a40770
+  metadata.gz: 95be80c5fc4ff5b54b579adbf681ae134f9f1e32ebfee9ee5654da294a6ee4ec
+  data.tar.gz: 7443c58118a65cb8643093de761a74c97f6f86c8f134a403d06f7864a26e156a
 SHA512:
-  metadata.gz: a08b0818cf1037f6e78cebf2a8ec037c10f33a715f64e60cd3f130825b087e80d187e33b33ee17e012f160473a825dfd9e8741fb9efb73267a1c205e36c3d68e
-  data.tar.gz: 324de6cf287e61401e874c4fce266838dc1f1074d42c3b058be6b2f69977c53eb1c49ac4a49b291efc411d71465611f6ca740c30f36bcb62e12d82d680e66b87
+  metadata.gz: 71d5e41176f93c0d01f07ff2c893de09b81776d1068bab235343b2cfb283c1bf7725cb1f64baf99762f93cef0a64a3817ff9f460cdb1b23f634f7f77aee9aaa0
+  data.tar.gz: 59aa3c3fb801afa462c83dbef214b2b4baba528924b1fc1f194ce792b212c762f991f5c89df7fd316e95a6875f8aef661168384145130bfe6723181b01ff5604

data/Gemfile.lock

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

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
 
@@ -188,7 +191,8 @@ module OpsWalrus
       end
 
       # cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; /home/linuxbrew/.linuxbrew/bin/gem exec --conservative -g opswalrus ops"
-      cmd = "OPSWALRUS_LOCAL_HOSTNAME='#{local_hostname_for_remote_host}'; $HOME/.rubies/ruby-3.2.2/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/ops_file_script.rb

@@ -75,6 +75,13 @@ module OpsWalrus
     end
   end
 
+  class EnvParams < InvocationParams
+    # params : Hash | ArrayOrHashNavigationProxy
+    def initialize(hashlike_params = ENV)
+      super(hashlike_params)
+    end
+  end
+
   class OpsFileScript
 
     def self.define_for(ops_file, ruby_script)

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -175,9 +175,9 @@ module OpsWalrus
     def env(*keys)
       keys = keys.map(&:to_s)
       if keys.empty?
-        @env
+        @runtime_env.env
       else
-        @env.dig(*keys)
+        @runtime_env.env.dig(*keys)
       end
     end
 

data/lib/opswalrus/runtime_environment.rb

@@ -234,9 +234,11 @@ module OpsWalrus
 
     attr_accessor :app
     attr_accessor :pty
+    attr_reader :env
 
     def initialize(app)
       @app = app
+      @env = EnvParams.new(ENV)
       @bundle_load_path = LoadPath.new(self, @app.bundle_dir)
       @app_load_path = LoadPath.new(self, @app.pwd)
 

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.27"
+  VERSION = "1.0.29"
 end

data/lib/opswalrus/walrus_lang.rb

@@ -63,6 +63,12 @@ module WalrusLang
   end
 end
 
+class String
+  def render_template(hash)
+    WalrusLang.render(self, hash)
+  end
+end
+
 class Hash
   def to_binding
     OpenStruct.new(self).instance_eval { binding }
@@ -77,7 +83,7 @@ end
 
 def mustache(&block)
   template_string = block.call
-  template_string =~ /{{.*}}/ ? WalrusLang.render(block.call, block.binding) : template_string
+  template_string =~ /{{.*}}/ ? WalrusLang.render(template_string, block.binding) : template_string
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.29
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print