wraith 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c76259cb8695e6552a8b7b939994e6b9a99e59
-  data.tar.gz: b78bf8799a480270634004106ccd6f840c4fda70
+  metadata.gz: e0d2d6ee9fae5134b1d49d7a676668d2061adc76
+  data.tar.gz: 8059a9c46cb989cb4cdd7170040e119dea0fdb2c
 SHA512:
-  metadata.gz: 2737b52433482b8f89dda9eddaa2a4e413e3abe272034f69eee1daca65a7838ca45484659cb43d92c9fc1ba020f4a9f12b8d05178c4e69d4fc693c0c5e0a3194
-  data.tar.gz: 7c109a5ea043b6dc145d18eaabb470637223386e5cb9bd0f5c15e96c11cc90362113de5061cbcd2b080fd22a26aa29a1fe55bb96f3b0d299a0f5db6b60eb3aa1
+  metadata.gz: aa6062ac558cad8bd0c5d0dee90d53d129ed3ac98722b2614a6741b8a823b011dc9c8a6360f6351828e2f2ed280f5ae3667b73c6a8cc8ba571c44fde2df6ff60
+  data.tar.gz: 847aa419b46d19450a9340191d72d68f1691f63bf44de78684ca4e04b711e4b8c225ff1cce1cf397e048db38c486e790ce18bdda6deaa6d2465f4739e9fcb02a

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - "1.9.2"
+  - "1.9.3"
   - "2.0.0"
 
-script: ruby -Ilib bin/wraith capture test_config
+script: bundle exec rspec
 
 notifications:
   email:

data/README.md

@@ -17,7 +17,7 @@ and then creates a diff of the two images, the affected areas are highlighted in
 blue
 
 ![Photo of BBC News with a
-diff](http://bbc-news.github.io/wraith/img/320_diff.png)
+diff](http://bbc-news.github.io/wraith/img/wraith.png)
 
 
 ## Requirements

data/configs/test_config.yaml

@@ -11,15 +11,13 @@ directory: 'shots'
 
 # Add only 2 domains, key will act as a label
 domains:
-  english: "http://pal.live.bbc.com/news"
-  russian: "http://pal.live.bbc.co.uk/russian"
+  english: "http://www.bbc.co.uk/russian"
+  russian: "http://www.bbc.co.uk/russian"
 
 #Type screen widths below, here are a couple of examples
 screen_widths:
   - 320
   - 600
-  - 768
-  - 1024
   - 1280
 
 #Type page URL paths below, here are a couple of examples

data/lib/wraith/cli.rb

@@ -86,7 +86,6 @@ class Wraith::CLI < Thor
   def generate_gallery(config_name)
     gallery = Wraith::GalleryGenerator.new(config_name)
     gallery.generate_gallery
-    puts 'Gallery generated'
   end
 
   desc 'capture [config_name]', 'A full Wraith job'

data/lib/wraith/folder.rb

@@ -55,17 +55,17 @@ class Wraith::FolderManager
     puts 'Creating Folders'
   end
 
-  # Tidy up the shots folder, removing uncessary files
-  #
   def tidy_shots_folder(dirs)
-    if wraith.mode == 'diffs_only'
-      dirs.each do |a, b|
-        # If we are running in "diffs_only mode, and none of the variants show a difference
-        # we remove the file from the shots folder
-        if b.none? { |_k, v| v[:data] > 0 }
-          FileUtils.rm_rf("#{wraith.directory}/#{a}")
-          dirs.delete(a)
+    dirs.each do |folder_name, shot_info|
+      if shot_info.none? { |_k, v| v[:data] > 0 }
+        if wraith.mode == 'diffs_only'
+          FileUtils.rm_rf("#{wraith.directory}/#{folder_name}")
+          dirs.delete(folder_name)
+        else
+          return true
         end
+      else
+        return false
       end
     end
   end

data/lib/wraith/gallery.rb

@@ -45,7 +45,7 @@ class Wraith::GalleryGenerator
         end
       end
     end
-    @folder_manager.tidy_shots_folder(@dirs)
+    @failed_shots = @folder_manager.tidy_shots_folder(@dirs)
     sorting_dirs(@dirs)
   end
 
@@ -122,6 +122,15 @@ class Wraith::GalleryGenerator
     directories = parse_directories(@location)
     generate_html(@location, directories, TEMPLATE_BY_DOMAIN_LOCATION, dest, withPath)
     FileUtils.cp(BOOTSTRAP_LOCATION, "#{@location}/bootstrap.min.css")
+    puts 'Gallery generated'
+    check_failed_shots
+  end
+
+  def check_failed_shots
+    if @failed_shots == false
+      puts 'Failures detected'
+      exit 1
+    end
   end
 
   class ErbBinding < OpenStruct

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/spec/wraith_spec.rb

@@ -6,13 +6,13 @@ describe Wraith do
   Given { Wraith::FolderManager.new(config_name).clear_shots_folder }
   Given { Dir.mkdir('shots/test') }
   let(:config_name) { 'test_config' }
-  let(:test_url1) { 'http://www.live.bbc.co.uk/news' }
-  let(:test_url2) { 'http://www.live.bbc.co.uk/russian' }
+  let(:test_url1) { 'http://www.bbc.co.uk/russian' }
+  let(:test_url2) { 'http://www.bbc.co.uk/russian' }
   let(:test_image1) { 'shots/test/test1.png' }
   let(:test_image2) { 'shots/test/test2.png' }
   let(:diff_image) { 'shots/test/test_diff.png' }
   let(:data_txt) { 'shots/test/test.txt' }
-  let(:selector) { ''}
+  let(:selector) { '' }
   let(:saving) { Wraith::SaveImages.new(config_name) }
 
   When(:wraith) { Wraith::Wraith.new(config_name) }
@@ -21,9 +21,9 @@ describe Wraith do
   context 'When creating a wraith worker' do
 
     Then { wraith.config.keys.size == 7 }
-    Then { wraith.widths == [320, 600, 768, 1024, 1280] }
-    Then { wraith.base_domain == 'http://pal.live.bbc.com/news' }
-    Then { wraith.comp_domain == 'http://pal.live.bbc.co.uk/russian' }
+    Then { wraith.widths == [320, 600, 1280] }
+    Then { wraith.base_domain == 'http://www.bbc.co.uk/russian' }
+    Then { wraith.comp_domain == 'http://www.bbc.co.uk/russian' }
     Then { wraith.base_domain_label == 'english' }
     Then { wraith.comp_domain_label == 'russian' }
     Then { wraith.paths == { 'home' => '/', 'uk_index' => '/uk' } }
@@ -62,7 +62,7 @@ describe Wraith do
       Wraith::CropImages.new(config_name).crop_images
       Wraith::CompareImages.new(config_name).compare_task(test_image1, test_image2, diff_image, data_txt)
       Wraith::Thumbnails.new(config_name).generate_thumbnails
-	   end
+    end
     Then { File.exist?('shots/thumbnails/test/test1.png') && File.exist?('shots/thumbnails/test/test2.png') && File.exist?('shots/thumbnails/test/test_diff.png') }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Dave Blooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry