bundle_update_interactive 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f73540a0e6abc4e9cf56c3333420d4fede8f87694e12e4881670201a47313c
-  data.tar.gz: 3dc401815571eec01c46306dc76df3b741fa5506c944498dad56f4237543b1ba
+  metadata.gz: 29c88bba35c4c9dc4c8240fc82afaa24c6ca1285ceceef1a43eef812b40cf090
+  data.tar.gz: a2fe1b8c99049ace9618297eebe954f3f744219eb11dc7298364611069ed0eb8
 SHA512:
-  metadata.gz: 2c295be43958998c5c3680890f5652aff27828bca804e682aa2eef6d057963122c33168843337d0f177dce13c5a689098882e47b849d157b8f68d6b4af0f2409
-  data.tar.gz: '01549bc47257811dd3fc9088cbba0efffa7e0b4dd9208eb82f0279f47cad558e07a4aba087703f6ec2aa21f441834ba7c49660d4635ac58812e0a388bb0abe62'
+  metadata.gz: 534ea176d1c50e3caaafcf10c35fbd4f3ca5732cde8beab21bb3889ea6c85e7011dd52118f1d161dad9f0fb93a2046115fa3e30fc5b637764c02cb35d646b21f
+  data.tar.gz: 2c9fee79c3d3404daac0558c44ed79717e493d47155d58a73fa4485470e119d51cd6be315e4830f449c3c8f96a18ea726eb56bd992db3485d0e3e1cfe692ccf2

data/lib/bundle_update_interactive/cli/multi_select.rb

@@ -39,6 +39,8 @@ class BundleUpdateInteractive::CLI
           exit(130)
         }
       )
+      add_keybindings
+
       @pastel = BundleUpdateInteractive.pastel
     end
 
@@ -51,6 +53,13 @@ class BundleUpdateInteractive::CLI
 
     attr_reader :pastel, :table, :tty_prompt, :title
 
+    def add_keybindings
+      tty_prompt.on(:keypress) do |event|
+        tty_prompt.trigger(:keyup) if %w[k p].include?(event.value)
+        tty_prompt.trigger(:keydown) if %w[j n].include?(event.value)
+      end
+    end
+
     def help
       [
         pastel.dim("\nPress <space> to select, ↑/↓ move, <ctrl-a> all, <ctrl-r> reverse, <enter> to finish."),

data/lib/bundle_update_interactive/cli/table.rb

@@ -28,7 +28,7 @@ class BundleUpdateInteractive::CLI
 
     def render
       lines = [render_header]
-      rows.each_key { |name| lines << render_gem(name) }
+      rows.keys.sort.each { |name| lines << render_gem(name) }
       lines.join("\n")
     end
 

data/lib/bundle_update_interactive/cli/thor_ext.rb

@@ -50,7 +50,7 @@ class BundleUpdateInteractive::CLI
 
         if given_args.first == "help"
           retry_with_args = ["help"] if given_args.length > 1
-        elsif e.unknown.intersect?(%w[-h --help])
+        elsif (e.unknown & %w[-h --help]).any?
           retry_with_args = ["help", (given_args - e.unknown).first]
         end
         raise unless retry_with_args.any?

data/lib/bundle_update_interactive/outdated_gem.rb

@@ -2,19 +2,21 @@
 
 module BundleUpdateInteractive
   class OutdatedGem
-    attr_reader :current_lockfile_entry, :updated_lockfile_entry, :gemfile_groups
-    attr_writer :vulnerable
+    attr_accessor :name,
+                  :gemfile_groups,
+                  :git_source_uri,
+                  :current_version,
+                  :current_git_version,
+                  :updated_version,
+                  :updated_git_version
 
-    def initialize(current_lockfile_entry:, updated_lockfile_entry:, gemfile_groups:)
-      @current_lockfile_entry = current_lockfile_entry
-      @updated_lockfile_entry = updated_lockfile_entry
-      @gemfile_groups = gemfile_groups
-      @changelog_locator = ChangelogLocator.new
+    attr_writer :rubygems_source, :vulnerable
+
+    def initialize(**attrs)
       @vulnerable = nil
-    end
+      @changelog_locator = ChangelogLocator.new
 
-    def name
-      current_lockfile_entry.name
+      attrs.each { |name, value| public_send(:"#{name}=", value) }
     end
 
     def semver_change
@@ -25,13 +27,17 @@ module BundleUpdateInteractive
       @vulnerable
     end
 
+    def rubygems_source?
+      @rubygems_source
+    end
+
     def changelog_uri
       return @changelog_uri if defined?(@changelog_uri)
 
       @changelog_uri =
         if git_version_changed?
           "https://github.com/#{github_repo}/compare/#{current_git_version}...#{updated_git_version}"
-        elsif updated_lockfile_entry.rubygems_source?
+        elsif rubygems_source?
           changelog_locator.find_changelog_uri(name: name, version: updated_version.to_s)
         else
           begin
@@ -42,22 +48,6 @@ module BundleUpdateInteractive
         end
     end
 
-    def current_version
-      current_lockfile_entry.version
-    end
-
-    def updated_version
-      updated_lockfile_entry.version
-    end
-
-    def current_git_version
-      current_lockfile_entry.git_version
-    end
-
-    def updated_git_version
-      updated_lockfile_entry.git_version
-    end
-
     def git_version_changed?
       current_git_version && updated_git_version && current_git_version != updated_git_version
     end
@@ -69,8 +59,7 @@ module BundleUpdateInteractive
     def github_repo
       return nil unless updated_git_version
 
-      updated_lockfile_entry.git_source_uri.to_s[%r{^(?:git@github.com:|https://github.com/)([^/]+/[^/]+?)(:?\.git)?(?:$|/)}i,
-                                                 1]
+      git_source_uri.to_s[%r{^(?:git@github.com:|https://github.com/)([^/]+/[^/]+?)(:?\.git)?(?:$|/)}i, 1]
     end
   end
 end

data/lib/bundle_update_interactive/report.rb

@@ -21,16 +21,12 @@ module BundleUpdateInteractive
 
     def initialize(gemfile:, current_lockfile:, updated_lockfile:)
       @current_lockfile = current_lockfile
-      outdated_names = current_lockfile.entries.each_with_object([]) do |current_entry, arr|
-        updated_entry = updated_lockfile[current_entry.name]
-        arr << current_entry.name if current_entry.older_than?(updated_entry)
-      end
-      @outdated_gems ||= outdated_names.sort.each_with_object({}) do |name, hash|
-        hash[name] = OutdatedGem.new(
-          current_lockfile_entry: current_lockfile[name],
-          updated_lockfile_entry: updated_lockfile[name],
-          gemfile_groups: gemfile[name]&.groups
-        )
+      @outdated_gems ||= current_lockfile.entries.each_with_object({}) do |current_lockfile_entry, hash|
+        name = current_lockfile_entry.name
+        updated_lockfile_entry = updated_lockfile[name]
+        next unless current_lockfile_entry.older_than?(updated_lockfile_entry)
+
+        hash[name] = build_outdated_gem(current_lockfile_entry, updated_lockfile_entry, gemfile[name]&.groups)
       end.freeze
     end
 
@@ -39,12 +35,14 @@ module BundleUpdateInteractive
     end
 
     def updateable_gems
-      outdated_gems.reject { |_, gem| gem.current_lockfile_entry.exact_dependency? }
+      @updateable_gems ||= outdated_gems.reject do |name, _|
+        current_lockfile[name].exact_dependency?
+      end.freeze
     end
 
     def expand_gems_with_exact_dependencies(*gem_names)
       gem_names.flatten!
-      gem_names.flat_map { [_1, *outdated_gems[_1].current_lockfile_entry.exact_dependencies] }.uniq
+      gem_names.flat_map { |name| [name, *current_lockfile[name].exact_dependencies] }.uniq
     end
 
     def scan_for_vulnerabilities!
@@ -55,7 +53,7 @@ module BundleUpdateInteractive
       vulnerable_gem_names = Set.new(audit_report.vulnerable_gems.map(&:name))
 
       outdated_gems.each do |name, gem|
-        gem.vulnerable = vulnerable_gem_names.intersect?([name, *current_lockfile[name].exact_dependencies])
+        gem.vulnerable = (vulnerable_gem_names & [name, *current_lockfile[name].exact_dependencies]).any?
       end
       true
     end
@@ -68,5 +66,18 @@ module BundleUpdateInteractive
     private
 
     attr_reader :current_lockfile
+
+    def build_outdated_gem(current_lockfile_entry, updated_lockfile_entry, gemfile_groups)
+      OutdatedGem.new(
+        name: current_lockfile_entry.name,
+        gemfile_groups: gemfile_groups,
+        rubygems_source: updated_lockfile_entry.rubygems_source?,
+        git_source_uri: updated_lockfile_entry.git_source_uri&.to_s,
+        current_version: current_lockfile_entry.version.to_s,
+        current_git_version: current_lockfile_entry.git_version&.strip,
+        updated_version: updated_lockfile_entry.version.to_s,
+        updated_git_version: updated_lockfile_entry.git_version&.strip
+      )
+    end
   end
 end

data/lib/bundle_update_interactive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BundleUpdateInteractive
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundle_update_interactive
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler