bunup 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aecb6c5b9952bc73f6e059f520a6ffb477869fa5c44f4855e92a0de17ab50d6f
-  data.tar.gz: d0d5dc8e96c0866cafb55d380ffd3cb6d9602ba7d40a20ff81ba6312ec30e680
+  metadata.gz: 63cc322ef7121438476bec3a6fa52b19d5c0b29c0a725ee78245a02c3ab46719
+  data.tar.gz: 4d5c02920b1e0dd16e1737bfd0ef035b4127f2326d90033a6da560d2b79b69e4
 SHA512:
-  metadata.gz: 85686d9b73831bf4fce8d3d5e6d42ec08011315fef82e5d0ba5eba9c7e9b9541d327e9e3f166699fc2ea4b8fd0cd7d21e17c0caea8094d9574b4e45cef37bcd1
-  data.tar.gz: f0568922bd09be73673b7e678427d9de957c49c2d3360fbec279c3f037ec1a5b35caf9f7189e00f261d513bdb58c9e48fba243e54874b19afaf23360c98e96ce
+  metadata.gz: 4d14817dc2eee80a359a45befc1d3e87acd7ca916780ce5ea056c586fb167c1f585fc09f44e2fe48076479efd31bc972dbd7c8dbffcff6c8c5404799075db971
+  data.tar.gz: 7d6ed6b5edc46141d631384da30c45b3651743fe8ef09a8b8ae94c130c54a7cbd55bae8f23b1673cac84f6fe21bc003fb76b3f8a947d7d99a3c0f1f5ad02ff71

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 
 Gemfile.lock
+
+.ruby-version

data/.rubocop.yml

@@ -1,7 +1,10 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/CaseIndentation:
@@ -23,7 +26,7 @@ Layout/EmptyLinesAroundAccessModifier:
 Layout/EmptyLinesAroundArguments:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 Layout/MultilineMethodCallIndentation:
@@ -55,10 +58,6 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Enabled: false
 
-# Status codes or symbols are fine
-Rails/HttpStatus:
-  Enabled: false
-
 # Too subtle to lint. Recommend semantic style, but avoid `end.x`.
 Style/BlockDelimiters:
   Enabled: false
@@ -72,6 +71,18 @@ Style/FormatStringToken:
 Style/GuardClause:
   Enabled: false
 
+# New cop opt-in
+Style/HashEachMethods:
+  Enabled: true
+
+# New cop opt-in
+Style/HashTransformKeys:
+  Enabled: true
+
+# New cop opt-in
+Style/HashTransformValues:
+  Enabled: true
+
 # Too subtle to lint. Avoid the "modifier" (postfix) style except on extremely
 # short and simple lines.
 Style/IfUnlessModifier:

data/.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## [0.2.0](https://github.com/singlebrook/bunup/releases/tag/v0.2.0)
+
+- Support Bundler 2
+- Support gems installed from git sources

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -1,5 +1,6 @@
 
 [![Build Status](https://travis-ci.org/singlebrook/bunup.svg?branch=master)](https://travis-ci.org/singlebrook/bunup)
+![Gem](https://img.shields.io/gem/v/bunup.svg)
 
 # Bunup
 
@@ -44,7 +45,7 @@ bunup rake rubocop
 ### Options
 
 * `--all`: Update all outdated gems. This is the default.
-* `-y` `--yes` `--assume-yes`: Answer "yes" to major version update prompts and run non-interactively
+* `-y` `--yes` `--assume-yes [major, git]`: Answer "yes" to major version or git version update prompts and run non-interactively. Defaults to all.
 
 ## Development
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'bunup'

data/bunup.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bunup/version'
@@ -22,12 +24,11 @@ Gem::Specification.new do |spec|
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'byebug', '~> 9.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '>= 0.57.2'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'bundler', '>= 2.4.0' # CVE-2019-3881
+  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'rubocop', '>= 1.50'
+  spec.add_development_dependency 'simplecov', '~> 0.21.2'
 end

data/exe/bunup

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'bunup'
+require_relative '../lib/bunup'
 ::Bunup::CLI.new(ARGV).run

data/lib/bunup/bundler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 module Bunup
@@ -11,15 +13,17 @@ module Bunup
       (?<name>.*)\s
       \(newest\s(?<newest>.*),\s
       installed\s(?<installed>.*?)
-      (,\srequested.*)?
+      (?:,\srequested.*)?
       \)
     /x.freeze
 
     # Expected output format:
     #   "\ngem-name (newest 1.0.0, installed 2.0.0)\n"
-    def self.outdated(gem_names)
+    def self.outdated(gem_names, only_explicit: false)
+      args = %w[--parseable --strict]
+      args << '--only-explicit' if only_explicit
       stdout, stderr, status = Open3.capture3(
-        "bundler outdated #{gem_names.join(' ')} --parseable --strict"
+        "bundler outdated #{gem_names.join(' ')} #{args.join(' ')}"
       )
       validate_output(stdout, stderr, status)
       stdout.strip
@@ -35,7 +39,7 @@ module Bunup
       unless status.to_i == 256
         raise ::SystemExit.new(
           status.to_i,
-          (stderr == '' ? stdout : stderr).chomp + "\n"
+          "#{(stderr == '' ? stdout : stderr).chomp}\n"
         )
       end
     end

data/lib/bunup/cli.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
 module Bunup
   # Parse args, run services, handle output, and handle exits
   class CLI
-    COMMITING_MSG = 'Commiting Gemfile and Gemfile.lock changes'.freeze
+    COMMITING_MSG = 'Commiting Gemfile and Gemfile.lock changes'
     E_DIRTY_GEMFILE = 'Gemfile and/or Gemfile.lock has changes that would ' \
         'be overwritten. Please stash or commit your changes before running ' \
-        'bunup.'.freeze
+        'bunup.'
+    GIT_REF_UPDATE_WARNING = 'WARNING: %<gem_name>s is installed from a git ' \
+        'repo and is being updated from %<installed_version>s to ' \
+        '%<newest_version>s. This update could include breaking changes. ' \
+        'Continue? [y/N] '
     MAJOR_VERSION_UPDATE_WARNING_FMT = 'WARNING: %<gem_name>s is being ' \
         'updated from %<installed_version>s to %<newest_version>s. This is ' \
         'a major version update with possible breaking changes. ' \
-        'Continue? [y/N] '.freeze
+        'Continue? [y/N] '
     UPDATING_MSG_FMT = '(%<remaining>s) Updating %<gem_name>s ' \
-      '%<installed_version>s -> %<newest_version>s'.freeze
+      '%<installed_version>s -> %<newest_version>s'
 
     def initialize(args)
       @options = ::Bunup::Options.parse!(args)
@@ -36,17 +42,17 @@ module Bunup
     end
 
     def build_gems
-      bundle_outdated.split("\n").map do |line|
+      bundle_outdated.split("\n").map.with_object([]) do |line, gems|
         next unless Bundler::OUTDATED_PATTERN =~ line
 
         match_data = Bundler::OUTDATED_PATTERN.match(line)
-        build_gem(match_data)
-      end.compact
+        gems << build_gem(match_data)
+      end
     end
 
     def bundle_outdated
       puts 'Checking for updates'
-      Bundler.outdated(bunup_all? ? [] : @args)
+      Bundler.outdated(bunup_all? ? [] : @args, only_explicit: @options[:only_explicit])
     rescue ::SystemExit => e
       handle_system_exit(e)
       ''
@@ -69,16 +75,33 @@ module Bunup
       msg = []
       msg << 'ERROR:' unless exception.success?
       msg << exception.message
-      puts msg.join(' ') + "\n"
+      puts "#{msg.join(' ')}\n"
       raise exception unless bunup_many?
     end
 
     def major_version_update?
       return false if @gem.newest_version.nil? || @gem.installed_version.nil?
 
-      major_version = ->(version) { version.split('.')[0].to_i }
-      major_version.call(@gem.newest_version) >
-        major_version.call(@gem.installed_version)
+      @gem.newest_version.major > @gem.installed_version.major
+    end
+
+    # A major version update has breaking changes, according to Semantic
+    # Versioning (https://semver.org/spec/v2.0.0.html). Let's make sure the
+    # user is aware of that.
+    def prompt_for_git_ref_update
+      print format(
+        GIT_REF_UPDATE_WARNING,
+        gem_name: @gem.name,
+        installed_version: @gem.installed_version,
+        newest_version: @gem.newest_version
+      )
+      if @options[:assume_yes_for_git_update]
+        print "assuming yes\n"
+      else
+        unless $stdin.gets.chomp.casecmp('y').zero?
+          raise ::SystemExit.new(true, 'No update performed')
+        end
+      end
     end
 
     # A major version update has breaking changes, according to Semantic
@@ -91,10 +114,10 @@ module Bunup
         installed_version: @gem.installed_version,
         newest_version: @gem.newest_version
       )
-      if @options.assume_yes
+      if @options[:assume_yes_for_major_version_update]
         print "assuming yes\n"
       else
-        unless STDIN.gets.chomp.casecmp('y').zero?
+        unless $stdin.gets.chomp.casecmp('y').zero?
           raise ::SystemExit.new(true, 'No update performed')
         end
       end
@@ -116,6 +139,7 @@ module Bunup
         @gem = gem
         begin
           prompt_for_major_update if major_version_update?
+          prompt_for_git_ref_update if @gem.installed_from_git?
           update
           commit
         rescue ::SystemExit => e

data/lib/bunup/gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Bunup
@@ -5,28 +7,32 @@ module Bunup
   class Gem
     # Gem name patterns taken from
     # https://github.com/rubygems/rubygems.org/blob/master/lib/patterns.rb
-    SPECIAL_CHARACTERS = '.-_'.freeze
+    SPECIAL_CHARACTERS = '.-_'
     ALLOWED_CHARACTERS = '[A-Za-z0-9' \
-      "#{Regexp.escape(SPECIAL_CHARACTERS)}]+".freeze
+      "#{Regexp.escape(SPECIAL_CHARACTERS)}]+"
     NAME_PATTERN = /\A#{ALLOWED_CHARACTERS}\Z/.freeze
 
     attr_accessor :name, :installed_version, :newest_version
 
     def initialize(name: nil, installed_version: nil, newest_version: nil)
       @name = name
-      @installed_version = installed_version
-      @newest_version = newest_version
+      @installed_version = Values::Version.new(installed_version)
+      @newest_version = Values::Version.new(newest_version)
       validate
     end
 
+    def installed_from_git?
+      installed_version.from_git? || newest_version.from_git?
+    end
+
     private
 
     def validate
       abort "Invalid gem name: #{name}" unless valid_name?
-      unless valid_version?(installed_version)
+      unless installed_version.valid?
         abort "Invalid version for #{name}: #{installed_version}"
       end
-      unless valid_version?(newest_version)
+      unless newest_version.valid?
         abort "Invalid version for #{name}: #{newest_version}"
       end
     end
@@ -34,9 +40,5 @@ module Bunup
     def valid_name?
       name =~ NAME_PATTERN
     end
-
-    def valid_version?(version_string)
-      ::Gem::Version.correct?(version_string)
-    end
   end
 end

data/lib/bunup/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optionparser'
 require 'ostruct'
 
@@ -16,10 +18,29 @@ module Bunup
           options.all = true
         end
 
-        assume_yes_msg = 'Answer "yes" to major version update prompts ' \
-          'and run non-interactively'
-        opts.on('-y', '--yes', '--assume-yes', assume_yes_msg) do
-          options.assume_yes = true
+        assume_yes_msg = 'Answer "yes" to all major or git version update ' \
+          'prompts, or all, and run non-interactively. Defaults to all.'
+        opts.on(
+          '-y', '--yes', '--assume-yes [major, git]',
+          Array,
+          assume_yes_msg
+        ) do |list|
+          if list.nil?
+            options[:assume_yes_for_major_version_update] = true
+            options[:assume_yes_for_git_update] = true
+          else
+            list.each do |version_type|
+              case version_type.strip
+              when 'major'
+                options[:assume_yes_for_major_version_update] = true
+              when 'git' then options[:assume_yes_for_git_update] = true
+              end
+            end
+          end
+        end
+
+        opts.on('--only-explicit') do
+          options[:only_explicit] = true
         end
 
         opts.on('-h', '--help', 'Prints this help') do

data/lib/bunup/services/commiter.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Bunup
   module Services
     # Commit changes to Gemfile and Gemfile.lock to git
     class Commiter
       COMMIT_MESSAGE_FMT = '%<gem_name>s %<newest_version>s ' \
-      '(was %<installed_version>s)'.freeze
+      '(was %<installed_version>s)'
 
       def self.clean_gemfile?
         `git status -s Gemfile Gemfile.lock` == ''
@@ -30,9 +32,9 @@ module Bunup
 
       def message
         format COMMIT_MESSAGE_FMT,
-          gem_name: @gem.name,
-          newest_version: @gem.newest_version,
-          installed_version: @gem.installed_version
+               gem_name: @gem.name,
+               newest_version: @gem.newest_version,
+               installed_version: @gem.installed_version
       end
     end
   end

data/lib/bunup/services/updater.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunup
   module Services
     # Use bundler to update the gem and the Gemfile

data/lib/bunup/services/validate_git_version.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Bunup
+  module Services
+    # Validate that version of gem installed from a git source is valid
+    class ValidateGitVersion
+      # https://stackoverflow.com/questions/468370/a-regex-to-match-a-sha1#468378
+      SHA_REGEX = /\b[0-9a-f]{5,40}\b/.freeze
+
+      def initialize(version_string)
+        @version_string = version_string
+      end
+
+      def perform
+        version, sha = @version_string.split(' ')
+        return false if sha.nil?
+
+        ::Gem::Version.correct?(version) &&
+          !sha.match(SHA_REGEX).nil?
+      end
+    end
+  end
+end

data/lib/bunup/values/version.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Bunup
+  module Values
+    # Parse and handle version strings
+    class Version
+      def initialize(version_string)
+        @version_string = version_string
+      end
+
+      def to_s
+        @version_string
+      end
+
+      def major
+        if from_git?
+          # '6.0.0.rc2 b6f1d19' => 6
+          @version_string.split(' ')[0].split('.')[0].to_i
+        else
+          # '6.0.0.rc2' => 6
+          @version_string.split('.')[0].to_i
+        end
+      end
+
+      def from_git?
+        Services::ValidateGitVersion.new(@version_string).perform
+      end
+
+      def nil?
+        @version_string == '' || @version_string.nil?
+      end
+
+      def valid?
+        ::Gem::Version.correct?(@version_string) ||
+          Services::ValidateGitVersion.new(@version_string).perform
+      end
+    end
+  end
+end

data/lib/bunup/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunup
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.3.0'
 end

data/lib/bunup.rb

@@ -1,4 +1,8 @@
-Dir.glob(File.dirname(__FILE__) + '/bunup/**/*.rb').each { |file| require file }
+# frozen_string_literal: true
 
-# Out top-level namespace
+Dir.glob("#{File.dirname(__FILE__)}/bunup/**/*.rb").sort.each do |file|
+  require file
+end
+
+# Our top-level namespace
 module Bunup; end

metadata

@@ -1,102 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: bunup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jared Beck
 - Shane Cavanaugh
 - Leon Miller-Out
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '1.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '1.50'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
-description: 
+        version: 0.21.2
+description:
 email:
 - jared@jaredbeck.com
 - shane@shanecav.net
@@ -109,6 +95,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -125,12 +112,14 @@ files:
 - lib/bunup/options.rb
 - lib/bunup/services/commiter.rb
 - lib/bunup/services/updater.rb
+- lib/bunup/services/validate_git_version.rb
+- lib/bunup/values/version.rb
 - lib/bunup/version.rb
 homepage: https://github.com/singlebrook/bunup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,16 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Bundle update and commit to git with one command
 test_files: []