site_watcher 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d77a89f34668dbd4a2665be533691fe7a6c879b
-  data.tar.gz: a080492d4a1e3469f639a9f8300e93df86acefa2
+  metadata.gz: 5767baf72233d2af5eec6adb9b2810e0b8e8bd6c
+  data.tar.gz: 77bfeb19efc58a3d42e993bef52ce38f9e8087a5
 SHA512:
-  metadata.gz: 0cec86dcdc2db4a8988c67a196546b4a6eed64bcfdcbb005ed8c5e341a619bedcbb7e76bc0bd725dcb65f9af7d48fe6f2b25c5ccea3519eae407387569116a70
-  data.tar.gz: fb9278ea99c31e2b803d3996c5277f44e205639822d48fd70da70dd97505b51c20566ac7a0385727e302f6c2a7b0befd2427f5a29465e44f19a353f87e19bfbe
+  metadata.gz: f2491e2466343d145acf42246243612d336392fd3850138e10135b183418a23ec9e8e5245be49ed259311808484dbdf675fe79bf80820c36f08cdcc5eb21d8d0
+  data.tar.gz: 282ee975b7b81731b4e06e3e42f7e3b10435a360d3181c92ea5ead7cf2859cb8a2d3dc3775dfa478a5186357ed9f44bc95ca7b827fd01e5e1a77219463352827

data/README.md

@@ -1,4 +1,4 @@
-# SiteWatcher
+# SiteWatcher [![Gem Version](https://badge.fury.io/rb/site_watcher.svg)](http://badge.fury.io/rb/site_watcher)
 
 I wrote this to notify me when the Wii U Gamecube controller adapter becomes
 available.
@@ -46,6 +46,10 @@ end
 
 This script will block until all expectations have been fulfilled.
 
+## Testing fulfillment
+
+You can force a `SiteWatcher.watch` process to run each of its `fulfilled` blocks by sending it the `USR1` signal. The process will continue to run as normal after each block has been called.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/site_watcher/fork )

data/lib/site_watcher.rb

@@ -10,67 +10,97 @@ class SiteWatcher
   def self.watch(opts={}, &block)
     trap(:SIGINT) { abort(?\n) }
 
-    delay = opts.fetch(:every, 5)
     dsl = DSL::Top.new
     dsl.instance_eval(&block)
 
-    new(dsl.pages).watch(delay)
+    delay = opts.fetch(:every, 5)
+    logger = opts.fetch(:logger, ::Logger.new($stderr))
+    new(dsl.__sw_pages, delay, logger).watch
   end
 
-  def initialize(pages)
+  def initialize(pages, delay, logger)
     @pages = pages
-    @logger = ::Logger.new($stderr)
+    @delay = delay
+    @logger = logger
+    @force = false
   end
 
-  def watch(delay)
-    @pages.cycle do |page|
-      begin
-        page.__run!
-        @pages.delete(page)
-      rescue ::RSpec::Expectations::ExpectationNotMetError
-      rescue => e
-        @logger.warn("Exception on #{page.url}: #{e.inspect}")
+  def watch
+    capture_signals do
+      loop do
+        break if @pages.empty?
+
+        force = @force
+        @force &&= false
+
+        @pages.each do |page|
+          begin
+            page.__sw_run!(force)
+            @pages.delete(page)
+          rescue ::RSpec::Expectations::ExpectationNotMetError
+          rescue => e
+            @logger.warn("Exception on #{page.__sw_url}: #{e.inspect}")
+          end
+        end
+
+        sleep(@delay)
       end
+    end
+  end
+
+  private
+
+  def capture_signals
+    ::Signal.trap(:INT) { abort(?\n) }
 
-      sleep(delay) if @pages.last == page
+    ::Signal.trap(:USR1) do
+      ::Thread.new do
+        @logger.warn("Received USR1, next round of tests will force fulfillment")
+      end.join
+
+      @force = true
     end
+
+    yield
+  ensure
+    ::Signal.trap(:INT, "DEFAULT")
+    ::Signal.trap(:USR1, "DEFAULT")
   end
 
   module DSL
     class Top
-      attr_reader :pages
+      attr_reader :__sw_pages
 
       def initialize
-        @pages = []
+        @__sw_pages = []
       end
 
       def page(url, &block)
-        Page.new(url).tap do |page|
-          page.instance_eval(&block)
-          @pages << page
-        end
+        page = Page.new(url)
+        page.instance_eval(&block)
+        @__sw_pages << page
       end
     end
 
     class Page
       include ::RSpec::Matchers
-      attr_reader :url
+      attr_reader :__sw_url
 
       def initialize(url)
-        @url = url
-        @tests = []
+        @__sw_url = url
+        @__sw_tests = []
       end
 
       def test(&block)
-        @tests << block
+        @__sw_tests << block
       end
 
       def fulfilled(&block)
-        @fulfilled = block
+        @__sw_fulfilled = block
       end
 
-      def __run!
-        open(@url) do |response|
+      def __sw_run!(force=false)
+        ::OpenURI.open_uri(@__sw_url) do |response|
           case response.content_type
           when /json/i
             page = ::JSON.parse(response.read)
@@ -78,10 +108,22 @@ class SiteWatcher
             page = ::Capybara::Node::Simple.new(response.read)
           end
 
-          @tests.each { |test| test.call(page) }
-          @fulfilled.call(@url) if @fulfilled.respond_to?(:call)
+          begin
+            @__sw_tests.each { |test| test.call(page) }
+          rescue ::RSpec::Expectations::ExpectationNotMetError => err
+            __sw_fulfilled! if force
+            raise(err)
+          end
+
+          __sw_fulfilled!
         end
       end
+
+      private
+
+      def __sw_fulfilled!
+        @__sw_fulfilled.call(@__sw_url) if @__sw_fulfilled.respond_to?(:call)
+      end
     end
   end
 end

data/lib/site_watcher/version.rb

@@ -1,3 +1,3 @@
 class SiteWatcher
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_watcher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara