shoot 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152d35943f02692f5c763b5928e6dcfcf0c51e29
-  data.tar.gz: 51152e373355366c011881fbb8b6aecca33444a8
+  metadata.gz: 5ca9a9451cff2cc399deb61e11c3fd1f18bff01a
+  data.tar.gz: 4d3aabcee015d1579598430f3d4c3f6834d61d31
 SHA512:
-  metadata.gz: 8ae30e0c7ba313cab8298b866d9ffa0750c0e16a26242d8eebb5bf77efff96db56b27ab5c1c9d81d110f1ea92c8de0ca9df132a0221573c5c3c50106273e1a7d
-  data.tar.gz: 9edf0ae57d9cea0a13df09202a63f6fe9c4e08aa4b0e5ebbe079d143a2578a2115834b0259d4e69c4ed9d1d93fdbb7761c3f95eb6df14f09cfa103baa235f54b
+  metadata.gz: 56fe978d7c64ce752396bc1c09dcccc5deab326568c1eccc7f9cee00036e7200a75cd07ac48c227d7c172e0e7f36e1e6bc7049d389636bf40644857aa421173f
+  data.tar.gz: 679738bbf228d54c4b788b9b2618cc7ecc185ebe5ffc788c8eeb7071d60448649fa34f0c72031a98cc6b0062abf3d12f52d72738811da568d92df1cbf72e7284

data/README.md

@@ -3,7 +3,7 @@
 
 # Shoot
 
-Shoot is a helper library to take screenshots using BrowserStack. If you don't need a full integration test coupled with screenshots, it's a simpler choice.
+Shoot is a helper library to take screenshots using [BrowserStack](https://www.browserstack.com/). If you don't need a full integration test coupled with screenshots, it's a simpler choice.
 
 ## Installation
 
@@ -39,14 +39,12 @@ The first thing you should do is:
 	538  ios 7.0             iphone        iPhone 5S
 	539  ios 7.0             iphone        iPhone 5C
 	
-The `list` command basically fetches all browsers available on BrowserStack and caches them locally on `.screenshots/.browsers.json`. You can choose to add this folder on your `.gitignore`, since shoot will save all images there as well.
+The `list` command basically fetches all browsers available on [BrowserStack](https://www.browserstack.com/) and caches them locally on `.screenshots/.browsers.json`. You can choose to add this folder on your `.gitignore`, since shoot will save all images there as well.
 
 Then, you can choose to activate the browsers you wanna use, based on id. Example:
 
 	$ shoot activate 2
 
-This will activate (given your output is the same as above) chrome 16 on OS X Snow Leopard.
-
 Now, create a scenario. Here's an example:
 
 ```ruby
@@ -87,7 +85,7 @@ end
 ```
 
 
-If you wanna just test your scenarios, without paying SauceLabs and wasting time with remote connections:
+If you wanna just test your scenarios, without paying [BrowserStack](https://www.browserstack.com/) and wasting time with remote connections:
 
 	$ shoot test my_scenario.rb
 	
@@ -95,14 +93,12 @@ Or you can run a whole folder, like:
 
 	$ shoot test my_scenarios/
 
-The `test` command will run locally using phantomjs (capybara).
+The `test` command will run locally using [phantomjs](http://phantomjs.org/) ([poltergeist](https://github.com/teampoltergeist/poltergeist)).
 
 You can choose to deactivate the browsers you don't wanna use, based on id as well. Example:
 
 	$ shoot deactivate 2
 
-This will deactivate (given your output is the same as above) chrome 16 on OS X Snow Leopard.
-
 If you want to deactivate all the active browsers at once you can run:
 
 	$ shoot deactivate_all
@@ -145,9 +141,9 @@ You got the idea.
 	shoot update                          # Update browser list (WARNING: will override active browsers)
 	shoot version, --version, -v          # Shoot version
 
-### Using ngrok
+### Using [ngrok](https://ngrok.com/)
 
-In order to access your local development environment on BrowserStack you need to forward it somehow to the external work (a.k.a. the internet). BrowserStack has it's own forwarded, but ngrok is better. If you wanna use it:
+In order to access your local development environment on [BrowserStack](https://www.browserstack.com/) you need to forward it somehow to the external world (a.k.a. the internet). [BrowserStack](https://www.browserstack.com/) has it's own forwarder, but [ngrok](https://ngrok.com/) is better. If you wanna use it:
 
 1. Install it from [https://ngrok.com/download](https://ngrok.com/download)
 
@@ -157,25 +153,25 @@ In order to access your local development environment on BrowserStack you need t
 
 ``` ruby
   def my_test
-    my_server = Shoot::Ngrok(12345)
+    my_server = Shoot::Ngrok.new(12345)
     visit my_server.url
   end
 ```
 
-Where `12345` is the port of your local server. The default is `3000`, since I believe you're probably using Rails.
+Where `12345` is the port of your local server. The default is `3000`, since I believe you're probably using [Rails](http://rubyonrails.org/).
 
-#### What if I'm using pow?
+#### What if I'm using [pow](http://pow.cx)?
 
-If you're using pow, skip step 3 above and do it like this instead:
+If you're using [pow](http://pow.cx), skip step 3 above and do it like this instead:
 
 ``` ruby
   def my_test
-    my_server = Shoot::NgrokPow(:my_server_folder)
+    my_server = Shoot::NgrokPow.new(:my_server_folder)
     visit my_server.url
   end
 ```
 
-NgrokPow will create another symlink of your server folder with a unique name and forward it correctly to ngrok. This symlink will be properly removed at the end of the execution of shoot.
+NgrokPow will create another symlink of your server folder with a unique name and forward it correctly to [ngrok](https://ngrok.com/). This symlink will be properly removed at the end of the execution of shoot.
 
 ## Contributing
 

data/lib/shoot/cli.rb

@@ -9,41 +9,12 @@ module Shoot
     require 'fileutils'
     FileUtils::mkdir_p '.screenshots'
     map %w[--version -v] => :version
-    map %w[--interactive -i] => :interactive
 
     desc 'version, --version, -v', 'Shoot version'
     def version
       puts Shoot::VERSION
     end
 
-    INTERACTIVE_COMMANDS = {
-      active:         ->(_)     { active },
-      activate:       ->(params){ activate(*params.split(" ")) },
-      deactivate:     ->(params){ deactivate(*params.split(" ")) },
-      deactivate_all: ->(_)     { deactivate_all },
-      list:           ->(params){ list(params) },
-      open:           ->(_)     { open },
-      test:           ->(params){ test(params) },
-      scenario:       ->(params){ scenario(params) },
-      update:         ->(_)     { update },
-      exit:           ->(_)     { @exit = true }
-    }
-
-    desc 'interactive, --interactive, -i', 'Interactive mode'
-    def interactive
-      @exit = false
-      while ! @exit
-        choose do |menu|
-          menu.layout = :menu_only
-          menu.shell  = true
-
-          INTERACTIVE_COMMANDS.each do |command_name, command_action|
-            menu.choice(command_name, desc(command_name)){|_, details| command_action.call(details) }
-          end
-        end
-      end
-    end
-
     desc 'open', 'Opens all screenshots taken'
     def open
       `open #{Dir.glob(".screenshots/**/*.png").join(" ")}`
@@ -59,12 +30,13 @@ module Shoot
       table Browser.active
     end
 
-    desc 'scenario PATH', 'Runs the given scenario or all files in a directory on all active platforms'
-    def scenario(path)
+    desc 'scenario PATH', 'Runs the given scenario or all files in a directory on all active or specified platforms'
+    def scenario(path, *browser_ids)
       scenarios = File.directory?(path) ? Dir.glob("#{path}/*.rb") : [path]
 
+      browsers = browser_ids.empty? ? Browser.active : Browser.select_by_ids(browser_ids)
       elapsed_time do
-        Browser.active.each do |browser|
+        browsers.each do |browser|
           scenarios.each do |scenario|
             run scenario, browser
           end

data/lib/shoot/scenario.rb

@@ -3,12 +3,17 @@ require 'capybara'
 require 'timeout'
 
 class Shoot::Scenario
-  URL = sprintf 'http://%s:%s@hub.browserstack.com/wd/hub',
-                ENV['BROWSERSTACK_USER'],
-                ENV['BROWSERSTACK_KEY']
 
   include Capybara::DSL
 
+  def self.url
+    raise "I guess you forgot your browserstack credetials. Take a look at the docs." unless ENV['BROWSERSTACK_USER'] and ENV['BROWSERSTACK_KEY']
+
+    @@url ||= sprintf 'http://%s:%s@hub.browserstack.com/wd/hub',
+      ENV['BROWSERSTACK_USER'],
+      ENV['BROWSERSTACK_KEY']
+  end
+
   def initialize(platform=nil)
     if platform
       @platform = platform
@@ -17,12 +22,21 @@ class Shoot::Scenario
       Capybara.register_driver platform_name do |app|
         Capybara::Selenium::Driver.new(app,
                                        browser: :remote,
-                                       url: URL,
+                                       url: Shoot::Scenario.url,
                                        desired_capabilities: @capabilities)
         end
     else
       require 'capybara/poltergeist'
 
+      options = {
+         :js_errors => false,
+         :phantomjs_options => ["--web-security=false"]
+      }
+
+      Capybara.register_driver :poltergeist do |app|
+        Capybara::Poltergeist::Driver.new(app, options)
+      end
+
       Capybara.run_server = false
       @platform_name = :poltergeist
     end
@@ -30,16 +44,6 @@ class Shoot::Scenario
     Capybara.current_driver = platform_name
   end
 
-  def find *args
-    Timeout.timeout(10) do
-      begin
-        super *args
-      rescue
-        retry
-      end
-    end
-  end
-
   def run(method)
     @current_method = method
     send(method)
@@ -68,6 +72,22 @@ class Shoot::Scenario
                        end
   end
 
+  protected
+
+  # In Selenium the enter key is :return
+  # and on poltergeits it is :Enter
+  def enter_key
+    remote? ? :return : :Enter
+  end
+
+  def remote?
+    @platform_name != :poltergeist
+  end
+
+  def send_enter(selector)
+    find(selector).native.send_key(enter_key)
+  end
+
   private
 
   def directory
@@ -80,7 +100,7 @@ class Shoot::Scenario
   end
 
   def shoot(label)
-    save_screenshot("#{directory}/#{label}.png")
+    save_screenshot("#{directory}/#{label}.png", full: true)
   rescue => e
     File.write("#{directory}/#{label}.error.txt", %(#{e.inspect}\n\n#{e.backtrace.join("\n")}))
   end
@@ -97,6 +117,7 @@ class Shoot::Scenario
     @capabilities[:platform] = @platform.os
     @capabilities[:device] = @platform.device if @platform.device
     @capabilities[:emulator] = @platform.emulator
+    @capabilities[:rotatable] = true
   end
 
 end

data/lib/shoot/version.rb

@@ -1,3 +1,3 @@
 module Shoot
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoot
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Juan Lulkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler