gemdiff 3.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276426b5d60d524b3a4d4f9ed9336611b27d7f0f62aad51e1fda70890e0a3986
-  data.tar.gz: 81914e3e3450d20cb22b0e7c92998c28223771a7d8d28c7f566bb5eceb4e948a
+  metadata.gz: 8561d98525b5af6630489157667b734a6246b043f1b61aad0eb5520b59fa2151
+  data.tar.gz: d9ba487fb07a322ec4a00cbde23c3b85d9409131b47089008c7e8045f6260f64
 SHA512:
-  metadata.gz: 978a8d3a447982f3c9cd41927ef61a86502bd7eec2fc9c22e4ab7866cca79c42924c10d87323e60e02cc9de066ed8737ee79eced4d8c696c5ffc9ac7757e4149
-  data.tar.gz: a651dd788880067ca9607b0c71aa7c6b105b2095b2b350bd169f9b19fa88df2f62386bdd1514b20a306be470c100a3ad90c4b24cd4a1fba401c4afb85a0c9bbe
+  metadata.gz: b864867a77e56dd1a5980bd3e8f915679d92b26ec409a0b49b5b3036ad1f661928a3e3f25a281faae8e97c34e6a395d4a3dfad1b5f768141c31d65882ec84dfb
+  data.tar.gz: 5eb7e674d4d49b38e0bbb7f90ae5636ff645bf273daba23e31ec5894e3b33ef6975722bb8ecf59b76f8f9e369952af5a5a98c1482c1629ab01cce33156cd64da

data/README.md

