mux_tf 0.8.4 → 0.9.0

data/lib/mux_tf/yaml_cache.rb

@@ -1,34 +1,40 @@
+# frozen_string_literal: true
+
 require "yaml/store"
 
-module YAML
-  # Explaination from @h4xnoodle:
-  #
-  # Since ruby 3+ and psych 4+, the yaml loading became extra safe so the
-  # expired_at timestamp in the yaml cache is no longer parsing for whatever reason.
-  #
-  # Attempts were made with
-  #
-  # `@store = YAML::Store.new path`
-  # =>
-  # `@store = YAML::Store.new(path, { aliases: true, permitted_classes: [Time] })`
-  # to get it to work but that didn't help, so decided to just bypass the safe
-  # loading, since the file is controlled by us for the version checking.
-  #
-  # This is to override the way that psych seems to be loading YAML.
-  # Instead of using 'load' which needs work to permit the 'Time' class
-  # (which from above I tried that and it wasn't working so I decided to just
-  # bypass and use what it was doing before).
-  # This brings us back to the equivalent that was working before in that unsafe
-  # load was used before the psych upgrade.
-  #
-  # This change: https://my.diffend.io/gems/psych/3.3.2/4.0.0 
-  # is the changes that 'cause the problem' and so I'm 'fixing it' by using the old equivalent.
-  # 
-  # Maybe the yaml cache needs more work to have 
-  # `YAML::Store.new(path, { aliases: true, permitted_classes: [Time] }) work.`
-  #
-  class << self
-    alias_method :load, :unsafe_load
+# Ruby 2.7's YAML doesn't have a :unsafe_load method .. so we skip all that
+if YAML.singleton_methods.include?(:unsafe_load)
+  module YAML
+    # Explaination from @h4xnoodle:
+    #
+    # Since ruby 3+ and psych 4+, the yaml loading became extra safe so the
+    # expired_at timestamp in the yaml cache is no longer parsing for whatever reason.
+    #
+    # Attempts were made with
+    #
+    # `@store = YAML::Store.new path`
+    # =>
+    # `@store = YAML::Store.new(path, { aliases: true, permitted_classes: [Time] })`
+    # to get it to work but that didn't help, so decided to just bypass the safe
+    # loading, since the file is controlled by us for the version checking.
+    #
+    # This is to override the way that psych seems to be loading YAML.
+    # Instead of using 'load' which needs work to permit the 'Time' class
+    # (which from above I tried that and it wasn't working so I decided to just
+    # bypass and use what it was doing before).
+    # This brings us back to the equivalent that was working before in that unsafe
+    # load was used before the psych upgrade.
+    #
+    # This change: https://my.diffend.io/gems/psych/3.3.2/4.0.0
+    # is the changes that 'cause the problem' and so I'm 'fixing it' by using the old equivalent.
+    #
+    # Maybe the yaml cache needs more work to have
+    # `YAML::Store.new(path, { aliases: true, permitted_classes: [Time] }) work.`
+    #
+    class << self
+      undef load # avoid a warning about the next line redefining load
+      alias load unsafe_load
+    end
   end
 end
 
@@ -55,13 +61,12 @@ module MuxTf
       end
 
       if info.nil? || info[:expires_at] < Time.now
-        if block_given?
-          value = yield
-          set(key, value, ttl: ttl)
-          return value
-        else
-          raise KeyError, info.nil? ? "no value at key: #{key}" : "value expired at key: #{key}"
-        end
+        raise KeyError, info.nil? ? "no value at key: #{key}" : "value expired at key: #{key}" unless block_given?
+
+        value = yield
+        set(key, value, ttl: ttl)
+        return value
+
       end
 
       info[:value]

data/lib/mux_tf.rb

@@ -6,6 +6,8 @@ require "shellwords"
 require "optparse"
 require "json"
 require "open3"
+require "digest/md5"
+require "tmpdir"
 
 require "piotrb_cli_utils"
 require "stateful_parser"
@@ -20,6 +22,7 @@ require "tty-table"
 require "dotenv"
 
 require_relative "./mux_tf/version"
+require_relative "./mux_tf/plan_filename_generator"
 require_relative "./mux_tf/once_helper"
 require_relative "./mux_tf/resource_tokenizer"
 require_relative "./mux_tf/cli"

data/mux_tf.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |spec|
   # spec.description   = 'TODO: Write a longer description or delete this line.'
   spec.homepage = "https://github.com/piotrb/mux_tf"
   spec.license = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
 
+  spec.metadata["rubygems_mfa_required"] = "true"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   # spec.metadata['changelog_uri'] = "TODO: Put your gem's CHANGELOG.md URL here."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Banasik
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - piotr@jane.app
 executables:
@@ -142,6 +142,7 @@ files:
 - lib/mux_tf/cli/mux.rb
 - lib/mux_tf/cli/plan_summary.rb
 - lib/mux_tf/once_helper.rb
+- lib/mux_tf/plan_filename_generator.rb
 - lib/mux_tf/plan_formatter.rb
 - lib/mux_tf/plan_summary_handler.rb
 - lib/mux_tf/resource_tokenizer.rb
@@ -155,9 +156,10 @@ homepage: https://github.com/piotrb/mux_tf
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/piotrb/mux_tf
   source_code_uri: https://github.com/piotrb/mux_tf
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,15 +167,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Terraform Multiplexing Scripts
 test_files: []