govuk-connect 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b14cf8cbdd487cc57a5f1aad1cbb1a5164a6e7a5f5bc4ab986f0560dd092ab7
-  data.tar.gz: '01769936fa3621d0dcc7e61ff9f1dc9c7a7f0852b2f587029c8ca73bcba78a15'
+  metadata.gz: 0cec686de41c55db9dbb4d680aa596cdb8ac039845011bb4aa435b94eb3f4e9f
+  data.tar.gz: bb8eb071164ade05f8dbbe1e2e3bc780ea883dc848b384de14f2ea795d5920f3
 SHA512:
-  metadata.gz: 1f2705de184fc9b9f39dcc1705ff7c5508a456e9db23f217a2918f50a07032fce9bb3269cbdbd8ca7f15e56b8957aed2d6023015615db2d32fd2d7acfb69f378
-  data.tar.gz: 2264b408122a922c12a90c9ca9843215e8e6fa52a5041dd1995fcee1b32183190f13dc12c41aee1e07988147abac97d5d197e7e491f0cfadeb8f8e503feb6e44
+  metadata.gz: 35f339438073571faee19d7da1a8d191d15a8cd389b3786f686c1ab59e3c3e0a23bddd5948135578b5cc87572d971c896c4c4feb0287e0c2b2acfa3e79c16da2
+  data.tar.gz: 7b50c8d20288f0206dc8d312f8f4c05b0f0763c1437726865af18c2cf7f0ceaebeb1a99135044a3cd1f49d4be548c7327a6d784b0b16031114cef6ad446f4102

data/lib/govuk_connect/cli.rb

@@ -227,7 +227,7 @@ class GovukConnect::CLI
   def ssh_username
     @ssh_username ||= begin
       if File.exist? config_file
-        config_ssh_username = YAML.load_file(config_file)["ssh_username"]
+        config_ssh_username = load_yaml(config_file)["ssh_username"]
       end
 
       config_ssh_username || ENV["USER"]
@@ -235,9 +235,7 @@ class GovukConnect::CLI
   end
 
   def ssh_identity_file
-    @ssh_identity_file ||= begin
-      YAML.load_file(config_file)["ssh_identity_file"] if File.exist? config_file
-    end
+    @ssh_identity_file ||= (load_yaml(config_file)["ssh_identity_file"] if File.exist? config_file)
   end
 
   def ssh_identity_arguments
@@ -254,7 +252,7 @@ class GovukConnect::CLI
 
   def govuk_node_list_classes(environment, hosting)
     log "debug: looking up classes in #{hosting}/#{environment}"
-    classes = ssh_capture("govuk_node_list --classes").sort
+    classes = ssh_capture(environment, hosting, "govuk_node_list --classes").sort
 
     log "debug: classes:"
     classes.each { |c| log " - #{c}" }
@@ -315,12 +313,12 @@ class GovukConnect::CLI
     hieradata_file = File.join(local_hieradata_root, "#{environment}.yaml")
     log "debug: reading #{hieradata_file}"
 
-    environment_specific_hieradata = YAML.load_file(hieradata_file)
+    environment_specific_hieradata = load_yaml(hieradata_file)
 
     if environment_specific_hieradata["node_class"]
       environment_specific_hieradata["node_class"]
     else
-      common_hieradata = YAML.load_file(
+      common_hieradata = load_yaml(
         File.join(local_hieradata_root, "common.yaml"),
       )
 
@@ -328,6 +326,21 @@ class GovukConnect::CLI
     end
   end
 
+  def load_yaml(file_path)
+    # Psych (the gem that provides YAML parsing) introduced a new method,
+    # safe_load_file, in version 3.3 (which shipped with Ruby 3.0) and in
+    # version 4 (shipped with Ruby 3.1) the API for load_file changed and will
+    # error with GOV.UK hieradata.
+    #
+    # Once this gem no longer supports Ruby 2.x (or pins to a version of Psych)
+    # we can remove this conditional and use YAML.safe_load_file only
+    if YAML.respond_to?(:safe_load_file)
+      YAML.safe_load_file(file_path, aliases: true)
+    else
+      YAML.load_file(file_path)
+    end
+  end
+
   def node_classes_for_environment_and_hosting(environment, hosting)
     govuk_puppet_node_class_data(
       environment,
@@ -664,7 +677,7 @@ class GovukConnect::CLI
         info EXAMPLES
         print_empty_line
         info bold("CONNECTION TYPES")
-        types.keys.each do |x|
+        types.each_key do |x|
           info "  #{x}"
           description = CONNECTION_TYPE_DESCRIPTIONS[x]
           info "    #{description}" if description
@@ -966,7 +979,7 @@ class GovukConnect::CLI
       warn @option_parser.help
 
       warn "\nValid connection types are:\n"
-      types.keys.each do |x|
+      types.each_key do |x|
         warn " - #{x}"
       end
       print_empty_line
@@ -982,7 +995,7 @@ class GovukConnect::CLI
       error "error: unknown connection type: #{type}\n"
 
       warn "Valid connection types are:\n"
-      types.keys.each do |x|
+      types.each_key do |x|
         warn " - #{x}"
       end
       print_empty_line
@@ -1004,7 +1017,7 @@ class GovukConnect::CLI
       error "error: unknown environment '#{environment}'"
       print_empty_line
       info "Valid environments are:"
-      JUMPBOXES.keys.each { |e| info " - #{e}" }
+      JUMPBOXES.each_key { |e| info " - #{e}" }
       exit 1
     end
 

data/lib/govuk_connect/version.rb

@@ -1,3 +1,3 @@
 module GovukConnect
-  VERSION = "0.5.1".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-connect
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -56,16 +56,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 4.3.0
 description: Command line tool to connect to GOV.UK infrastructure
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -90,14 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.19
 signing_key: 
 specification_version: 4
 summary: govuk-connect command line tool