rspec_fixtures 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37311a80d9a2b365aa52e88fc85889b06bff30b34d816ac751f04babb675de9
-  data.tar.gz: 0f07c562bbc7ef087f6d7af93477b4d7a288364e62cb5e05dfa3ea1c81f712cc
+  metadata.gz: 52ab20de0624f17d2886b7dc0ca09dbafdbeb2ed2e09b48b9f7ac93d1bf04bdb
+  data.tar.gz: 9a798d88dc6e842cccf7564450e25f9252b5d4a625b20c37e04d835279136a57
 SHA512:
-  metadata.gz: e7d76a8ef480504d15633e5b98e46f8c4a3e85cdf328433b80cf828803403121e76613dcbd2bc360e3990dd8a360ed78b6935b28e62a7ca4388f8094cfb25c0d
-  data.tar.gz: c9efe17b0a4e6f70e680903e22c8f5546804bafa3ccb91f3ed06ae392f085369f7564944bdf2009e118e611def816c5bbdbe6d74fa96dc66a74997e9b6139251
+  metadata.gz: fcc930afc2eb48d158abc7d1fdafba227fd65962a20343dbfea0774639d092e9818285f4c3e6fa3b7992e77f9902d218ee2cedda8c8cf828d25c8658ea20df16
+  data.tar.gz: e887c4cf9d9eaeb57703163ae51b97d225957c24fbbd85e5805acff20b80383364672a85327208a95f793ab3c7427e38ff81c947fd347f369a33ef32f591624c

data/README.md

@@ -11,7 +11,7 @@ RSpec Fixtures
 RSpec Fixtures allows you to interactively review and approve testable
 content.
 
-[![asciicast](https://asciinema.org/a/150733.png)](https://asciinema.org/a/150733)
+![demo](demo.gif)
 
 ---
 

data/lib/rspec_fixtures/approval_handler.rb

@@ -1,5 +1,7 @@
-require 'colsole'
 require 'io/console'
+require 'colsole'
+require 'tty-prompt'
+require 'diffy'
 
 module RSpecFixtures
 
@@ -7,36 +9,87 @@ module RSpecFixtures
   class ApprovalHandler
     include Colsole
 
+    attr_reader :expected, :actual, :fixture_file
+
     def run(expected, actual, fixture_file)
-      line = '_' * terminal_width
+      @expected = expected
+      @actual = actual
+      @fixture_file = fixture_file
+
+      show expected.empty? ? actual : diff
+      prompt_user
+    end
+
+    private
+
+    def prompt_user
+      response = get_response
+
+      case response
+
+      when :approve, :reject
+        send response
+
+      when :actual, :expected, :diff
+        show send response
+        prompt_user
 
-      say "!txtgrn!#{line}"
-      if expected.empty?
-        say actual
-      else
-        say "> Old (Fixture):"
-        say expected
-        say "!txtpur!#{line}"
-        say "> New (Actual):"
-        say actual
-      end
-      say "!txtgrn!#{line}"
-      say "> Approve new fixture? (y/N): "
-      
-      if user_approves?
-        say "!txtgrn!Approved"
-        File.deep_write fixture_file, actual
-        true
       else
-        say "!txtred!Not Approved"
         false
+
       end
     end
 
-    private
+    def get_response
+      prompt.select "Please Choose:", menu_options, marker: '>'
+    rescue TTY::Reader::InputInterrupt
+      # :nocov:
+      return :reject
+      # :nocov:
+    end
+
+    def menu_options
+      base = {
+        'Reject (and fail test)' => :reject,
+        'Approve (and save fixture)' => :approve,
+      }
+
+      extra = {
+        'Show actual output' => :actual,
+        'Show expected fixture' => :expected,
+        'Show diff' => :diff,
+      }
+
+      expected.empty? ? base : base.merge(extra) 
+    end
+
+    def approve
+      say "!txtgrn!Approved"
+      File.deep_write fixture_file, actual
+      true
+    end
+
+    def reject
+      say "!txtred!Not Approved"
+      false
+    end
+
+    def separator
+      "!txtgrn!" + ('_' * terminal_width)
+    end
+
+    def diff
+      Diffy::Diff.new(expected, actual).to_s :color
+    end
+
+    def show(what)
+      say separator
+      say what
+      say separator
+    end
 
-    def user_approves?
-      $stdin.getch =~ /[Yy]/
+    def prompt
+      @prompt ||= TTY::Prompt.new
     end
   end
 end

data/lib/rspec_fixtures/version.rb

@@ -1,3 +1,3 @@
 module RSpecFixtures
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_fixtures
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement