popart 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 005aeee61238d9ab0c097656e5003e90eb72c639
-  data.tar.gz: 875d56fb6103b9f12c28b14cb2b9e572c8214f23
+  metadata.gz: 3f409136fba64bdca17bc8e6eedd84c15bf6bf12
+  data.tar.gz: dc1fded30805e9adf296b3b130f26cc05fede64f
 SHA512:
-  metadata.gz: f471dfb57acc8d2db933a13e06a53166477ab2d1d8f2586f2d46aa99a3752856d832fa971d234e79b76ed192e2113190be4c3bfa6d205422ba3cc666e96a0c4d
-  data.tar.gz: 8b970bf409d82ad3c41ba5175a742f2f0473baf6faaa683728c4cd1402a2c5bad7da550446fc428db4188f663c4e4f32dfa06de57fd9b5151ee4c4a3c4ac0e57
+  metadata.gz: 03f8e3d0388d75a94ea2492937f21e193fc93d7ea06548367f524d2c2ba9818fdce0829b68fee8da55a1f0fbc3fe7cd2ab9f05d626231c51980bd0fa44f41724
+  data.tar.gz: e89812d228542a459e5edd9a1b01a0bf5c749baa9bf768ad2c82aab3d42cc2c5810e1e758cd3a0ed0ab1cce42907e69e930b6f7b61839f58f981ade449b37abd

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # 0
-## 0.1
-### 1.1.2
+## 0.2.0
+Added threads
+### 0.1.2
 Added YAML file parsing to specify browsers better
 ### 0.1.1
 Allowed for gem pushes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    popart (0.1.2)
+    popart (0.2.0)
       parallel
       selenium-webdriver
 

data/README.md

@@ -2,6 +2,8 @@
 
 Use Sauce Labs to generate screenshots for your site across a range of browsers.
 
+Popart works fast!  It can use as much of your Sauce Labs concurrency as required (default is 5 concurrent sessions).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,13 +24,17 @@ Or install it yourself as:
 
 Currently, Popart only supports screenshots of a single page directly accessible by URL (with or without Sauce Connect).
 
-To use Popart, install it (as above) then
+To use Popart, install it (as above).
+
+Set the `SAUCE_USERNAME` and `SAUCE_ACCESS_KEY` environment variables to the values for your account.
+
+To run: 
 
 `popart url_to_screenshot`.
 
 This will cause Popart to take a shot with the default browsers (Chrome and Firefox Latest on Windows 10) and save them to `./screenshots`.
 
-### Configuring browsers and output location
+### Configuring browsers, threadcount and output location
 
 To configure further, copy `example_config.yaml` to your system, then customise to suit your requirements.  Pass config files to Popart like so:
 
@@ -49,3 +55,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[DylanLacey]/popart. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
+## TODO
+* Check account concurrency limit and use that by default
+* Error handling.  Any.
+

data/bin/popart

@@ -1,23 +1,15 @@
 #!/usr/bin/env ruby
 require "popart"
 
-config = Popart::Config.new
-config.initial_config
+Popart.configure
 
-browsers = config.browsers.map { |b| Popart::Browser.new b }
+output_directory = Popart.configuration.output_directory
+site = Popart.configuration.site
 
-STDOUT.puts "Fetching screenshots of #{config.site} and writing them to #{config.output_directory}"
+#STDOUT.puts "Fetching screenshots of #{config.site} and writing them to #{config.output_directory}"
 
-screenshots = browsers.map do |browser|
-  screenshot = browser.perform do |session|
-    session.navigate.to config.site
-    session.screenshot_as :png
-  end
-
-  filename = browser.capabilities["browserName"] + '_' + browser.capabilities["version"] + '_' + browser.capabilities["platform"] + '.png'
-  filename.gsub! " ", "-"
-
-  File.open((File.join config.output_directory, filename), 'w') do |file|
-    file.write screenshot
-  end
+Popart.thread_things(output_directory) do |browser|
+  browser.navigate.to site
+  sleep 25
+  cat = browser.screenshot_as :png
 end

data/example_config.yaml

@@ -6,4 +6,5 @@ browsers:
   - { browserName: "Chrome", platform: "Windows 7", version: "latest"}
   - { browserName: "Safari", platform: "OS X 10.12", version: "latest"}
   - { browserName: "Chrome", platform: "Linux", version: "45"}