@@ -1,12 +1,12 @@
 # gemdiff
 
 [![Gem Version](https://badge.fury.io/rb/gemdiff.svg)](http://rubygems.org/gems/gemdiff)
-[![Build Status](https://travis-ci.org/teeparham/gemdiff.svg?branch=master)](https://travis-ci.org/teeparham/gemdiff)
+[![CI](https://github.com/teeparham/gemdiff/actions/workflows/test.yml/badge.svg)](https://github.com/teeparham/gemdiff/actions/workflows/test.yml)
 
 `gemdiff` is a command-line tool to find source code for ruby gems.
 It connects gem version management (rubygems + bundler) with source code (GitHub).
 
-`gemdiff` provides commands to 
+`gemdiff` provides commands to
 * Find GitHub repositories for gems
 * Open the compare view for two gem versions
 * Inspect your bundle and list all the available updates
@@ -146,8 +146,8 @@ to run with the `open` command with a URL argument):
 $ gemdiff open pundit
 ```
 
-You may also use `.` as a shortcut for the current directory name. 
-This is helpful if you would like to quickly open the gem you are developing, for example: 
+You may also use `.` as a shortcut for the current directory name.
+This is helpful if you would like to quickly open the gem you are developing, for example:
 
 ```sh
 $ pwd
@@ -175,7 +175,7 @@ $ gemdiff compare pundit 1.0.0 0.3.0
 You can compare a version with a branch name:
 
 ```sh
-$ gemdiff compare arel 6.0.0 master
+$ gemdiff compare arel 6.0.0 main
 ```
 
 ### `gemdiff releases [gem]`
@@ -186,12 +186,12 @@ Open the repository's release history page:
 $ gemdiff releases haml
 ```
 
-### `gemdiff master [gem]`
+### `gemdiff main [gem]`
 
-Open the repository's master branch commit history page:
+Open the repository's main branch commit history page:
 
 ```sh
-$ gemdiff master haml
+$ gemdiff main haml
 ```
 
 ### `gemdiff help`
@@ -220,8 +220,8 @@ pwd
 /Users/you/ruby/somegem
 gemdiff find .
 gemdiff open .
-gemdiff master .
-gemdiff compare . 1.2.3 master
+gemdiff main .
+gemdiff compare . 1.2.3 main
 ```
 
 ### Authenticated GitHub API requests
@@ -245,11 +245,11 @@ releases, submit an issue to the gem maintainer to tag their releases.
 
 3. The versions must be tagged using the standard format of `v1.2.3`. If you find gems that follow
 a non-standard format (such as `1.2.3`), please open an issue or submit a pull request.
-See [`lib/gemdiff/outdated_gem.rb`](https://github.com/teeparham/gemdiff/blob/master/lib/gemdiff/outdated_gem.rb).
+See [`lib/gemdiff/outdated_gem.rb`](https://github.com/teeparham/gemdiff/blob/main/lib/gemdiff/outdated_gem.rb).
 
 4. Encourage gem maintainers to enter the GitHub repository URL in the `homepage` field of their gemspec
 or anywhere in the description. If you find exceptions, open an issue or submit a pull request.
-See [`lib/gemdiff/repo_finder.rb`](https://github.com/teeparham/gemdiff/blob/master/lib/gemdiff/repo_finder.rb).
+See [`lib/gemdiff/repo_finder.rb`](https://github.com/teeparham/gemdiff/blob/main/lib/gemdiff/repo_finder.rb).
 
 ### More Info
 

data/bin/gemdiff

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 
 # Exit cleanly from an early interrupt
 Signal.trap("INT") { exit 1 }

data/lib/gemdiff/bundle_inspector.rb

@@ -2,6 +2,8 @@
 
 module Gemdiff
   class BundleInspector
+    BUNDLE_OUTDATED_PARSE_REGEX = /\A([^\s]+)\s\(newest\s([^,]+),\sinstalled\s([^,\)]+).*\z/.freeze
+
     def list
       @list ||=
         outdated
@@ -21,24 +23,13 @@ module Gemdiff
     private
 
     def bundle_outdated_strict
-      `bundle outdated --strict`
+      `bundle outdated --strict --parseable`
     end
 
     def new_outdated_gem(line)
-      return unless line.start_with?("  * ")
-
-      # clean & convert new & old output to same format
-      items = line.delete("*")
-                  .gsub("(newest", "")
-                  .gsub(", installed", " >")
-                  .gsub(/([(),])/, "")
-                  .split(" ")
-
-      # ["haml", "4.0.5", ">", "4.0.4"]
-      # ["a_forked_gem", "0.7.0", "99ddbc9", ">", "0.7.0", "1da2295"]
+      return unless match = BUNDLE_OUTDATED_PARSE_REGEX.match(line)
 
-      return if items[3] == ">" # skip non-gems for now
-      OutdatedGem.new(items[0], items[3], items[1])
+      OutdatedGem.new(match[1], match[2], match[3])
     end
   end
 end

data/lib/gemdiff/cli.rb

@@ -34,9 +34,9 @@ module Gemdiff
       find(gem_name).releases
     end
 
-    desc "master <gem>", "Open the github master branch commits page for a gem"
-    def master(gem_name)
-      find(gem_name).master
+    desc "main <gem>", "Open the github main branch commits page for a gem"
+    def main(gem_name)
+      find(gem_name).main
     end
 
     desc "compare <gem> [<old> <new>]", <<~DESC
@@ -102,10 +102,11 @@ module Gemdiff
         return
       end
       response = ask("\nCommit? (c to commit, r to reset, else do nothing)")
-      if response == "c"
+      case response
+      when "c"
         gem_updater.commit
-        puts "\n" + colorize_git_output(gem_updater.show)
-      elsif response == "r"
+        puts "\n#{colorize_git_output(gem_updater.show)}"
+      when "r"
         puts gem_updater.reset
       end
     end

data/lib/gemdiff/gem_updater.rb

@@ -49,7 +49,7 @@ module Gemdiff
     end
 
     def version(changed_line)
-      changed_line.split("\n").first.split(" ").last.gsub(/[()]/, "")
+      changed_line.split("\n").first.split.last.gsub(/[()]/, "")
     end
 
     # example returns:

data/lib/gemdiff/outdated_gem.rb

@@ -68,7 +68,7 @@ module Gemdiff
     end
 
     def commits_url
-      clean_url "#{repo}/commits/master"
+      clean_url "#{repo}/commits/main"
     end
 
     def compare_message
@@ -79,7 +79,7 @@ module Gemdiff
       clean_url "#{repo}/compare/#{compare_part}"
     end
 
-    def master
+    def main
       open_url(commits_url) if repo?
     end
 
@@ -137,7 +137,7 @@ module Gemdiff
     # swap versions if needed
     def old_new(v_old, v_new)
       return [v_old, v_new] unless v_old && v_new
-      if v_old == "master" || (Gem::Version.new(v_old) > Gem::Version.new(v_new))
+      if v_old == "main" || (Gem::Version.new(v_old) > Gem::Version.new(v_new))
         [v_new, v_old]
       else
         [v_old, v_new]

data/lib/gemdiff/repo_finder.rb

@@ -89,6 +89,16 @@ module Gemdiff
         zeus:                     "burke/zeus",
       }.freeze
 
+    PERMITTED_GEMSPEC_CLASSES =
+      %w[
+        Gem::Dependency
+        Gem::Requirement
+        Gem::Specification
+        Gem::Version
+        Symbol
+        Time
+      ].freeze
+
     class << self
       # Try to get the homepage from the gemspec
       # If not found, search github
@@ -104,7 +114,11 @@ module Gemdiff
         end
         yaml = gemspec(gem_name)
         return if yaml.to_s.empty?
-        spec = YAML.load(yaml)
+        spec = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+          YAML.safe_load(yaml, permitted_classes: PERMITTED_GEMSPEC_CLASSES)
+        else
+          YAML.load(yaml)
+        end
         return clean_url(spec.homepage) if spec.homepage =~ GITHUB_REPO_REGEX
         match = spec.description.to_s.match(GITHUB_REPO_REGEX)
         match && clean_url(match[0])

data/lib/gemdiff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gemdiff
-  VERSION = "3.0.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemdiff
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Command-line utility to find source repositories for ruby gems, open
   common GitHub pages, compare gem versions, and simplify gem update workflow in git.
 email:
@@ -126,14 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: Find source repositories for ruby gems. Open, compare, and update outdated