wraith 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad5c9e4eecd6cbe1a694bc29c62410ff45b7c86
-  data.tar.gz: c84b6e122617e02962a281ad885717342c919d35
+  metadata.gz: 49d53e6583e9fabf57c3f55f25567c2ac8ce32ec
+  data.tar.gz: 88d3d71b9c69d819769a5ab18d92a5433d1c2900
 SHA512:
-  metadata.gz: 5d415de27039b977ba067eac6a0f17edacdd301ea5a43e5058454b8b8b35151f1a1bc9cc0b0216695374ff9b2d11bce6afc90ffe11299c5ca14af8818ade9917
-  data.tar.gz: 68d6c30abf6631ba704fe705290b9ca909d95859b8268e0886ef19773c991fdb90aa36972fba343ad3a7089729ca41f3e45365005b4a3c90ad8110f81d642419
+  metadata.gz: f676037d79b75fb02c4912bc23a4ab119fd5a0ab7645bade4ecc4abb3672c0c08cda53a53942989d8f31eb71edd8c0cb1780e6435e1b64e14fac2c6b6ed68465
+  data.tar.gz: 7610535f0bfe23ff74df774502e32f8f63ec30423a3e42e1b1f071deb31c387b9d51249e1ef7f60895cc71f896aafd528afa908502ab33ba178ea4c9fba68ed7

data/.gitignore

@@ -3,3 +3,4 @@ shots/
 data.txt
 .DS_Store
 *.swp
+Gemfile.lock

data/Rakefile

@@ -7,7 +7,6 @@ require 'wraith/spider'
 require 'wraith/folder'
 require 'wraith/thumbnails'
 require 'wraith/compare_images'
-require 'wraith/images'
 require 'wraith/gallery'
 
 @config = ('config')
@@ -19,7 +18,7 @@ task :config, [:yaml] do |_t, custom|
   Rake::Task['default'].invoke
 end
 
-task default: [:reset_shots_folder, :check_for_paths, :setup_folders, :save_images, :check_images, :crop_images, :compare_images, :generate_thumbnails, :generate_gallery] do
+task default: [:reset_shots_folder, :check_for_paths, :setup_folders, :save_images, :crop_images, :compare_images, :generate_thumbnails, :generate_gallery] do
   puts 'Done!'
 end
 
@@ -53,11 +52,6 @@ task :crop_images do
   crop.crop_images
 end
 
-task :check_images do
-  image = Wraith::Images.new(@config)
-  image.files
-end
-
 task :generate_thumbnails do
   thumbs = Wraith::Thumbnails.new(@config)
   thumbs.generate_thumbnails

data/bin/wraith

@@ -3,7 +3,7 @@
 begin
   require 'wraith/cli'
   Wraith::CLI.start
-rescue Interrupt => e
+rescue Interrupt
   puts "\nQuitting..."
   exit 1
 rescue SystemExit => e

data/lib/wraith/cli.rb

@@ -6,7 +6,6 @@ require 'wraith/spider'
 require 'wraith/folder'
 require 'wraith/thumbnails'
 require 'wraith/compare_images'
-require 'wraith/images'
 require 'wraith/gallery'
 
 class Wraith::CLI < Thor
@@ -41,11 +40,6 @@ class Wraith::CLI < Thor
       spider = Wraith::Spidering.new(config_name)
       spider.check_for_paths
     end
-
-    def check_images(config_name)
-      image = Wraith::Images.new(config_name)
-      image.files
-    end
   end
 
   desc 'save_images [config_name]', 'captures screenshots'
@@ -85,10 +79,17 @@ class Wraith::CLI < Thor
     check_for_paths(config)
     setup_folders(config)
     save_images(config)
-    check_images(config)
     crop_images(config)
     compare_images(config)
     generate_thumbnails(config)
     generate_gallery(config)
   end
+
+  desc 'multi_capture [filelist]', 'A Batch of Wraith Jobs'
+  def multi_capture(filelist)
+    config_array = IO.readlines(filelist)
+    config_array.each do |config|
+      capture(config.chomp)
+    end
+  end
 end

data/lib/wraith/crop.rb

@@ -26,10 +26,14 @@ class Wraith::CropImages
         height_to_crop_to = compare_height
       end
 
-      Wraith::Wraith.crop_images(image_to_crop, height_to_crop_to)
+      crop_task(image_to_crop, height_to_crop_to)
     end
   end
 
+  def crop_task(crop, height)
+    `convert #{crop} -background none -extent 0x#{height} #{crop}`
+  end
+
   def image_height(image)
     File.open(image, 'rb') do |fh|
       size = ImageSize.new(fh.read).size

data/lib/wraith/folder.rb

@@ -44,17 +44,16 @@ class Wraith::FolderManager
 
   # Tidy up the shots folder, removing uncessary files
   #
-  def tidy_shots_folder dirs
+  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}
+        if b.none? { |_k, v| v[:data] > 0 }
           FileUtils.rm_rf("#{wraith.directory}/#{a}")
           dirs.delete(a)
         end
       end
     end
   end
-
 end

data/lib/wraith/gallery.rb

@@ -70,10 +70,10 @@ class Wraith::GalleryGenerator
       end
     end
     @folder_manager.tidy_shots_folder(@dirs)
-    if [ 'diffs_only', 'diffs_first' ].include?(wraith.mode)
-      @sorted = @dirs.sort_by { |category, sizes| -1 * sizes.max_by { |size, dict| dict[:data]}[1][:data] }
+    if %w(diffs_only diffs_first).include?(wraith.mode)
+      @sorted = @dirs.sort_by { |_category, sizes| -1 * sizes.max_by { |_size, dict| dict[:data] }[1][:data] }
     else
-      @sorted = @dirs.sort_by { |category, sizes| category }
+      @sorted = @dirs.sort_by { |category, _sizes| category }
     end
     # The sort has made this into an enumerable, convert it back to a Hash
     Hash[@sorted]

data/lib/wraith/save_images.rb

@@ -39,7 +39,7 @@ class Wraith::SaveImages
 
   def attempt_image_capture(width, url, filename, max_attempts)
     max_attempts.times do |i|
-      wraith.capture_page_image engine, url, width, filename
+      capture_page_image engine, url, width, filename
 
       return if File.exist? filename
 
@@ -80,8 +80,16 @@ class Wraith::SaveImages
         FileUtils.cp invalid, filename
 
         # Set width of fallback image
-        wraith.set_image_width(filename, width)
+        set_image_width(filename, width)
       end
     end
   end
+
+  def set_image_width(image, width)
+    `convert #{image} -background none -extent #{width}x0 #{image}`
+  end
+
+  def capture_page_image(browser, url, width, file_name)
+    puts `"#{browser}" "#{wraith.phantomjs_options}" "#{wraith.snap_file}" "#{url}" "#{width}" "#{file_name}"`
+  end
 end

data/lib/wraith/spider.rb

@@ -4,7 +4,6 @@ require 'nokogiri'
 require 'uri'
 
 class Wraith::Spidering
-
   def initialize(config)
     @wraith = Wraith::Wraith.new(config)
   end
@@ -24,7 +23,6 @@ class Wraith::Spidering
 end
 
 class Wraith::Spider
-
   def initialize(wraith)
     @wraith = wraith
     @paths = {}
@@ -40,19 +38,16 @@ class Wraith::Spider
   def write_file
     File.open(@wraith.spider_file, 'w+') { |file| file.write(@paths) }
   end
-  
+
   def add_path(path)
     @paths[path == '/' ? 'home' : path.gsub('/', '__').chomp('__').downcase] = path.downcase
   end
 
   def spider
-
   end
-
 end
 
 class Wraith::Crawler < Wraith::Spider
