rspec_approvals 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9d20fbefe8c582b91491fc68d138f968d2af93a2ebddadc1fbcec28cd4825b
-  data.tar.gz: 2ef26b7fa67d9bce2136d7ccb03c3c3c02984152b366eac600c6e870f3586b31
+  metadata.gz: c3ff469b7a7e1566249ed3c1c56e11121907a6a3866ad6dd5b9d754167bc8409
+  data.tar.gz: 63aa1daaafb280caee02bac81513adfaa2a49904c0efe7c0e8413ff47d58520e
 SHA512:
-  metadata.gz: 4e2fb14501ecfc75f57c4c81b126d4b51d4a7339a014aab4a9ddbf83c86af3839fc58f83d088f42e85cd33fc858239a67247ebe0670539364c2953988b2d2d69
-  data.tar.gz: 11c4cd21df4ca1295cb6d1087d81c9e70e1717f2015037e21aca7214a99a77a1f989468655e6c01ad76795c822bd6935c4abbd846dce410e60e6e0c8531496fa
+  metadata.gz: f7acae848e872e4dce5f9a3ba712c12cec05b0fdba9103c7959c9ee9eb5989d67ee34e3ad2c1c6122d8897518eb0ef533a338466ff2e8bf9f3282b8b108b1472
+  data.tar.gz: 4b8adb50942d8e4c4d2e5da57d8624122d9dffd72f02ad5f246d2535ca26eff3dfd827ea85f1dd35b6d30954be79eb7070ff9f3f9700cdba0f9452bf70fc46c7

data/lib/rspec_approvals/approval_handler.rb

@@ -3,7 +3,6 @@ require 'colsole'
 require 'diffy'
 
 module RSpecApprovals
-
   # Handles user input and interactive approvals
   class ApprovalHandler
     include Colsole
@@ -22,7 +21,7 @@ module RSpecApprovals
   private
 
     def prompt_user
-      response = auto_approve? ? :approve : get_response
+      response = auto_approve? ? :approve : user_response
 
       case response
 
@@ -43,38 +42,38 @@ module RSpecApprovals
       RSpec.configuration.auto_approve
     end
 
-    def get_response
-      Prompt.select "Please Choose:", 'r', menu_options
+    def user_response
+      Prompt.select 'Please Choose:', 'r', menu_options
     end
 
     def menu_options
       base = {
         'a' => ['Approve (and save)', :approve],
-        'r' => ['Reject (and fail test)', :reject]
+        'r' => ['Reject (and fail test)', :reject],
       }
 
       extra = {
         '1' => ['Show actual output', :actual],
         '2' => ['Show expected output', :expected],
-        '3' => ['Show diff', :diff]
+        '3' => ['Show diff', :diff],
       }
 
-      expected.empty? ? base : base.merge(extra) 
+      expected.empty? ? base : base.merge(extra)
     end
 
     def approve
-      say "!txtgrn!Approved"
+      say 'g`Approved`'
       File.deep_write approval_file, actual
       true
     end
 
     def reject
-      say "!txtred!Not Approved"
+      say 'r`Not Approved`'
       false
     end
 
     def separator
-      "!txtgrn!" + ('_' * terminal_width)
+      "g`#{'_' * terminal_width}`"
     end
 
     def diff
@@ -82,10 +81,10 @@ module RSpecApprovals
     end
 
     def show(what)
-      say ""
+      say ''
       say separator
       say what
       say separator
     end
   end
-end
+end

data/lib/rspec_approvals/extensions/file.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 class File
   def self.deep_write(file, content)
     dir = File.dirname file
-    FileUtils.mkdir_p dir unless Dir.exist? dir
+    FileUtils.mkdir_p dir
     File.write file, content
   end
 end

data/lib/rspec_approvals/extensions/stringio.rb

@@ -25,4 +25,3 @@ unless StringIO.method_defined? :wait_readable
     end
   end
 end
-

data/lib/rspec_approvals/matchers/base.rb

@@ -1,11 +1,10 @@
 module RSpecApprovals
   module Matchers
-
     # A base matcher for approvals
     class Base
       attr_reader :approval_name, :actual, :distance, :actual_distance
 
-      def initialize(approval_name=nil)
+      def initialize(approval_name = nil)
         @before = nil
         @approval_name = approval_name
       end
@@ -18,7 +17,7 @@ module RSpecApprovals
         @actual = sanitize @actual
         success = strings_match?
 
-        if success or !interactive?
+        if success || !interactive?
           success
         else
           approve_approval
@@ -36,9 +35,9 @@ module RSpecApprovals
       # Enables the ability to do something like:
       # `expect(string).to match_approval(file).except(/\d+/)
       def except(regex, replace = '...')
-        before ->(str) do
+        before lambda { |str|
           str.gsub regex, replace
-        end
+        }
       end
 
       # Enables the ability to adjust the actual string before checking
@@ -57,10 +56,10 @@ module RSpecApprovals
 
       # Called by RSpec when there is a failure
       def failure_message
-        return "actual string is empty" if actual.empty?
+        return 'actual string is empty' if actual.empty?
 
         result = "expected: #{actual}\nto match: #{expected}"
-        
+
         if distance
           result = "#{result}\n(actual distance is #{actual_distance} instead of the expected #{distance})"
         end
@@ -80,7 +79,7 @@ module RSpecApprovals
       end
 
       # Returns true if RSpec is configured to allow interactivity.
-      # By default, interactivity is enabled unless the environment 
+      # By default, interactivity is enabled unless the environment
       # variable `CI` is set.
       def interactive?
         RSpec.configuration.interactive_approvals
@@ -96,7 +95,7 @@ module RSpecApprovals
       def approval_file
         "#{approvals_dir}/#{approval_name}"
       end
-      
+
     protected
 
       # Asks for user approval. Used by child classes.
@@ -110,21 +109,21 @@ module RSpecApprovals
         File.exist?(approval_file) ? File.read(approval_file) : ''
       end
 
-      # Do the actual test. 
+      # Do the actual test.
       # - If .before() was used, we foreward the actual output to the
       #   proc for processing first.
       # - If before_approval proc was configured, forward the acual output
       #   to the proc for processing.
-      # - If .diff() was used, then distance will be set and then 
-      #   we "levenshtein it". 
+      # - If .diff() was used, then distance will be set and then
+      #   we "levenshtein it".
       # - Otherwise, compare with ==
       def strings_match?
         if @before
           @before.each do |proc|
-            @actual = proc.call actual 
+            @actual = proc.call actual
           end
         end
-        
+
         if RSpec.configuration.before_approval.is_a? Proc
           @actual = RSpec.configuration.before_approval.call actual
         end
@@ -137,12 +136,11 @@ module RSpecApprovals
         end
       end
 
-      # Returns the input string stripped of ANSI escape codes if the 
+      # Returns the input string stripped of ANSI escape codes if the
       # strip_ansi_escape configuration setting was set to true
       def sanitize(string)
         sanitize? ? Strings::ANSI.sanitize(string) : string
       end
     end
-
   end
 end

data/lib/rspec_approvals/matchers/match_approval.rb

@@ -7,9 +7,11 @@ module RSpecApprovals
     def match_approval(expected)
       MatchApproval.new expected
     end
-    
+
     class MatchApproval < Base
+      def description
+        %[match approval "#{approval_name}"]
+      end
     end
-    
   end
-end
+end

data/lib/rspec_approvals/matchers/output_approval.rb

@@ -5,11 +5,12 @@ module RSpecApprovals
     def output_approval(expected)
       OutputApproval.new expected
     end
-    
+
     class OutputApproval < Base
       # Called by RSpec
       def matches?(block)
         return false unless block.is_a? Proc
+
         @actual = stream_capturer.capture block
         super
       end
@@ -19,6 +20,10 @@ module RSpecApprovals
         true
       end
 
+      def description
+        %[output approval "#{approval_name}"]
+      end
+
       # Adds chained matcher, to allow:
       # expect { stream }.to output_approval(file).to_stdout
       # This is the default, and only provided for completeness.
@@ -37,7 +42,6 @@ module RSpecApprovals
       def stream_capturer
         @stream_capturer ||= Stream::Stdout
       end
-
     end
   end
-end
+end

data/lib/rspec_approvals/matchers/raise_approval.rb

@@ -5,11 +5,12 @@ module RSpecApprovals
     def raise_approval(expected)
       RaiseApproval.new expected
     end
-    
+
     class RaiseApproval < Base
       # Called by RSpec
       def matches?(block)
         return false unless block.is_a? Proc
+
         @actual = 'Nothing raised'
 
         begin
@@ -25,6 +26,10 @@ module RSpecApprovals
       def supports_block_expectations?
         true
       end
+
+      def description
+        %[raise approval "#{approval_name}"]
+      end
     end
   end
-end
+end

data/lib/rspec_approvals/module_functions.rb

@@ -8,4 +8,4 @@ module RSpecApprovals
       @stderr ||= StringIO.new
     end
   end
-end
+end

data/lib/rspec_approvals/prompt.rb

@@ -8,18 +8,18 @@ module RSpecApprovals
 
       def select(prompt, default, options)
         options.each do |key, config|
-          color = key == default ? 'txtred' : 'txtgrn'
-          say "!#{color}!#{key}!txtrst!) #{config.first}"
+          color = key == default ? 'r' : 'g'
+          say "#{color}`#{key}`) #{config.first}"
         end
-        
-        say "\n!txtblu!#{prompt}!txtrst! "
-        response = STDIN.getch.downcase
-        
+
+        say "\nb`#{prompt}` "
+        response = $stdin.getch.downcase
+
         response = default unless options.has_key? response
-        
-        resay "!txtpur!#{options[response].first}"
+
+        say "m`#{options[response].first}`", replace: true
         options[response].last
       end
     end
   end
-end
+end

data/lib/rspec_approvals/stream.rb

@@ -6,36 +6,35 @@ module RSpecApprovals
   # These methods are borrowed from rspec's built in matchers
   # https://github.com/rspec/rspec-expectations/blob/add9b271ecb1d65f7da5bc8a9dd8c64d81d92303/lib/rspec/matchers/built_in/output.rb
   module Stream
-    module Stdout
-      def self.capture(block)
+    module Capture
+      def self.capture(stream, block)
         RSpecApprovals.stdout.truncate 0
         RSpecApprovals.stdout.rewind
+        RSpecApprovals.stderr.truncate 0
+        RSpecApprovals.stderr.rewind
 
-        original_stream = $stdout
+        stdout_original_stream = $stdout
+        stderr_original_stream = $stderr
         $stdout = RSpecApprovals.stdout
+        $stderr = RSpecApprovals.stderr
         block.call
-        RSpecApprovals.stdout.string.dup
-
+        RSpecApprovals.send(stream).string.dup
       ensure
-        $stdout = original_stream
+        $stdout = stdout_original_stream
+        $stderr = stderr_original_stream
+      end
+    end
 
+    module Stdout
+      def self.capture(block)
+        Capture.capture :stdout, block
       end
     end
 
     module Stderr
       def self.capture(block)
-        RSpecApprovals.stderr.truncate 0
-        RSpecApprovals.stderr.rewind
-
-        original_stream = $stderr
-        $stderr = RSpecApprovals.stderr
-        block.call
-        RSpecApprovals.stderr.string.dup
-
-      ensure
-        $stderr = original_stream
-
+        Capture.capture :stderr, block
       end
     end
   end
-end
+end

data/lib/rspec_approvals/version.rb

@@ -1,3 +1,3 @@
 module RSpecApprovals
-  VERSION = "0.9.1"
-end
+  VERSION = '0.9.3'
+end

data/lib/rspec_approvals.rb

@@ -11,4 +11,3 @@ require 'rspec_approvals/matchers/output_approval'
 require 'rspec_approvals/matchers/raise_approval'
 
 require 'rspec_approvals/rspec_config'
-

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: rspec_approvals
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: string-similarity
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: strings-ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: strings-ansi
+  name: string-similarity
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.1'
 description: Automatic interactive approvals for rspec
 email: db@dannyben.com
 executables: []
@@ -89,7 +95,8 @@ files:
 homepage: https://github.com/DannyBen/rspec_approvals
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Interactive RSpec Approvals