strong_versions 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2948e08aad68876155035d029499da973771f8419f2519981c065e8d1a069938
-  data.tar.gz: 85d5cc28abf45e9434ab2d92cb98590874a8a4bc0f2573306594fc5119c08175
+  metadata.gz: 4e3d02b2717fbfdc7da2e7cc0d83b495e01bc6b31efae98f635abae1cf8bf837
+  data.tar.gz: fb28b5ddd0a45c7ca56306bcfd58013824c9949bcd723a324dde98431f0b197c
 SHA512:
-  metadata.gz: 0015b7477c4df28f48c2a7b40c4ea517da1e26a9698f92331db002fd771278341ab38d153eb814d14883d165d4a3465c65aea62e97e3b1c244ccb1014b736013
-  data.tar.gz: 4b2688647749fca796f8d78182abb2e8ff49ea3b225c7fa6befeb4222328ceda0e3319432667743fc40d37fe0fcf2ae2636eb2affba2c5ee489faff3f6de52e2
+  metadata.gz: c4482cf23782277e84fdbf1a3a3e9d998c5cac84202d3c21be563dc4eeb21cdd5c6ba54490ff4f2e81d85899cde8eed32e28879e3a0f861871a1cd5a45b51491
+  data.tar.gz: fccdb21e6f7b58966a4f6dcee95ae6c176ae7be7b5380f820b660235f7a56f80163414475e9a4799d50d369f1ab73ddd354da98ba9aba83db03eb74c82f1cce3

data/.rubocop.yml

@@ -16,3 +16,47 @@ AllCops:
     - 'bin/rspec'
     - 'bin/rubocop'
     - 'bin/setup'
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true

data/README.md

@@ -1,11 +1,5 @@
 # StrongVersions
 
-```
-The right thing to guide us
-Is right here inside us
-               --Nickelback
-```
-
 # Overview
 
 _StrongVersions_ enforces a strict policy on your `Gemfile` requirements:
@@ -28,7 +22,7 @@ When all gems in a `Gemfile` follow this convention it SHOULD always be safe to
 Add the gem to your `Gemfile`
 
 ```ruby
-gem 'strong_versions', '~> 0.4.4'
+gem 'strong_versions', '~> 0.4.5'
 ```
 
 And rebuild your bundle:
@@ -37,11 +31,6 @@ And rebuild your bundle:
 $ bundle install
 ```
 
-Or install yourself:
-```bash
-$ gem install strong_versions -v '0.4.4'
-```
-
 ## Usage
 
 _StrongVersions_ is invoked with a provided executable:
@@ -54,7 +43,7 @@ The executable will output all non-passing gems and will return an exit code of
 
 ![StrongVersions](doc/images/ci-pipeline.png)
 
-If you are feeling brave, auto-correct is available:
+Auto-correct is available with the `-a/--auto-correct` option:
 ```bash
 $ bundle exec strong_versions -a
 ```
@@ -69,6 +58,7 @@ ignore:
   - rails
 ```
 
+Gems in the ignore list will not be updated when using the `-a/--auto-correct` option.
 ## Contributing
 
 Fork and create a pull request.

data/lib/strong_versions.rb

@@ -13,6 +13,7 @@ require 'strong_versions/dependencies'
 require 'strong_versions/errors'
 require 'strong_versions/terminal'
 require 'strong_versions/gem_version'
+require 'strong_versions/regexes'
 require 'strong_versions/version'
 
 module StrongVersions

data/lib/strong_versions/dependencies.rb

@@ -17,7 +17,7 @@ module StrongVersions
         return true
       end
 
-      return update_definitions if auto_correct
+      return update_definitions(options.fetch(:except, [])) if auto_correct
 
       raise_or_warn(options.fetch(:on_failure, 'raise'))
       summary
@@ -45,18 +45,17 @@ module StrongVersions
       @terminal.summary(@dependencies.size, @invalid_gems.size)
     end
 
-    def updatable_dependencies
-      @dependencies.select(&:updatable?)
+    def updatable_dependencies(except)
+      @dependencies.reject { |dependency| except.include?(dependency.name) }
+                   .select(&:updatable?)
     end
 
-    def update_definitions
-      @terminal.update_summary(update(:gemfile) + update(:gemspec))
+    def update_definitions(except)
+      @terminal.update_summary(update(:gemfile, except) + update(:gemspec, except))
     end
 
-    def update(subject)
-      updatable_dependencies.reduce(0) do |count, dependency|
-        next count unless dependency.updatable?
-
+    def update(subject, except)
+      updatable_dependencies(except).reduce(0) do |count, dependency|
         update_dependency(subject, dependency) ? count : count + 1
       end
     end
@@ -79,16 +78,14 @@ module StrongVersions
       match = content.match(regex)
       return content unless match
 
+      # For gemspec, indent includes the `spec.` or `s.` prefix.
       indent = match.captures.first
       definition = dependency.suggested_definition(subject)
       content.gsub(regex, "#{indent}#{definition}")
     end
 
     def gem_regex(subject, name)
-      {
-        gemfile: /^(\s*)gem\s+['"]#{name}['"].*$/,
-        gemspec: /^(\s*)spec.add_[a-z_]*_?dependency\s+['"]#{name}['"].*$/
-      }.fetch(subject)
+      Regexes.public_send(subject, name)
     end
 
     def raise_or_warn(on_failure)

data/lib/strong_versions/dependency.rb

@@ -14,6 +14,10 @@ module StrongVersions
       versions.each { |operator, version| validate_version(operator, version) }
     end
 
+    def to_s
+      "#<StrongVersions::Dependency name=#{@dependency.name}>"
+    end
+
     def gemfile
       Pathname.new(@dependency.gemfile) if @dependency.respond_to?(:gemfile)
     end
@@ -70,7 +74,7 @@ module StrongVersions
     end
 
     def suggested_gemspec_definition(constraints)
-      "spec.add_#{gemspec_spec.type}_dependency '#{@name}', #{constraints}"
+      "add_#{gemspec_spec.type}_dependency '#{@name}', #{constraints}"
     end
 
     def suggested_gemfile_definition(constraints)

data/lib/strong_versions/regexes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module StrongVersions
+  module Regexes
+    class << self
+      def gemfile(name)
+        /^(\s*)gem\s+['"]#{name}['"].*$/
+      end
+
+      def gemspec(name)
+        /^(\s*[A-Za-z]+\.)add_[a-z_]*_?dependency\s*\(?\s*['"]#{name}['"].*$/
+      end
+    end
+  end
+end

data/lib/strong_versions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StrongVersions
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/strong_versions.gemspec

@@ -28,14 +28,13 @@ Gem::Specification.new do |spec|
   # stop supporting Rails 4 we need to support I18n 0.x and 1.x. At some point,
   # I will do a release that is locked to '~> 1.0' and Rails 4 users can use
   # an older version of the gem but we are not quite there yet.
-  spec.add_dependency 'i18n', '>= 0.5.0'
+  spec.add_runtime_dependency 'i18n', '>= 0.5'
   spec.add_dependency 'paint', '~> 2.0'
 
-  spec.add_development_dependency 'betterp', '~> 0.1.2'
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'byebug', '~> 10.0'
+  spec.add_development_dependency 'devpack', '~> 0.1.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'rubocop', '~> 0.60.0'
+  spec.add_development_dependency 'rubocop', '~> 0.87.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_versions
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: betterp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: devpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.87.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.87.1
 description: Ensure your gems are appropriately versioned
 email:
 - oss@bob.frl
@@ -172,6 +158,7 @@ files:
 - lib/strong_versions/dependency_finder.rb
 - lib/strong_versions/errors.rb
 - lib/strong_versions/gem_version.rb
+- lib/strong_versions/regexes.rb
 - lib/strong_versions/terminal.rb
 - lib/strong_versions/version.rb
 - strong_versions.gemspec