vtk 0.9.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85418afc912bae589d63f1c49bb87e5b2b52c9ea55c22a109ac10353fd117dfa
-  data.tar.gz: 79d0f75328fb01a56e2bee827438f1a0f507c6bdf778c5a0a3886c03d931f760
+  metadata.gz: 6acd180a7e7d3839aebff0617c306c092205492ab3c5ce124f3b5e957970e42b
+  data.tar.gz: c2c5fe18ee04efc2624eb092125c4c738d041e854173d1f934543cb5dbe8dcd2
 SHA512:
-  metadata.gz: 2020a6dcb32f0140a4a256a4a1b22a12da93ff386b5cec61589bb8cc91d03d0e36fbe77c0eb0aa3c40d18a6d411e7cc24666795283c555e23fdb41887dd09ec7
-  data.tar.gz: d36d1e80cf8a0a06943618203c5cf66e29413b227f516180007112ac2883fbc1151e1d7bb9e8c814182953637cc03b296ad232d3b393084e9dacafef11652f1f
+  metadata.gz: 06b298ec4d35bb31e1472913c305377649ef70399cc87eb2818fae5c5f4f6395be90516df1cfb16aa2cdd4ba9ae8bccb9caec475654fa2c98b26e17be5a070fd
+  data.tar.gz: 793f7811c57a9167f17704a14105a4b8d1624974f910295088a3d72c29528e84f2d57921ff073a7d59fee357953b3972d31f5fc5cc19876b66dcd20b2effe5fa

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-08-06 20:18:41 UTC using RuboCop version 1.8.1.
+# on 2023-12-15 17:05:02 UTC using RuboCop version 1.59.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,4 +9,9 @@
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 405
+  Max: 403
+
+# Offense count: 2
+Style/OpenStructUse:
+  Exclude:
+    - 'lib/vtk/commands/socks/setup.rb'

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.4
+ruby 3.2.2

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.9.4](https://github.com/department-of-veterans-affairs/vtk/tree/v0.9.4) (2022-04-11)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/vtk/compare/v0.9.3...v0.9.4)
+
+**Merged pull requests:**
+
+- Bump version to 0.9.4 [\#30](https://github.com/department-of-veterans-affairs/vtk/pull/30) ([rmtolmach](https://github.com/rmtolmach))
+- Update SOCKS request url [\#29](https://github.com/department-of-veterans-affairs/vtk/pull/29) ([rmtolmach](https://github.com/rmtolmach))
+
+## [v0.9.3](https://github.com/department-of-veterans-affairs/vtk/tree/v0.9.3) (2021-09-23)
+
+[Full Changelog](https://github.com/department-of-veterans-affairs/vtk/compare/v0.9.2...v0.9.3)
+
 ## [v0.9.2](https://github.com/department-of-veterans-affairs/vtk/tree/v0.9.2) (2021-08-11)
 
 [Full Changelog](https://github.com/department-of-veterans-affairs/vtk/compare/v0.9.1...v0.9.2)
@@ -7,6 +20,7 @@
 **Merged pull requests:**
 
 - Case insensitively check for Microsoft in /proc/version [\#21](https://github.com/department-of-veterans-affairs/vtk/pull/21) ([ericboehs](https://github.com/ericboehs))
+- VTK Socks Setup for Windows \(via WSL\) [\#19](https://github.com/department-of-veterans-affairs/vtk/pull/19) ([ericboehs](https://github.com/ericboehs))
 
 ## [v0.9.1](https://github.com/department-of-veterans-affairs/vtk/tree/v0.9.1) (2021-08-06)
 
@@ -14,7 +28,6 @@
 
 **Merged pull requests:**
 
-- VTK Socks Setup for Windows \(via WSL\) [\#19](https://github.com/department-of-veterans-affairs/vtk/pull/19) ([ericboehs](https://github.com/ericboehs))
 - Add ops-access-request label to new issue [\#18](https://github.com/department-of-veterans-affairs/vtk/pull/18) ([jeff2d2](https://github.com/jeff2d2))
 
 ## [v0.9.0](https://github.com/department-of-veterans-affairs/vtk/tree/v0.9.0) (2021-08-02)

data/Gemfile

@@ -4,3 +4,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in vtk.gemspec
 gemspec
+
+group :development do
+  gem 'github_changelog_generator', '~> 1.15.0'
+  gem 'pry', '~> 0.13.0'
+  gem 'rake', '~> 13.0.0'
+  gem 'rspec', '~> 3.10.0'
+  gem 'rubocop', '~> 1.59'
+  gem 'rubocop-rake', '~> 0.5.0'
+  gem 'rubocop-rspec', '~> 2.0.0'
+end

data/lib/vtk/commands/socks/on.rb

@@ -30,14 +30,14 @@ module Vtk
 
         def connected?
           system "curl --max-time 2 -sL --proxy socks5h://127.0.0.1:#{port} sentry.vfs.va.gov 2> /dev/null | " \
-            'grep -q sentry-logo'
+                 'grep -q sentry-logo'
         end
 
         def connect_to_socks
           exit if system "lsof -Pi :#{port} -sTCP:LISTEN -t > /dev/null"
 
           Process.spawn "nohup ssh -vvv -o ServerAliveInterval=60 -o ConnectTimeout=5 socks -D #{port} -N" \
-            '> /tmp/socks.log 2>&1 &'
+                        '> /tmp/socks.log 2>&1 &'
         end
 
         def ensure_connection

data/lib/vtk/commands/socks/setup.rb

@@ -4,6 +4,7 @@ require_relative '../../command'
 require 'tty-prompt'
 require 'fileutils'
 require 'erb'
+require 'ostruct'
 
 module Vtk
   module Commands
@@ -11,7 +12,7 @@ module Vtk
       # Sets up socks access to the VA network
       class Setup < Vtk::Command
         PROXY_URL = 'https://raw.githubusercontent.com/department-of-veterans-affairs/va.gov-team/master/' \
-          'scripts/socks/proxy.pac'
+                    'scripts/socks/proxy.pac'
 
         attr_reader :ssh_config_path, :input, :output, :boot_script_path, :ssh_key_path, :prompt, :port, :skip_test
 
@@ -19,9 +20,9 @@ module Vtk
           @options = options
           @prompt = TTY::Prompt.new interrupt: :exit
           @port = options['port'] || '2001'
-          @boot_script_path = options['boot_script_path'] || "#{ENV['HOME']}/Library"
-          @ssh_key_path = options['ssh_key_path'] || "#{ENV['HOME']}/.ssh/id_rsa_vagov"
-          @ssh_config_path = options['ssh_config_path'] || "#{ENV['HOME']}/.ssh/config"
+          @boot_script_path = options['boot_script_path'] || "#{Dir.home}/Library"
+          @ssh_key_path = options['ssh_key_path'] || "#{Dir.home}/.ssh/id_rsa_vagov"
+          @ssh_config_path = options['ssh_config_path'] || "#{Dir.home}/.ssh/config"
           @skip_test = options['skip_test'] || false
 
           super()
@@ -170,7 +171,7 @@ module Vtk
 
           ssh_agent_add
           system 'git config --global credential.helper > /dev/null || ' \
-            "git config --global credential.helper 'cache --timeout=600'"
+                 "git config --global credential.helper 'cache --timeout=600'"
           cloned = system(
             "git clone --quiet#{' --depth 1' if macos?} --no-checkout --filter=blob:none #{repo_url} '/tmp/dova-devops'"
           )
@@ -230,7 +231,7 @@ module Vtk
 
           if File.exist? "#{ssh_config_path}.bak"
             log "!!! ERROR: Could not make backup of #{pretty_ssh_config_path} as #{pretty_ssh_config_path}.bak " \
-              'exists. Aborting.'
+                'exists. Aborting.'
             exit 1
           end
 
@@ -256,7 +257,7 @@ module Vtk
               IdentityFile #{pretty_ssh_key_path}
           CFG
 
-          IO.write ssh_config_path, keychain_config, mode: 'a'
+          File.write ssh_config_path, keychain_config, mode: 'a'
         end
 
         def ssh_config_configured_with_keychain?
@@ -330,7 +331,7 @@ module Vtk
         def wsl_configure_system_boot
           return true if File.exist? socks_bat
 
-          IO.write socks_bat, 'wsl nohup bash -c "/usr/bin/ssh socks -N &" < nul > nul 2>&1', mode: 'a'
+          File.write socks_bat, 'wsl nohup bash -c "/usr/bin/ssh socks -N &" < nul > nul 2>&1', mode: 'a'
         end
 
         def socks_bat
@@ -400,7 +401,7 @@ module Vtk
             autossh_path: `which autossh`.chomp,
             port: @port,
             boot_script_path: File.realpath(boot_script_path),
-            user: ENV['USER']
+            user: ENV.fetch('USER', nil)
           )
         end
 
@@ -429,7 +430,7 @@ module Vtk
             autossh_path: `which autossh`.chomp,
             port: @port,
             ssh_key_path: ssh_key_path,
-            user: ENV['USER']
+            user: ENV.fetch('USER', nil)
           )
         end
 
@@ -450,7 +451,7 @@ module Vtk
 
           log 'Configuring system proxy to use SOCKS tunnel...' do
             network_interfaces.map do |network_interface|
-              system %(networksetup -setautoproxyurl "#{network_interface}" "#{PROXY_URL}")
+              system %(sudo networksetup -setautoproxyurl "#{network_interface}" "#{PROXY_URL}")
             end.all?
           end
         end
@@ -479,10 +480,8 @@ module Vtk
         end
 
         def network_interfaces
-          @network_interfaces ||= begin
-            `networksetup -listallnetworkservices`.split("\n").drop(1).select do |network_interface|
-              `networksetup -getautoproxyurl "#{network_interface}"`.start_with?('URL: (null)')
-            end
+          @network_interfaces ||= `networksetup -listallnetworkservices`.split("\n").drop(1).select do |interface|
+            `networksetup -getautoproxyurl "#{interface}"`.start_with?('URL: (null)')
           end
         end
 
@@ -509,7 +508,7 @@ module Vtk
         end
 
         def pretty_path(path)
-          path.gsub ENV['HOME'], '~'
+          path.gsub Dir.home, '~'
         end
 
         def log(message)

data/lib/vtk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vtk
-  VERSION = '0.9.4'
+  VERSION = '1.0.0'
 end

data/vtk.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.metadata['documentation_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = 'https://github.com/department-of-veterans-affairs/vtk/blob/master/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,15 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '> 0.20.3'
   spec.add_dependency 'tty-command', '~> 0.10.0'
   spec.add_dependency 'tty-prompt', '~> 0.23.0'
-
-  spec.add_development_dependency 'github_changelog_generator', '~> 1.15.0'
-  spec.add_development_dependency 'pry', '~> 0.13.0'
-  spec.add_development_dependency 'rake', '~> 13.0.0'
-  spec.add_development_dependency 'rspec', '~> 3.10.0'
-  spec.add_development_dependency 'rubocop', '~> 1.8.0'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.5.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.0.0'
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vtk
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Eric Boehs
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -54,104 +54,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.0
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: This is a platform CLI tool for VFS developer usage.
 email:
 - eric.boehs@oddball.io
@@ -208,6 +110,7 @@ metadata:
   documentation_uri: https://github.com/department-of-veterans-affairs/vtk
   source_code_uri: https://github.com/department-of-veterans-affairs/vtk
   changelog_uri: https://github.com/department-of-veterans-affairs/vtk/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -223,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: A CLI for the platform