watircats 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5df83a0e30799d0a3c844005316edd2e0d5f87d
-  data.tar.gz: b7b07badae0c4ff54e8266afc594eac5cd3f6905
+  metadata.gz: c8db0dd7100f49a4111d751dae08c83246a11e89
+  data.tar.gz: 6f38d5995b960361f2ab8d20120c03700b0d29a8
 SHA512:
-  metadata.gz: 3285222f1d6dfcd699340ed5ddfddf4f83e1cab0c1be9ebe20d0b43758728fd0e0cd1cecba3db9c6c19315f7d956afe2034157cb742c1a93270a18b2bcc50560
-  data.tar.gz: bad339c10f794b8d610daeb67cc9e6c932ffcfacc4afcda6bc94c1df5267951f5e456e992b72ac1fe5c8756da68ab3367f96a24bd4fabe275479eb24df6ae59c
+  metadata.gz: 3d05e999a2c93621e415865156f48fa59f736e70e79d7a7046c27d0a7f321ccb977fd958397d6eb56950ebed3037cb6db3d78383f9105f64bd12a70d976e2985
+  data.tar.gz: 72dd10d1e5912dc34c6f130db57f986c0874ab06e90652fce138d0deb91c8cb64457ca58995e365c28ee232696fd169aecd8bb621e01ad3ea7a2fa1740264d18

data/Gemfile

@@ -1,4 +1,3 @@
-ruby "2.0.0"
 
 source "http://rubygems.org"
 
@@ -11,4 +10,5 @@ gem "thor"
 gem "haml"
 gem "psych"
 gem "awesome_print"
-gem "minitest"
+gem "minitest"
+gem "autotest"

data/README.md

@@ -1,4 +1,5 @@
 # WatirCats