-
   EXT = %w(flv swf png jpg gif asx zip rar tar 7z \
            gz jar js css dtd xsd ico raw mp3 mp4 \
            wav wmv ape aac ac3 wma aiff mpg mpeg \
@@ -77,15 +72,13 @@ class Wraith::Crawler < Wraith::Spider
   def modified_since(file, since)
     (Time.now - File.ctime(file)) / (24 * 3600) < since
   end
-
 end
 
 class Wraith::Sitemap < Wraith::Spider
-
   def spider
     unless @wraith.sitemap.nil?
       puts "reading sitemap.xml from #{@wraith.sitemap}"
-      if @wraith.sitemap =~ URI::regexp
+      if @wraith.sitemap =~ URI.regexp
         sitemap = Nokogiri::XML(open(@wraith.sitemap))
       else
         sitemap = Nokogiri::XML(File.open(@wraith.sitemap))
@@ -94,7 +87,7 @@ class Wraith::Sitemap < Wraith::Spider
       sitemap.css('loc').each do |loc|
         path = loc.content
         # Allow use of either domain in the sitemap.xml
-        @wraith.domains.each do |k, v|
+        @wraith.domains.each do |_k, v|
           path.sub!(v, '')
         end
         if @wraith.spider_skips.nil? || @wraith.spider_skips.none? { |regex| regex.match(path) }
@@ -103,6 +96,4 @@ class Wraith::Sitemap < Wraith::Spider
       end
     end
   end
-
 end
-

data/lib/wraith/thumbnails.rb

@@ -15,7 +15,11 @@ class Wraith::Thumbnails
 
     Parallel.each(files, in_processes: Parallel.processor_count) do |filename|
       new_name = filename.gsub(/^#{wraith.directory}/, "#{wraith.directory}/thumbnails")
-      wraith.thumbnail_image(filename, new_name)
+      thumbnail_image(filename, new_name)
     end
   end
+
+  def thumbnail_image(png_path, output_path)
+    `convert #{png_path} -thumbnail 200 -crop 200x200+0+0 #{output_path}`
+  end
 end

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'
 end

data/lib/wraith/wraith.rb

@@ -4,7 +4,14 @@ class Wraith::Wraith
   attr_accessor :config
 
   def initialize(config_name)
-    @config = YAML.load(File.open("configs/#{config_name}.yaml"))
+    if File.exist?(config_name) && File.extname(config_name) == '.yaml'
+      @config = YAML.load(File.open(config_name))
+    else
+      @config = YAML.load(File.open("configs/#{config_name}.yaml"))
+    end
+  rescue
+    puts 'unable to find config'
+    exit 1
   end
 
   def directory
@@ -68,36 +75,14 @@ class Wraith::Wraith
   end
 
   def mode
-    if ['diffs_only', 'diffs_first', 'alphanumeric'].include?(@config['mode'])
+    if %w(diffs_only diffs_first alphanumeric).include?(@config['mode'])
       @config['mode']
     else
       'alphanumeric'
     end
   end
 
-  def capture_page_image(browser, url, width, file_name)
-    puts `"#{browser}" #{@config['phantomjs_options']} "#{snap_file}" "#{url}" "#{width}" "#{file_name}"`
-  end
-
-  def self.crop_images(crop, height)
-    # For compatibility with windows file structures switch commenting on the following 2 lines
-    `convert #{crop} -background none -extent 0x#{height} #{crop}`
-    # puts `convert #{crop.gsub('/', '\\')} -background none -extent 0x#{height} #{crop.gsub('/', '\\')}`
-  end
-
-  def crop_images(_crop, _height)
-    self.class.crop_images
-  end
-
-  def set_image_width(image, width)
-    # For compatibility with windows file structures switch commenting on the following 2 lines
-    `convert #{image} -background none -extent #{width}x0 #{image}`
-    # puts `convert #{image.gsub('/', '\\')} -background none -extent #{width}x0 #{image.gsub('/', '\\')}`
-  end
-
-  def thumbnail_image(png_path, output_path)
-    # For compatibility with windows file structures switch commenting on the following 2 lines
-    `convert #{png_path} -thumbnail 200 -crop 200x200+0+0 #{output_path}`
-    # `convert #{png_path.gsub('/', '\\')} -thumbnail 200 -crop 200x200+0+0 #{output_path}`
+  def phantomjs_options
+    @config['phantomjs_options']
   end
 end

data/spec/wraith_spec.rb

@@ -12,6 +12,7 @@ describe Wraith do
   Given(:test_image2) { 'shots/test/test2.png' }
   Given(:diff_image) { 'shots/test/test_diff.png' }
   Given(:data_txt) { 'shots/test/test.txt' }
+  Given(:saving) { Wraith::SaveImages.new(config_name) }
 
   When(:wraith) { Wraith::Wraith.new(config_name) }
   Then { wraith.is_a? Wraith::Wraith }
@@ -31,7 +32,7 @@ describe Wraith do
     # capture_page_image
     When do
       wraith.engine.each do |_type, engine|
-        wraith.capture_page_image(engine, test_url1, 320, test_image1)
+        saving.capture_page_image(engine, test_url1, 320, test_image1)
       end
     end
     When(:image_size) { ImageSize.path(test_image1).size }
@@ -41,8 +42,8 @@ describe Wraith do
   context 'When comparing images' do
     When(:diff_image_size) do
       wraith.engine.each do |_type, engine|
-        wraith.capture_page_image(engine, test_url1, 320, test_image1)
-        wraith.capture_page_image(engine, test_url2, 320, test_image2)
+        saving.capture_page_image(engine, test_url1, 320, test_image1)
+        saving.capture_page_image(engine, test_url2, 320, test_image2)
       end
       Wraith::CropImages.new(config_name).crop_images
       Wraith::CompareImages.new(config_name).compare_task(test_image1, test_image2, diff_image, data_txt)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Dave Blooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -182,7 +182,6 @@ files:
 - lib/wraith/gallery.rb
 - lib/wraith/gallery_template/bootstrap.min.css
 - lib/wraith/gallery_template/gallery_template.erb
-- lib/wraith/images.rb
 - lib/wraith/javascript/nojs.js
 - lib/wraith/javascript/snap.js
 - lib/wraith/save_images.rb

data/lib/wraith/images.rb

@@ -1,20 +0,0 @@
-require 'wraith'
-
-class Wraith::Images
-  attr_reader :wraith
-
-  def initialize(config)
-    @wraith = Wraith::Wraith.new(config)
-  end
-
-  def files
-    files = Dir.glob("#{wraith.directory}/*/*.png").sort
-    invalid = File.expand_path('../../assets/invalid.jpg', File.dirname(__FILE__))
-    files.each do |filename|
-      if File.stat("#{filename}").size == 0
-        FileUtils.cp invalid, filename
-        puts "#{filename} is invalid"
-      end
-    end
-  end
-end