guard-jest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12086254600f743764afab326f8cd7d944139982
-  data.tar.gz: 754a8c45c368998d810518e74dd4968f9baa0733
+  metadata.gz: e51173ecdd1ecbf732e9838991950132fcde518f
+  data.tar.gz: 1ede3705d1d72367abc4b91e91b9fdd1e243437a
 SHA512:
-  metadata.gz: f8d72ca3d8057279249bfafe8709925b4f058ea484180c72a46764ea3e2b52f0e2f178c83ada98a12f3df29d6ea619951b11b2f5f2c0decd27779a0ae9567036
-  data.tar.gz: 02c4369e5df3c54de3088e940638baa79fdd81163b87b095d43a7fefd301198d0901446d0f3e030443d31c88c53776fc6fdf72308bd3e5ad305956e2333cb38c
+  metadata.gz: 58e8e05287085d9b1ed0ee308fc2796fe1cf96cac926e746372b1553936c274419a9e0068564311e3fc1b4e50a72f6c468382e4856777d3223c4e0dccee78f68
+  data.tar.gz: c0364f4dd06632399822b389924f194f98b31683db514828d0ba12b22b03b46e14a2a58e7162572c4998839f0b8b0dee1da909a44447f7809edb470cb28e0e9b

data/README.md

@@ -38,6 +38,11 @@ guard 'jest' do
 end
 ```
 
+## Interactive use
+
+From the Guard console, typeing 'j u' and pressing enter will trigger a snaphot update.
+
+
 ## Options
 
 There are many options that can customize Guard::Jest to your needs. Options are simply supplied as hash when

data/guard-jest.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'guard/jest/version'
 
 Gem::Specification.new do |spec|
     spec.name          = "guard-jest"
-    spec.version       = Guard::Jest::VERSION
+    spec.version       = '0.1.1'
     spec.authors       = ["Nathan Stitt"]
     spec.email         = ["nathan@stitt.org"]
 

data/lib/guard/jest.rb

@@ -19,6 +19,7 @@ module Guard
         end
 
         DEFAULT_OPTIONS = {
+            silent:   true,
             jest_cmd: 'jest'
         }.freeze
 
@@ -33,6 +34,7 @@ module Guard
         def initialize(options = {})
             options = DEFAULT_OPTIONS.merge(options)
             options[:server] = @server = options[:server] || Server.new(options)
+            Jest.logger = options[:logger] if options[:logger]
             @runner = options[:runner] || Runner.new(options)
             super(options)
         end
@@ -45,6 +47,15 @@ module Guard
         def start
             throw :task_has_failed unless server.start
             run_all if options[:all_on_start]
+            Pry::Commands.block_command "j", "Update Jest snapshots" do | cmd |
+                server = Guard.state.session.plugins.all(:jest).first.runner.server
+                case cmd
+                when 'u' then server.update_snapshots
+                else
+                    Formatter.error("unknown command #{cmd}")
+                end
+
+            end
         end
 
         # Called when `stop|quit|exit|s|q|e + enter` is pressed (when Guard quits).

data/lib/guard/jest/run_request.rb

@@ -4,10 +4,9 @@ module Guard
     class Jest < Plugin
         class RunRequest
 
-            attr_reader :paths, :runner, :result
+            attr_reader :paths, :result
 
-            def initialize(runner, paths)
-                @runner = runner
+            def initialize(paths = :all)
                 @paths = paths
                 @end_time = Time.now
                 @start_time = Time.now
@@ -34,7 +33,48 @@ module Guard
                 @end_time = Time.now
                 @is_complete.make_true
                 @result = json
-                runner.notify(self)
+                notify(json)
+            end
+
+            def notify(json)
+                r = json
+
+                specs         = r['numTotalTests'] - r['numPendingTests']
+                failed        = r['numFailedTests']
+                specs_plural  = specs == 1 ? '' : 's'
+                failed_plural = failed == 1 ? '' : 's'
+
+                Formatter.info("Finished in #{elapsed_seconds} seconds")
+
+                pending = r['numPendingTests'] > 0 ? " #{r['numPendingTests']} pending," : ''
+                message = "#{specs} spec#{specs_plural}," \
+                          "#{pending} #{failed} failure#{failed_plural}"
+                full_message = "#{message}\nin #{elapsed_seconds} seconds"
+
+                if failed.zero?
+                    Formatter.success(message)
+                    Formatter.notify(full_message, title: 'Jest suite passed')
+                else
+                    Formatter.error(
+                        collect_spec_error_messages(r['testResults']).join("\n")
+                    )
+                    error_title = collect_spec_error_titles(r['testResults']).join("\n")
+                    Formatter.notify("#{error_title}\n#{full_message}",
+                                     title: 'Jest test run failed', image: :failed, priority: 2)
+                end
+            end
+
+            def collect_spec_error_titles(specs)
+                specs.select { |s| s['status'] == 'failed' }.map do |s|
+                    result = s['assertionResults'].detect { |res| res['status'] == 'failed' }
+                    result ? result['title'] : 'Unknown failure'
+                end
+            end
+
+            def collect_spec_error_messages(specs)
+                specs.select { |s| s['status'] == 'failed' }.map do |s|
+                    s['message']
+                end
             end
         end
     end

data/lib/guard/jest/runner.rb

@@ -20,59 +20,17 @@ module Guard
             end
 
             def test_all
-                server.run(RunRequest.new(self, :all))
+                server.run(RunRequest.new(:all))
             end
 
             def test_paths(paths)
                 paths = paths.concat(last_failed_paths) if options[:keep_failed]
-
-                server.run(RunRequest.new(self, paths.uniq.compact))
+                server.run(RunRequest.new(paths.uniq.compact))
             end
 
             def remove_paths(paths)
                 self.last_failed_paths -= paths
             end
-
-            def notify(request)
-                @last_result = r = request.result
-
-                specs         = r['numTotalTests'] - r['numPendingTests']
-                failed        = r['numFailedTests']
-                specs_plural  = specs == 1 ? '' : 's'
-                failed_plural = failed == 1 ? '' : 's'
-
-                Formatter.info("Finished in #{request.elapsed_seconds} seconds")
-
-                pending = r['numPendingTests'] > 0 ? " #{r['numPendingTests']} pending," : ''
-                message = "#{specs} spec#{specs_plural}," \
-                          "#{pending} #{failed} failure#{failed_plural}"
-                full_message = "#{message}\nin #{request.elapsed_seconds} seconds"
-
-                if failed.zero?
-                    Formatter.success(message)
-                    Formatter.notify(full_message, title: 'Jest suite passed')
-                else
-                    Formatter.error(
-                        collect_spec_error_messages(r['testResults']).join("\n")
-                    )
-                    error_title = collect_spec_error_titles(r['testResults']).join("\n")
-                    Formatter.notify("#{error_title}\n#{full_message}",
-                                     title: 'Jest test run failed', image: :failed, priority: 2)
-                end
-            end
-
-            def collect_spec_error_titles(specs)
-                specs.select { |s| s['status'] == 'failed' }.map do |s|
-                    result = s['assertionResults'].detect { |res| res['status'] == 'failed' }
-                    result ? result['title'] : 'Unknown failure'
-                end
-            end
-
-            def collect_spec_error_messages(specs)
-                specs.select { |s| s['status'] == 'failed' }.map do |s|
-                    s['message']
-                end
-            end
         end
     end
 end

data/lib/guard/jest/server.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'concurrent/array'
 require 'concurrent/atomic/atomic_boolean'
 require 'pty'
@@ -6,9 +7,11 @@ require 'json'
 module Guard
     class Jest < Plugin
 
+        IGNORED_LINES = /(?:Watch Usage| › Press )/
+
         class Server
             CR = 13.chr
-
+            CLEAR = "\x1B[2J\x1B[3J\x1B[H"
             attr_reader :stdout, :stdin, :pid, :last_result, :options, :cmd, :pending
 
             def initialize(options = {})
@@ -36,6 +39,10 @@ module Guard
                 sleep(0.1) while busy?
             end
 
+            def update_snapshots
+                stdin.write('u')
+            end
+
             def start
                 @threads = []
                 @work_in_progress.make_true
@@ -59,6 +66,7 @@ module Guard
             end
 
             def stop
+                return unless alive?
                 stdin.write('q')
                 sleep(0.1)
                 return unless alive?
@@ -71,7 +79,8 @@ module Guard
             def reload(options)
                 @options = options
                 @directory = options[:directory]
-                @cmd = options[:jest_cmd] + ' --json --silent true --watch'
+                @cmd = options[:jest_cmd] + ' --json --watch'
+                @cmd << ' --silent' if options[:silent]
                 @cmd << " --config #{options[:config_file]}" if options[:config_file]
                 if alive?
                     stop
@@ -107,26 +116,43 @@ module Guard
                 stdin.write(CR)
             end
 
+            def log(line)
+                return if options[:silent] || line =~ IGNORED_LINES
+                line.sub!(CLEAR, '') # stop Jest from clearing console history
+                Jest.logger.info(line.chomp)
+            end
+
             def record_result(line)
                 # looks vaguely jsonish if it starts with {"
-                return unless line.start_with?('{"')
+
+                unless line =~ /\{\"numFailedTestSuites\"\:\d+/
+                    log(line)
+                    return
+                end
+
                 begin
+                    line.sub!(/\A.*?\{/, '{')
+                    line.sub!(/\}.*?\z/, '}')
                     json = JSON.parse(line)
                     result = @pending.pop
-                    result.satisfy(json) if result
+                    if result
+                        stdin.write('o') # revert back to watching changed files
+                    else
+                        result = RunRequest.new
+                    end
+                    result.satisfy(json)
                     @work_in_progress.make_false
                     work_fifo_queue
-                rescue => e
-                    Jest.logger.warn e
+                rescue e
+                    Jest.logger.warn e.class.to_s + ": " + e.message
+                    puts e.backtrace.join("\n")
                 end
             end
 
             def spawn
-                Jest.logger.debug "starting jest with #{cmd}"
+                Jest.logger.info "Starting Jest with #{cmd}"
                 @stdout, @stdin, @pid = PTY.spawn(cmd)
             end
-
         end
-
     end
 end

data/lib/guard/jest/version.rb

@@ -1,7 +1,7 @@
 require 'guard/compat/plugin'
 
 module Guard
-  class Jest < Plugin
-    VERSION = "0.1.0"
-  end
+    class Jest < Plugin
+        VERSION = "0.1.1"
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-jest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-compat
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Guard plugin for auto-running Jest specs