govuk-connect 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71cb0967c5cf0450aa63b5abbf25ce9d964d7ddfcb97a57fea0c011f59961624
-  data.tar.gz: ee788418b7e3e127bc4f5bd8ceb7cf35b37a9df889a4200f20fa392b37701882
+  metadata.gz: 40b05abfbca40a3b8f8729a78372915eec32ab961f6f6906b46239929dbf3425
+  data.tar.gz: 17210ea67f872030a904f674a24635f9d39f4077386e779755b5674f737623fa
 SHA512:
-  metadata.gz: 9d684a2ef79be515cdb3c1f71abb8dc5ce34fe7ca4315d2e62403a583a8e220e03cfc7c5ef1980211a741e1ca7603b0063d20d35b4974eec378ecd26e67af242
-  data.tar.gz: d811b9e5403750cc048e78d8c440bddb0bf206690301b22a7d76f2ab306a2967078f0932d785f757366bd977a45d0befc01c2a6f4202edce79d41d0386d1df18
+  metadata.gz: 91c2408222918dc7557b326a612c580027a8b2e81d375c5d35af2dca875557ae882078df1e743874118f5b3feff6671d50b0009f55d0e30a6bbf4d55aedd398b
+  data.tar.gz: d205e9baf15907debb7be37205fc58d1a8322d82379dad5be5c8e931351f2a9ec51e525f2b7783e243afed6af62d4d9a1633dc71503ee2f77496b052ab0bde5f

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
@@ -741,7 +754,7 @@ class GovukConnect::CLI
     end
 
     if app_name_and_number.include? ":"
-      app_name, number = name_and_number.split ":"
+      app_name, number = app_name_and_number.split ":"
 
       number = number.to_i
     else
@@ -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.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-connect
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2022-02-23 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.6'
 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.7
 signing_key: 
 specification_version: 4
 summary: govuk-connect command line tool