semverve 0.2.1 → 0.4.0

data/lib/semverve/version_code_references.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "configuration"
 require_relative "file_list_resolver"
+require_relative "finding"
+require_relative "fix_result"
 require_relative "semantic_version"
+require_relative "version_literal_rewriter"
+require_relative "version_match_policy"
 
 module Semverve
   ##
@@ -18,79 +21,7 @@ module Semverve
     # Ruby assignments that are safe enough to rewrite automatically.
     #
     # @return [Regexp]
-    RUBY_ASSIGNMENT_PATTERN = Configuration::DEFAULT_VERSION_CODE_REFERENCE_PATTERN
-
-    ##
-    # A code version literal found in a configured file.
-    class Finding
-      ##
-      # Path relative to the configured project root.
-      #
-      # @return [String]
-      attr_reader :path
-
-      ##
-      # One-based line number.
-      #
-      # @return [Integer]
-      attr_reader :line
-
-      ##
-      # One-based column number.
-      #
-      # @return [Integer]
-      attr_reader :column
-
-      ##
-      # Referenced semantic version.
-      #
-      # @return [Semverve::SemanticVersion]
-      attr_reader :version
-
-      ##
-      # Initializes a finding.
-      #
-      # @param [String] path
-      # @param [Integer] line
-      # @param [Integer] column
-      # @param [Semverve::SemanticVersion] version
-      #
-      # @return [Semverve::VersionCodeReferences::Finding]
-      def initialize(path:, line:, column:, version:)
-        @path = path
-        @line = line
-        @column = column
-        @version = version
-      end
-    end
-
-    ##
-    # Result of fixing code version literals.
-    class FixResult
-      ##
-      # Files changed by the fix.
-      #
-      # @return [Array<String>]
-      attr_reader :changed_files
-
-      ##
-      # Number of replacements made.
-      #
-      # @return [Integer]
-      attr_reader :replacement_count
-
-      ##
-      # Initializes a fix result.
-      #
-      # @param [Array<String>] changed_files
-      # @param [Integer] replacement_count
-      #
-      # @return [Semverve::VersionCodeReferences::FixResult]
-      def initialize(changed_files:, replacement_count:)
-        @changed_files = changed_files
-        @replacement_count = replacement_count
-      end
-    end
+    RUBY_ASSIGNMENT_PATTERN = /^\s*(?:(?:[A-Z]\w*::)*(?:[A-Z]\w*VERSION[A-Z0-9_]*|VERSION)|(?:[a-z_]\w*|self)\.version)\s*=\s*(?<quote>["'])(?<version>\d+\.\d+\.\d+)\k<quote>/
 
     ##
     # Initializes code version literal scanning.
@@ -99,16 +30,17 @@ module Semverve
     # @param [Semverve::SemanticVersion] current_version
     #
     # @return [Semverve::VersionCodeReferences]
-    def initialize(configuration, current_version, include_ignored: false)
+    def initialize(configuration, current_version, include_ignored: false, target_version: nil)
       @configuration = configuration
       @current_version = current_version
       @include_ignored = include_ignored
+      @target_version = target_version
     end
 
     ##
     # Code version literal findings in configured files.
     #
-    # @return [Array<Semverve::VersionCodeReferences::Finding>]
+    # @return [Array<Semverve::Finding>]
     def findings
       files.flat_map { |path| findings_for_file(path) }
     end
@@ -116,7 +48,7 @@ module Semverve
     ##
     # Replaces found code version literals with the current version.
     #
-    # @return [Semverve::VersionCodeReferences::FixResult]
+    # @return [Semverve::FixResult]
     def fix
       changed_files = []
       replacement_count = 0
@@ -132,7 +64,7 @@ module Semverve
         replacement_count += count
       end
 
-      FixResult.new(changed_files: changed_files, replacement_count: replacement_count)
+      Semverve::FixResult.new(changed_files: changed_files, replacement_count: replacement_count)
     end
 
     private
@@ -155,6 +87,12 @@ module Semverve
     # @return [Boolean]
     attr_reader :include_ignored
 
+    ##
+    # Exact version to match, when supplied by the task invocation.
+    #
+    # @return [Semverve::SemanticVersion, nil]
+    attr_reader :target_version
+
     ##
     # Absolute configured project root.
     #
@@ -187,7 +125,7 @@ module Semverve
     #
     # @param [String] path
     #
-    # @return [Array<Semverve::VersionCodeReferences::Finding>]
+    # @return [Array<Semverve::Finding>]
     def findings_for_file(path)
       lines = File.readlines(path)
 
@@ -198,9 +136,9 @@ module Semverve
         next unless match
 
         version = SemanticVersion.parse(match[:version])
-        next if version == current_version
+        next unless report?(version)
 
-        Finding.new(
+        Semverve::Finding.new(
           path: relative_path(path),
           line: line_number,
           column: match.begin(:version) + 1,
@@ -226,7 +164,7 @@ module Semverve
         next line unless match
 
         version = SemanticVersion.parse(match[:version])
-        next line if version == current_version
+        next line unless report?(version)
 
         replacement_count += 1
         replace_matched_version(line)
@@ -252,6 +190,18 @@ module Semverve
       previous_nonblank_line&.include?(IGNORE_MARKER)
     end
 
+    ##
+    # Whether a referenced version should be reported or fixed.
+    #
+    # @param [Semverve::SemanticVersion] version
+    #
+    # @return [Boolean]
+    def report?(version)
+      return version == target_version if target_version
+
+      match_policy.report?(version)
+    end
+
     ##
     # Replaces only the named version capture in the first pattern match.
     #
@@ -259,13 +209,7 @@ module Semverve
     #
     # @return [String]
     def replace_matched_version(line)
-      line.sub(pattern) do |matched_text|
-        match = Regexp.last_match
-        version_start = match.begin(:version) - match.begin(0)
-        version_end = match.end(:version) - match.begin(0)
-
-        "#{matched_text[0...version_start]}#{current_version}#{matched_text[version_end..]}"
-      end
+      literal_rewriter.rewrite(line)
     end
 
     ##
@@ -277,5 +221,25 @@ module Semverve
     def relative_path(path)
       path.delete_prefix("#{root}/")
     end
+
+    ##
+    # Version matching behavior for code literals.
+    #
+    # @return [Semverve::VersionMatchPolicy]
+    def match_policy
+      @match_policy ||= VersionMatchPolicy.new(
+        current_version: current_version,
+        match_mode: configuration.version_match_mode,
+        target_version: target_version
+      )
+    end
+
+    ##
+    # Safe literal rewriter for the configured pattern.
+    #
+    # @return [Semverve::VersionLiteralRewriter]
+    def literal_rewriter
+      @literal_rewriter ||= VersionLiteralRewriter.new(pattern: pattern, replacement: current_version)
+    end
   end
 end

data/lib/semverve/version_literal_rewriter.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require_relative "error"
+
+module Semverve
+  ##
+  # Rewrites a named capture inside the first match for a safe version literal.
+  class VersionLiteralRewriter
+    ##
+    # Initializes a literal rewriter.
+    #
+    # @param [Regexp] pattern
+    # @param [String, #to_s] replacement
+    # @param [Symbol, String] capture
+    #
+    # @return [Semverve::VersionLiteralRewriter]
+    def initialize(pattern:, replacement:, capture: :version)
+      @pattern = pattern
+      @replacement = replacement.to_s
+      @capture_name = capture.to_s
+      @capture_key = capture.to_sym
+
+      validate_capture
+    end
+
+    ##
+    # Rewrites the configured capture in +text+.
+    #
+    # @param [String] text
+    #
+    # @return [String]
+    def rewrite(text)
+      text.sub(pattern) do |matched_text|
+        match = Regexp.last_match
+        capture_start = match.begin(capture_key) - match.begin(0)
+        capture_end = match.end(capture_key) - match.begin(0)
+
+        "#{matched_text[0...capture_start]}#{replacement}#{matched_text[capture_end..]}"
+      end
+    end
+
+    private
+
+    ##
+    # Safe literal pattern.
+    #
+    # @return [Regexp]
+    attr_reader :pattern
+
+    ##
+    # Replacement text.
+    #
+    # @return [String]
+    attr_reader :replacement
+
+    ##
+    # Named capture as a string.
+    #
+    # @return [String]
+    attr_reader :capture_name
+
+    ##
+    # Named capture as a symbol.
+    #
+    # @return [Symbol]
+    attr_reader :capture_key
+
+    ##
+    # Validates that the pattern can be rewritten safely.
+    #
+    # @return [void]
+    def validate_capture
+      return if pattern.named_captures.key?(capture_name)
+
+      raise Error, "version literal pattern must include a named capture called #{capture_name}."
+    end
+  end
+end

data/lib/semverve/version_match_policy.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative "error"
+
+module Semverve
+  ##
+  # Decides whether a discovered version should be reported or fixed.
+  class VersionMatchPolicy
+    ##
+    # Initializes a version match policy.
+    #
+    # @param [Semverve::SemanticVersion] current_version
+    # @param [Symbol, String] match_mode
+    # @param [Semverve::SemanticVersion, nil] target_version
+    #
+    # @return [Semverve::VersionMatchPolicy]
+    def initialize(current_version:, match_mode:, target_version: nil)
+      @current_version = current_version
+      @match_mode = match_mode.to_sym
+      @target_version = target_version
+    end
+
+    ##
+    # Whether the version should be reported or fixed.
+    #
+    # @param [Semverve::SemanticVersion] version
+    #
+    # @return [Boolean]
+    def report?(version)
+      return version == target_version if target_version
+
+      case match_mode
+      when :older
+        version < current_version
+      when :non_current
+        version != current_version
+      else
+        raise Error, "Unknown version match mode #{match_mode.inspect}. Use :older or :non_current."
+      end
+    end
+
+    private
+
+    ##
+    # Current Semverve version.
+    #
+    # @return [Semverve::SemanticVersion]
+    attr_reader :current_version
+
+    ##
+    # Matching mode when no exact target version is supplied.
+    #
+    # @return [Symbol]
+    attr_reader :match_mode
+
+    ##
+    # Exact version to match.
+    #
+    # @return [Semverve::SemanticVersion, nil]
+    attr_reader :target_version
+  end
+end

data/lib/semverve/version_references.rb

@@ -2,9 +2,11 @@
 
 require "ripper"
 
-require_relative "error"
 require_relative "file_list_resolver"
+require_relative "finding"
+require_relative "fix_result"
 require_relative "semantic_version"
+require_relative "version_match_policy"
 
 module Semverve
   ##
@@ -28,78 +30,6 @@ module Semverve
     # @return [Array<String>]
     TEXT_EXTENSIONS = %w[.adoc .markdown .md .rdoc .txt].freeze
 
-    ##
-    # A stale or non-current version reference found in a project file.
-    class Finding
-      ##
-      # Path relative to the configured project root.
-      #
-      # @return [String]
-      attr_reader :path
-
-      ##
-      # One-based line number.
-      #
-      # @return [Integer]
-      attr_reader :line
-
-      ##
-      # One-based column number.
-      #
-      # @return [Integer]
-      attr_reader :column
-
-      ##
-      # Referenced semantic version.
-      #
-      # @return [Semverve::SemanticVersion]
-      attr_reader :version
-
-      ##
-      # Initializes a finding.
-      #
-      # @param [String] path
-      # @param [Integer] line
-      # @param [Integer] column
-      # @param [Semverve::SemanticVersion] version
-      #
-      # @return [Semverve::VersionReferences::Finding]
-      def initialize(path:, line:, column:, version:)
-        @path = path
-        @line = line
-        @column = column
-        @version = version
-      end
-    end
-
-    ##
-    # Result of fixing version references.
-    class FixResult
-      ##
-      # Files changed by the fix.
-      #
-      # @return [Array<String>]
-      attr_reader :changed_files
-
-      ##
-      # Number of replacements made.
-      #
-      # @return [Integer]
-      attr_reader :replacement_count
-
-      ##
-      # Initializes a fix result.
-      #
-      # @param [Array<String>] changed_files
-      # @param [Integer] replacement_count
-      #
-      # @return [Semverve::VersionReferences::FixResult]
-      def initialize(changed_files:, replacement_count:)
-        @changed_files = changed_files
-        @replacement_count = replacement_count
-      end
-    end
-
     ##
     # Initializes version-reference scanning.
     #
@@ -107,16 +37,17 @@ module Semverve
     # @param [Semverve::SemanticVersion] current_version
     #
     # @return [Semverve::VersionReferences]
-    def initialize(configuration, current_version, include_ignored: false)
+    def initialize(configuration, current_version, include_ignored: false, target_version: nil)
       @configuration = configuration
       @current_version = current_version
       @include_ignored = include_ignored
+      @target_version = target_version
     end
 
     ##
     # Version-reference findings in configured files.
     #
-    # @return [Array<Semverve::VersionReferences::Finding>]
+    # @return [Array<Semverve::Finding>]
     def findings
       files.flat_map { |path| findings_for_file(path) }
     end
@@ -124,7 +55,7 @@ module Semverve
     ##
     # Replaces found version references with the current version.
     #
-    # @return [Semverve::VersionReferences::FixResult]
+    # @return [Semverve::FixResult]
     def fix
       changed_files = []
       replacement_count = 0
@@ -140,7 +71,7 @@ module Semverve
         replacement_count += count
       end
 
-      FixResult.new(changed_files: changed_files, replacement_count: replacement_count)
+      Semverve::FixResult.new(changed_files: changed_files, replacement_count: replacement_count)
     end
 
     private
@@ -163,6 +94,12 @@ module Semverve
     # @return [Boolean]
     attr_reader :include_ignored
 
+    ##
+    # Exact version to match, when supplied by the task invocation.
+    #
+    # @return [Semverve::SemanticVersion, nil]
+    attr_reader :target_version
+
     ##
     # Absolute configured project root.
     #
@@ -195,7 +132,7 @@ module Semverve
     #
     # @param [String] path
     #
-    # @return [Array<Semverve::VersionReferences::Finding>]
+    # @return [Array<Semverve::Finding>]
     def findings_for_file(path)
       content = File.read(path)
 
@@ -317,10 +254,10 @@ module Semverve
     # @param [Hash] segment
     # @param [String] content
     #
-    # @return [Array<Semverve::VersionReferences::Finding>]
+    # @return [Array<Semverve::Finding>]
     def findings_for_segment(path, segment, content)
       references_for_segment(segment, content).map do |reference|
-        Finding.new(
+        Semverve::Finding.new(
           path: relative_path(path),
           line: segment[:line],
           column: reference[:column],
@@ -377,14 +314,9 @@ module Semverve
     #
     # @return [Boolean]
     def report?(version)
-      case configuration.version_reference_mode
-      when :older
-        version < current_version
-      when :non_current
-        version != current_version
-      else
-        raise Error, "Unknown version reference mode #{configuration.version_reference_mode.inspect}. Use :older or :non_current."
-      end
+      return version == target_version if target_version
+
+      match_policy.report?(version)
     end
 
     ##
@@ -405,6 +337,18 @@ module Semverve
       previous_nonblank_line&.include?(IGNORE_MARKER)
     end
 
+    ##
+    # Version matching behavior for references.
+    #
+    # @return [Semverve::VersionMatchPolicy]
+    def match_policy
+      @match_policy ||= VersionMatchPolicy.new(
+        current_version: current_version,
+        match_mode: configuration.version_match_mode,
+        target_version: target_version
+      )
+    end
+
     ##
     # Starting index for each line in content.
     #

data/lib/semverve.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative "semverve/finding"
+require_relative "semverve/fix_result"
+require_relative "semverve/version_literal_rewriter"
+require_relative "semverve/version_match_policy"
 require_relative "semverve/configuration"
 require_relative "semverve/version"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semverve
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Evan Gray
@@ -107,26 +107,34 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- UPGRADING.md
 - lib/semverve.rb
+- lib/semverve/adapters.rb
 - lib/semverve/configuration.rb
 - lib/semverve/docs_publisher.rb
 - lib/semverve/docs_publisher/task.rb
 - lib/semverve/error.rb
 - lib/semverve/file_list_resolver.rb
+- lib/semverve/finding.rb
+- lib/semverve/fix_result.rb
 - lib/semverve/formats.rb
 - lib/semverve/formats/module_constants.rb
 - lib/semverve/formats/simple_string.rb
 - lib/semverve/generator.rb
+- lib/semverve/package_metadata.rb
 - lib/semverve/presets.rb
 - lib/semverve/project_metadata.rb
 - lib/semverve/published_version.rb
+- lib/semverve/rails_config_metadata.rb
 - lib/semverve/railtie.rb
 - lib/semverve/semantic_version.rb
 - lib/semverve/task.rb
 - lib/semverve/version.rb
+- lib/semverve/version_checks.rb
 - lib/semverve/version_code_references.rb
 - lib/semverve/version_file.rb
-- lib/semverve/version_metadata.rb
+- lib/semverve/version_literal_rewriter.rb
+- lib/semverve/version_match_policy.rb
 - lib/semverve/version_references.rb
 - semverve.gemspec
 homepage: https://github.com/evanthegrayt/semverve