-output_directory: "./output"
+output_directory: "./output"
+thread_count: 3

data/lib/popart.rb

@@ -1,7 +1,52 @@
 require "popart/version"
 require "popart/config"
 require "popart/browser"
+require "popart/worker"
+require "thread"
 
 module Popart
+  class << self
+    def configuration
+      @config ||= self.configure
+    end
 
+    def configure
+      @config = Popart::Config.new
+      @config.initial_config
+
+      @browsers = @config.browsers.map { |b| Popart::Browser.new b }
+    end
+
+    def save_screenshots directory, &actions
+      @browsers.each do |browser|
+        screenshot = browser.perform &actions
+
+        File.open((File.join directory, browser.filename), 'w') do |file|
+          file.write screenshot
+        end
+      end
+    end
+
+    def thread_things directory, &actions
+      threadcount = @config.thread_count
+      lock = Mutex.new
+
+      threads = []
+      threadcount.times do |t|
+        puts "Thread #{t}"
+        threads << Thread.new do
+          w = Popart::Worker.new @browsers, lock
+          w.perform do |browser|
+            screenshot = browser.perform &actions
+
+            File.open((File.join directory, browser.filename), 'w') do |file|
+              file.write screenshot
+            end
+          end
+        end
+      end
+
+      threads.map(&:join)
+    end
+  end
 end

data/lib/popart/browser.rb

@@ -12,8 +12,27 @@ module Popart
       unless @browser
         @browser = SeleniumSession.new capabilities
 
-        yield @browser
+        begin
+          yield @browser
+        rescue
+
+          # TODO SOMETHING LESS CRAP HERE
+        end
       end
     end
+
+    def filename
+      filename = capabilities["browserName"] + '_' + capabilities["version"] + '_' + capabilities["platform"] + '.png'
+      filename.gsub! " ", "-"
+
+      filename
+    end
+
+    def cleanup
+      @browser.quit if @browser
+    rescue
+    ensure
+      @browser = nil
+    end
   end
 end

data/lib/popart/config.rb

@@ -4,7 +4,7 @@ require "yaml"
 module Popart
   class Config
 
-    attr_accessor :browsers, :output_directory, :site
+    attr_accessor :browsers, :output_directory, :site, :thread_count
 
     def default_browsers
       [
@@ -16,6 +16,10 @@ module Popart
     def default_output_directory
       './screenshots'
     end
+
+    def default_thread_count
+      5
+    end
     
     def initial_config
       fn = ARGV[1] ||= './config.json'
@@ -33,11 +37,13 @@ module Popart
       @browsers = [config_hash["browsers"]].flatten
       @output_directory = config_hash["output_directory"]
       @site = config_hash["site"]
+      @thread_count = config_hash["thread_count"]
     end
 
     def set_defaults
       @browsers ||= default_browsers
       @output_directory ||= default_output_directory
+      @thread_count ||= default_thread_count
       set_site(@site ||= ARGV[0])
 
       @output_directory = Pathname.new @output_directory

data/lib/popart/do_the_thing.rb

@@ -0,0 +1,19 @@
+require "parallel"
+require "selenium/webdriver"
+
+module Popart
+	class DoTheThing
+
+  attr_accessor :url, :number_of_threads
+
+	def initialize url, number_of_threads
+    @url = url
+    @number_of_threads = number_of_threads
+
+
+
+    filedatas = Parallel.map(browsers, :in_threads => number_of_threads) do |browser|
+      
+    end 
+	end
+end

data/lib/popart/version.rb

@@ -1,3 +1,3 @@
 module Popart
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/popart/worker.rb

@@ -0,0 +1,21 @@
+module Popart
+  class Worker
+    def initialize browsers, lock
+      @browsers = browsers
+      @lock = lock
+      @work_remains = true
+    end
+
+    def perform &action
+      while @work_remains
+        browser = @lock.synchronize { @browsers.shift }
+        if browser
+          yield browser
+          browser.cleanup
+        else
+          @work_remains = false
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popart
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -106,8 +106,10 @@ files:
 - lib/popart.rb
 - lib/popart/browser.rb
 - lib/popart/config.rb
+- lib/popart/do_the_thing.rb
 - lib/popart/selenium_session.rb
 - lib/popart/version.rb
+- lib/popart/worker.rb
 - popart.gemspec
 homepage: http://www.github.com/dylanlacey/popart
 licenses: []