bunup 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e535e339b0b9521d91a170655c46a6384f459b8f101f07444ad060ae57994dfb
-  data.tar.gz: 3aba273f29f740dc3ed9a4dd9473164488929a51c01ffe90a68a3b3915bc768c
+  metadata.gz: 63cc322ef7121438476bec3a6fa52b19d5c0b29c0a725ee78245a02c3ab46719
+  data.tar.gz: 4d5c02920b1e0dd16e1737bfd0ef035b4127f2326d90033a6da560d2b79b69e4
 SHA512:
-  metadata.gz: de8b290a7438ea3b8aa5d3b92c1e37cd44adb7972f67527cc583f19baa101980ab5824bffd1bc6b9cd5c8bcd83bdd0639d4935c21312b939bbe2d9aed0d84df5
-  data.tar.gz: 73d30288f035f24eaeb43dcedb7e9f23c8f3805fb440c425b80b4b001a08a2489b11c0aa9e0331718963a537cd28cb1971d0064a49c0aa7923592617d5a280ac
+  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/Gemfile

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

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', '< 2.1'
-  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,20 +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] '.freeze
+        '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)
@@ -50,7 +52,7 @@ module Bunup
 
     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)
       ''
@@ -73,7 +75,7 @@ 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
 
@@ -96,7 +98,7 @@ module Bunup
       if @options[:assume_yes_for_git_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
@@ -115,7 +117,7 @@ module Bunup
       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

data/lib/bunup/gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Bunup
@@ -5,9 +7,9 @@ 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

data/lib/bunup/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optionparser'
 require 'ostruct'
 
@@ -30,13 +32,17 @@ module Bunup
             list.each do |version_type|
               case version_type.strip
               when 'major'
-                then options[:assume_yes_for_major_version_update] = true
+                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
           puts opts
           exit

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunup
   module Services
     # Validate that version of gem installed from a git source is valid
@@ -14,7 +16,7 @@ module Bunup
         return false if sha.nil?
 
         ::Gem::Version.correct?(version) &&
-          sha.match?(SHA_REGEX)
+          !sha.match(SHA_REGEX).nil?
       end
     end
   end

data/lib/bunup/values/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunup
   module Values
     # Parse and handle version strings

data/lib/bunup/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bunup
-  VERSION = '0.2.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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: bunup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jared Beck
 - Shane Cavanaugh
 - Leon Miller-Out
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,91 +18,71 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.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
@@ -139,7 +119,7 @@ homepage: https://github.com/singlebrook/bunup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Bundle update and commit to git with one command
 test_files: []