+[![Gem Version](https://badge.fury.io/rb/watircats.svg)](http://badge.fury.io/rb/watircats)
 
 WatirCats began as a simple fork of Wraith, from the developers at BBC News.
 
@@ -24,14 +25,14 @@ WatirCats uses Watir-Webdriver to grab screenshots of pages at multiple widths.
 
 ## Installation
 
-`gem install WatirCats`
+`gem install watircats`
 
 or
 
 - Checkout this repository
 - `bundle install`
 - `gem build watircats.gemspec`
-- `gem install WatirCats-0.2.0.gem`
+- `gem install watircats-0.2.3.gem`
 
 ## Usage
 
@@ -65,10 +66,10 @@ If you want to add functionality to this project, pull requests are welcome.
 ## License
 
 WatirCats is available to everyone under the terms of the MIT open source
-licence. Take a look at the LICENSE file in the code.
+license. Take a look at the LICENSE file in the code.
 
 ## Credits
 
- * [Andrew Leaf](http://clockwork.net/people/andrew_leaf/)
- * [Wraith from BBC News](http://github.com/bbc-news/wraith)
+ * [Leaf Andrew](http://clockwork.net/people/andrew_leaf/) - author, maintainer
+ * [Wraith from BBC News](http://github.com/bbc-news/wraith) - original concept
 

data/lib/watircats/comparer.rb

@@ -1,5 +1,5 @@
 module WatirCats
-  class Comparer 
+  class Comparer
 
     NO_CHANGE = "Snow"
     ERROR     = "Crimson"
@@ -10,10 +10,10 @@ module WatirCats
 
       @@results    = [ ]
       @@strip_zero = WatirCats.config.strip_zero_differences || nil
-     
+
       @comparison_dir = WatirCats.config.output_dir.chomp("/")
       # Get the last two directories that were created
-      
+
       previous_shots_folder = source_a.chomp("/")
       latest_shots_folder   = source_b.chomp("/")
 
@@ -26,13 +26,13 @@ module WatirCats
       # Return self
       self
     end
-   
+
     def reset_comparison_folder
       if File.directory? @comparison_dir
         dir_contents = Dir.glob("#{@comparison_dir}/*_compared.png")
         if dir_contents.size > 0
           dir_contents.each do |shot|
-            FileUtils.rm(shot)  
+            FileUtils.rm(shot)
           end
         end
       else
@@ -46,7 +46,7 @@ module WatirCats
 
       old_shots.each do |old_shot|
         new_shot = old_shot.gsub(previous, latest)
-      
+
         next unless File.exists? new_shot
         # Set a file prefix for output and info
         base_name     = old_shot.split("/").last.split(".").first
@@ -59,12 +59,12 @@ module WatirCats
         elsif comparison.match(/^[1-9]/)
           status = CHANGE
         end
-        @@results << { :compared_shot => output_file, 
+        @@results << { :compared_shot => output_file,
                        :result => comparison, :status_color => status }
 
         # Remove the file if there is no change to be concerned with
-        if @@strip_zero == true 
-          begin 
+        if @@strip_zero == true
+          begin
             FileUtils.rm "#{@comparison_dir}/#{output_file}" if status == NO_CHANGE
           rescue Exception => msg
             print msg
@@ -76,9 +76,9 @@ module WatirCats
       # Run the generate thumbs
       generate_thumbs if WatirCats.config.reporting_enabled
     end
-    
-    def generate_thumbs  
-    
+
+    def generate_thumbs
+
       unless results.size < 1
         unless File.directory? "#{@comparison_dir}/thumbs"
           FileUtils.mkdir "#{@comparison_dir}/thumbs"
@@ -133,4 +133,4 @@ module WatirCats
     end
 
   end
-end
+end

data/lib/watircats/mapper.rb

@@ -6,7 +6,7 @@ module WatirCats
 
     def initialize( base_url, scheme )
       # Class variables that persist throughout the life of the application
-      
+
       @limit = WatirCats.config.limit
       @proxy = WatirCats.config.proxy
 
@@ -17,7 +17,7 @@ module WatirCats
       restrict_paths
 
       @base_url = base_url
-  
+
       # If the :url_list option is passed, it is assumed to be a file of urls,
       # one on each line. Otherwise, assume there is a sitemap
       if WatirCats.config.url_list
@@ -29,7 +29,7 @@ module WatirCats
           exit 1
         end
       else
-        xml        = get_sitemap_as_xml( scheme, @base_url ) 
+        xml        = get_sitemap_as_xml( scheme, @base_url )
         urls       = parse_sitemap_into_urls(xml)
       end
 
@@ -45,7 +45,7 @@ module WatirCats
         proxy = nil
       end
 
-      begin 
+      begin
         sitemap_data = ::OpenURI.open_uri((the_scheme + "://" + base_url + "/sitemap.xml"), :proxy => proxy )
         sitemap_xml  = ::XmlSimple.xml_in(sitemap_data)
       rescue Exception => msg
@@ -69,13 +69,13 @@ module WatirCats
       # Determine if this is the first pass
       if @@master_paths.size == 0
         mode = :first_run
-      else 
+      else
         mode = :not_first
       end
 
       # Create an empty hash to store paths in
       pending_paths = {}
-      
+
       # Iterate through the urls, grab only the valid paths post domain
       # Store each path_key with the extrapolated path
       urls.each do |url|
@@ -83,7 +83,7 @@ module WatirCats
 
         # Handled paths to look for and avoid
         if @subtree
-          next unless path.match @subtree 
+          next unless path.match @subtree
         end
         if @avoided_path
           next if path.match @avoided_path
@@ -105,7 +105,7 @@ module WatirCats
           end
         end
       end
-      
+
       # Store master paths if this is the first pass
       @@master_paths.merge! pending_paths if mode == :first_run
       # return the paths to crawl
@@ -114,7 +114,7 @@ module WatirCats
 
     def the_paths
       # TODO: Insert logic to limit to a specific subtree here
-      
+
       # Return the paths if there is a @limit
       return @the_paths.first(@limit.to_i) if @limit
       @the_paths.first(@the_paths.length)
@@ -134,10 +134,10 @@ module WatirCats
 
       # Only visit paths that match @subtree
       @subtree = WatirCats.config.limited_path
-      if @subtree 
+      if @subtree
         @subtree = /#{WatirCats.config.limited_path}/
       end
-      
+
       # If avoided_path is specified, avoid those
       @avoided_path = WatirCats.config.avoided_path
       if @avoided_path
@@ -146,4 +146,4 @@ module WatirCats
     end
 
   end
-end
+end

data/lib/watircats/snapper.rb

@@ -55,10 +55,10 @@ module WatirCats
       
       # skip existing screenshots if we've specified that option
       if WatirCats.config.skip_existing
-          if FileTest.exists?(file_name)
-             puts "Skipping existing file at " + file_name
-             return
-          end
+        if FileTest.exists?(file_name)
+         puts "Skipping existing file at " + file_name
+         return
+        end
       end
 
 
@@ -125,6 +125,9 @@ module WatirCats
           end
         end
 
+        # Skip if a redirect matches the avoided path
+        next if @browser.url.match( /#{WatirCats.config.avoided_path}/ )
+
         # For each width, resize the browser, take a screenshot
         widths.each do |width|
           resize_browser width

data/lib/watircats/version.rb

@@ -1,3 +1,3 @@
 module WatirCats
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watircats
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andrew Leaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all