bs_plus 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad55a051a257d37a473405bcaae18fcac093130b
-  data.tar.gz: 57b707fbd2fb5e64c914294d9a06e29cd78c0d05
+  metadata.gz: 124bb13715d2c414f2ebe26e067c29e455826393
+  data.tar.gz: 839bc727d4255150d0d9ffcfa16d635c4e9ce22f
 SHA512:
-  metadata.gz: e51febaa2835869f01adc7d1ae787df82db2bd1ce86c986ba7e79ffb5d4beac9e68274c35f319637d83e693e44f279cea4ba9c65f05f70b513800845f8659e0f
-  data.tar.gz: f2d8971d4f3a0450225e108ae859f224e8c5d35488ca674c8dbb5eb8959aac7ac93b91d7c7b4806af53c7d0f3a55376ec3c4eb28528070fc1a37595422ab09b5
+  metadata.gz: 10bcb041e9f19b2f472217ababe9605712f754fe6f7b98105b8cf31704fdea0eb1069f572287c1ac1e172918ab99bbeba026e078f0a93df175b20203b2f9cb17
+  data.tar.gz: b7199022ba7925518e8b4ba690e1f8a465a07bb0eca8ddf9992650021b3f6c8c6a8aeb8a4f0323ce13bcf7d7151bbc127be6e5cdacb48638e8c83ddab1b8228b

data/bs_plus.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie', '>3.0.0'
   spec.add_dependency 'launchy', '>=2.4.0'
   spec.add_dependency 'selenium-webdriver', '>=2.44.0'
+  spec.add_dependency 'json', '>=1.8.1'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/bs_plus/browser.rb

@@ -26,12 +26,21 @@ class Browser < Hashie::Dash
         map {|e| new e}}
   end
 
-  Popular = [
-    new({browser: 'ie', browser_version: '7.0', os: 'Windows', os_version: 'XP'}),
+  Desktop = [
+    new({browser: 'ie', browser_version: '8.0',  os: 'Windows', os_version: '7'}),
+    new({browser: 'ie', browser_version: '9.0',  os: 'Windows', os_version: '7'}),
+    new({browser: 'ie', browser_version: '10.0', os: 'Windows', os_version: '7'}),
+    new({browser: 'ie', browser_version: '11.0', os: 'Windows', os_version: '7'}),
+    new({browser: 'firefox', browser_version: '30.0', os: 'Windows', os_version: '7'}),
+    new({browser: 'chrome',  browser_version: '33.0', os: 'Windows', os_version: '7'}),
   ]
-
-  IEs = all.select {|e| e.browser[/ie/i]}
-
+  IEs      = all.select {|e| e.browser[/ie/i]}
+  Androids = all.select {|e| e.os[/android/i]}
+  Mobile   = [
+    new({browser: 'android', browser_version: '', os: 'android', os_version: '4.4', device: 'Samsung Galaxy S5'}),
+    new({browser: 'iphone', browser_version: '', os: 'ios', os_version: '7.0', device: 'iPhone 5C'}),
+  ]
+  Popular = (Desktop + Mobile)
 
   def snapshot url
     # Input capabilities
@@ -46,13 +55,17 @@ class Browser < Hashie::Dash
            "@hub.browserstack.com/wd/hub",
       desired_capabilities: caps)
 
-    puts "Starting #{self}"
-    driver.navigate.to url
-    puts "Reached #{driver.title} from #{self}, saving screenshot"
-    driver.save_screenshot(file = CGI.escape("#{url}__#{self}.png"))
-    driver.quit
-    puts "Done #{self}"
-    Launchy.open "./#{file}"
+    begin
+      puts "Starting #{self}"
+      driver.navigate.to url
+      puts "Reached #{driver.title} from #{self}, saving screenshot"
+      driver.save_screenshot(file = CGI.escape("#{url}__#{self}.png"))
+      driver.quit
+      puts "Done #{self}"
+      Launchy.open "./#{file}"
+    rescue => e
+      puts "#{e.inspect} from #{self}"
+    end
   end
 
   def to_s

data/lib/bs_plus/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'rest-client'
 require 'json'
 require 'parallel'
+require 'bs_plus/browser'
 
 module BsPlus
   class Cli < Thor
@@ -12,17 +13,22 @@ module BsPlus
       Browser.all.each {|e| puts e }
     end
 
+    BrowsersOption = {
+      'desktop'  => Browser::Desktop,
+      'ies'      => Browser::IEs,
+      'androids' => Browser::Androids,
+      'mobile'   => Browser::Mobile,
+      'popular'  => Browser::Popular,
+    }
+
     desc 'get WHAT [-b BROWSERS]', 'takes snapshot(s)'
-    method_option :browsers, default: 'popular', aliases: '-b'
+    method_option :browsers, default: 'desktop', aliases: '-b',
+      desc:"#{BrowsersOption.keys.to_sentence} or one from 'bs list'"
     def get url
       url = "http://#{url}" unless url[/http/]
 
-      case options[:browsers]
-      when 'popular' then Browser::Popular
-      when 'ies'     then Browser::IEs
-      else
-        Browser.parse options[:browsers]
-      end.
+      (BrowsersOption[options[:browsers]] ||
+       Browser.parse(options[:browsers])).
         tap {|e| puts "Snapshotting with #{e.size} browsers:"}.
         tap!{|e| Parallel.map(e, in_threads: 5) {|b| b.snapshot url}}
     end

data/lib/bs_plus/version.rb

@@ -1,3 +1,3 @@
 module BsPlus
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bs_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Leo
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.44.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement