bundleup 1.0.0 → 2.1.0

data/lib/bundleup/gemfile.rb

@@ -1,17 +1,59 @@
 module Bundleup
   class Gemfile
+    attr_reader :path
+
     def initialize(path="Gemfile")
+      @path = path
       @contents = IO.read(path)
     end
 
-    def gem_comment(gem_name)
-      inline_comment(gem_name) || prefix_comment(gem_name)
+    def gem_comments
+      gem_names.each_with_object({}) do |gem_name, hash|
+        comment = inline_comment(gem_name) || prefix_comment(gem_name)
+        hash[gem_name] = comment unless comment.nil?
+      end
+    end
+
+    def gem_pins_without_comments
+      (gem_names - gem_comments.keys).each_with_object({}) do |gem_name, hash|
+        next unless (match = gem_declaration_with_pinned_version_re(gem_name).match(contents))
+
+        version = match[1]
+        hash[gem_name] = VersionSpec.parse(version)
+      end
+    end
+
+    def relax_gem_pins!(gem_names)
+      gem_names.each do |gem_name|
+        rewrite_gem_version!(gem_name, &:relax)
+      end
+    end
+
+    def shift_gem_pins!(new_gem_versions)
+      new_gem_versions.each do |gem_name, new_version|
+        rewrite_gem_version!(gem_name) { |version_spec| version_spec.shift(new_version) }
+      end
     end
 
     private
 
+    def rewrite_gem_version!(gem_name)
+      found = contents.sub!(gem_declaration_with_pinned_version_re(gem_name)) do |match|
+        version = Regexp.last_match[1]
+        match[Regexp.last_match.regexp, 1] = yield(VersionSpec.parse(version)).to_s
+        match
+      end
+      raise "Can't rewrite version for #{gem_name}; it does not have a pin" unless found
+
+      IO.write(path, contents)
+    end
+
     attr_reader :contents
 
+    def gem_names
+      contents.scan(/^\s*gem\s+["'](.+?)["']/).flatten.uniq
+    end
+
     def inline_comment(gem_name)
       contents[/#{gem_declaration_re(gem_name)}.*(#\s*\S+.*)/, 1]
     end
@@ -23,5 +65,9 @@ module Bundleup
     def gem_declaration_re(gem_name)
       /^\s*gem\s+["']#{Regexp.escape(gem_name)}["']/
     end
+
+    def gem_declaration_with_pinned_version_re(gem_name)
+      /#{gem_declaration_re(gem_name)},\s*["']([^'"]+)["']\s*$/
+    end
   end
 end

data/lib/bundleup/logger.rb

@@ -0,0 +1,64 @@
+require "io/console"
+
+module Bundleup
+  class Logger
+    extend Forwardable
+    def_delegators :@stdout, :print, :puts, :tty?
+    def_delegators :@stdin, :gets
+
+    def initialize(stdin: $stdin, stdout: $stdout, stderr: $stderr)
+      @stdin = stdin
+      @stdout = stdout
+      @stderr = stderr
+      @spinner = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].cycle
+    end
+
+    def ok(message)
+      puts Colors.green("✔ #{message}")
+    end
+
+    def error(message)
+      stderr.puts Colors.red("ERROR: #{message}")
+    end
+
+    def attention(message)
+      puts Colors.yellow(message)
+    end
+
+    def confirm?(question)
+      print Colors.yellow(question.sub(/\??\z/, " [Yn]? "))
+      gets =~ /^($|y)/i
+    end
+
+    def clear_line
+      print "\r".ljust(console_width - 1)
+      print "\r"
+    end
+
+    def while_spinning(message, &block)
+      thread = Thread.new(&block)
+      thread.report_on_exception = false
+      message = message.ljust(console_width - 2)
+      print "\r#{Colors.blue([spinner.next, message].join(' '))}" until wait_for_exit(thread, 0.1)
+      thread.value
+    end
+
+    private
+
+    attr_reader :spinner, :stderr
+
+    def console_width
+      width = IO.console.winsize.last if tty?
+      width.to_i.positive? ? width : 80
+    end
+
+    def wait_for_exit(thread, seconds)
+      thread.join(seconds)
+    rescue StandardError
+      # Sanity check. If we get an exception, the thread should be dead.
+      raise if thread.alive?
+
+      thread
+    end
+  end
+end

data/lib/bundleup/pin_report.rb

@@ -0,0 +1,37 @@
+module Bundleup
+  class PinReport < Report
+    def initialize(gem_versions:, outdated_gems:, gem_comments:)
+      super()
+      @gem_versions = gem_versions
+      @outdated_gems = outdated_gems
+      @gem_comments = gem_comments
+    end
+
+    def title
+      return "Note that this gem is being held back:" if rows.count == 1
+
+      "Note that the following gems are being held back:"
+    end
+
+    def rows
+      outdated_gems.keys.sort.map do |gem|
+        meta = outdated_gems[gem]
+        current_version = gem_versions[gem]
+        newest_version = meta[:newest]
+        pin = meta[:pin]
+
+        [gem, current_version, "→", newest_version, *pin_reason(gem, pin)]
+      end
+    end
+
+    private
+
+    attr_reader :gem_versions, :outdated_gems, :gem_comments
+
+    def pin_reason(gem, pin)
+      notes = Colors.gray(gem_comments[gem].to_s)
+      pin_operator, pin_version = pin.split(" ", 2)
+      [":", "pinned at", pin_operator.rjust(2), pin_version, notes]
+    end
+  end
+end

data/lib/bundleup/report.rb

@@ -0,0 +1,38 @@
+require "forwardable"
+
+module Bundleup
+  class Report
+    extend Forwardable
+    def_delegators :rows, :empty?, :one?
+
+    def many?
+      rows.length > 1
+    end
+
+    def to_s
+      [
+        title,
+        tableize(rows).map { |row| row.join(" ").rstrip }.join("\n"),
+        ""
+      ].join("\n\n")
+    end
+
+    private
+
+    def tableize(rows)
+      widths = max_length_of_each_column(rows)
+      rows.map do |row|
+        row.zip(widths).map do |value, width|
+          padding = " " * (width - Colors.strip(value).length)
+          "#{value}#{padding}"
+        end
+      end
+    end
+
+    def max_length_of_each_column(rows)
+      Array.new(rows.first.count) do |i|
+        rows.map { |values| Colors.strip(values[i]).length }.max
+      end
+    end
+  end
+end

data/lib/bundleup/shell.rb

@@ -0,0 +1,35 @@
+require "forwardable"
+require "open3"
+
+module Bundleup
+  class Shell
+    extend Forwardable
+    def_delegators :Bundleup, :logger
+
+    def capture(command, raise_on_error: true)
+      stdout, stderr, status = capture3(command)
+      raise ["Failed to execute: #{command}", stdout, stderr].compact.join("\n") if raise_on_error && !status.success?
+
+      stdout
+    end
+
+    def run(command)
+      capture(command)
+      true
+    end
+
+    def run?(command)
+      _, _, status = capture3(command)
+      status.success?
+    end
+
+    private
+
+    def capture3(command)
+      command = Array(command)
+      logger.while_spinning("running: #{command.join(' ')}") do
+        Open3.capture3(*command)
+      end
+    end
+  end
+end

data/lib/bundleup/update_report.rb

@@ -0,0 +1,63 @@
+module Bundleup
+  class UpdateReport < Report
+    def initialize(old_versions:, new_versions:)
+      super()
+      @old_versions = old_versions
+      @new_versions = new_versions
+    end
+
+    def title
+      return "This gem will be updated:" if rows.count == 1
+
+      "The following gems will be updated:"
+    end
+
+    def rows
+      gem_names.each_with_object([]) do |gem, rows|
+        old = old_versions[gem]
+        new = new_versions[gem]
+        next if old == new
+
+        row = [gem, old || "(new)", "→", new || "(removed)"]
+
+        color = color_for_gem(gem)
+        rows << row.map { |col| Colors.public_send(color, col) }
+      end
+    end
+
+    private
+
+    attr_reader :old_versions, :new_versions
+
+    def gem_names
+      (old_versions.keys | new_versions.keys).sort
+    end
+
+    def color_for_gem(gem)
+      old_version = old_versions[gem]
+      new_version = new_versions[gem]
+
+      return :blue if old_version.nil?
+      return :red if new_version.nil? || major_upgrade?(old_version, new_version)
+      return :yellow if minor_upgrade?(old_version, new_version)
+
+      :plain
+    end
+
+    def major_upgrade?(old_version, new_version)
+      major(new_version) != major(old_version)
+    end
+
+    def minor_upgrade?(old_version, new_version)
+      minor(new_version) != minor(old_version)
+    end
+
+    def major(version)
+      version.split(".", 2)[0]
+    end
+
+    def minor(version)
+      version.split(".", 3)[1]
+    end
+  end
+end

data/lib/bundleup/version.rb

@@ -1,3 +1,3 @@
 module Bundleup
-  VERSION = "1.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

data/lib/bundleup/version_spec.rb

@@ -0,0 +1,54 @@
+module Bundleup
+  class VersionSpec
+    def self.parse(version)
+      return version if version.is_a?(VersionSpec)
+
+      version = version.strip
+      _, operator, number = version.match(/^([^\d\s]*)\s*(.+)/).to_a
+      operator = nil if operator.empty?
+
+      new(parts: number.split("."), operator: operator)
+    end
+
+    attr_reader :parts, :operator
+
+    def initialize(parts:, operator: nil)
+      @parts = parts
+      @operator = operator
+    end
+
+    def exact?
+      operator.nil?
+    end
+
+    def relax
+      return self if %w[!= > >=].include?(operator)
+      return self.class.parse(">= 0") if %w[< <=].include?(operator)
+
+      self.class.new(parts: parts, operator: ">=")
+    end
+
+    def shift(new_version) # rubocop:disable Metrics/AbcSize
+      return self.class.parse(new_version) if exact?
+      return self if Gem::Requirement.new(to_s).satisfied_by?(Gem::Version.new(new_version))
+      return self.class.new(parts: self.class.parse(new_version).parts, operator: "<=") if %w[< <=].include?(operator)
+
+      new_slice = self.class.parse(new_version).slice(parts.length)
+      self.class.new(parts: new_slice.parts, operator: "~>")
+    end
+
+    def slice(amount)
+      self.class.new(parts: parts[0, amount], operator: operator)
+    end
+
+    def to_s
+      [operator, parts.join(".")].compact.join(" ")
+    end
+
+    def ==(other)
+      return false unless other.is_a?(VersionSpec)
+
+      to_s == other.to_s
+    end
+  end
+end

metadata

@@ -1,113 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bundleup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Matt Brictson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+date: 2020-10-01 00:00:00.000000000 Z
+dependencies: []
 description: Use `bundleup` whenever you want to update the locked Gemfile dependencies
   of a Ruby project. It shows exactly what gems will be updated with color output
   that calls attention to significant semver changes. Bundleup will also let you know
@@ -121,36 +23,31 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/release-drafter.yml"
-- ".github/workflows/push.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- bundleup.gemspec
 - exe/bundleup
 - lib/bundleup.rb
-- lib/bundleup/bundle_commands.rb
+- lib/bundleup/backup.rb
 - lib/bundleup/cli.rb
-- lib/bundleup/console.rb
-- lib/bundleup/gem_status.rb
+- lib/bundleup/colors.rb
+- lib/bundleup/commands.rb
 - lib/bundleup/gemfile.rb
-- lib/bundleup/upgrade.rb
+- lib/bundleup/logger.rb
+- lib/bundleup/pin_report.rb
+- lib/bundleup/report.rb
+- lib/bundleup/shell.rb
+- lib/bundleup/update_report.rb
 - lib/bundleup/version.rb
-- sample.png
+- lib/bundleup/version_spec.rb
 homepage: https://github.com/mattbrictson/bundleup
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/mattbrictson/bundleup/issues
+  changelog_uri: https://github.com/mattbrictson/bundleup/releases
+  source_code_uri: https://github.com/mattbrictson/bundleup
+  homepage_uri: https://github.com/mattbrictson/bundleup
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,15 +55,15 @@ 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.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A friendlier command-line interface for Bundler’s `update` and `outdated`
   commands.