bs_plus 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ef79f517a0f5960f59b7f423f7e789ef78d9cf
-  data.tar.gz: 7e378be96c8e21a63b93e595ca691300b36f502f
+  metadata.gz: 31c9318207264588a4c9f051e500cf5eece9bc10
+  data.tar.gz: 1db8198c21da3785d102d3ec5c636dce741054e6
 SHA512:
-  metadata.gz: 45b208d72ba84aba6a27973fd5581ace78aeb9e258c06154f0197e2ec6403eb3c246ad5ab37c21a0ddf6fe0837a4b8a12f26f1a59270bfb41a8655cb1a8c3e1b
-  data.tar.gz: 0d5aac37a115b93e5991dbd76b54d3cf46bf8d0abe708c94cba8dd28caec802d23193193e96b0de35ec70716a8f4d02cdc8719671e234c978e5cd103a0b78353
+  metadata.gz: 518a9294bf768795f36ceb728e72837575e7cbeae979f0aa3c9221b30b6f226ae83a203cb4e3de4cfcdf3ab6b1570ebb1e963b0a042c68598c1174400899ab0a
+  data.tar.gz: 9410299b2ead437cb5572697de8435c0dbef8075890e9a1770be0690421bc5f0f49f31be629cd2f5ba63892c183751391ca0e92f7d3b1f036d38c70be03d38f4

data/README.md

@@ -27,3 +27,7 @@ Currently there's a binary named bs, it prints its usage.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+Launch with
+RUBYLIB=lib bundle exec rescue bin/bs get google.com -b "ie8"
+or RUBYLIB pry -rbs_plus

data/bs_plus.gemspec

@@ -20,17 +20,22 @@ Gem::Specification.new do |spec|
 
 
   spec.add_dependency 'highline', '>=1.6.21'
-  spec.add_dependency 'activesupport', '>=3.0.0'
+  spec.add_dependency 'activesupport', '>=4.2.0'
   spec.add_dependency 'retryable', '>=1.3.5'
   spec.add_dependency 'parallel', '>=1.3.0'
   spec.add_dependency 'thor', '>=0.19.1'
   spec.add_dependency 'rest-client', '>=1.7.2'
-  spec.add_dependency 'hashie', '>3.0.0'
+  spec.add_dependency 'hashie', '>3.1.0'
   spec.add_dependency 'launchy', '>=2.4.0'
   spec.add_dependency 'selenium-webdriver', '>=2.44.0'
+  spec.add_dependency 'capybara', '>=2.2.1'
+  spec.add_dependency 'os', '>=0.9.4'
+  spec.add_dependency 'childprocess', '>=0.5.5'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry-rescue'
+  spec.add_development_dependency 'pry-doc'
+  # spec.add_development_dependency 'pry-stack_explorer'
   spec.add_development_dependency 'pry'
 end

data/lib/bs_plus.rb

@@ -1,9 +1,23 @@
 require 'bs_plus/core_ext'
 require 'bs_plus/version'
 require 'bs_plus/config'
+require 'childprocess'
+require 'os'
 BsPlus::Config.init # will ask for username/password if not present, hehe
 
 require 'bs_plus/cli'
 
 module BsPlus
+  def self.with_tunnel
+    p = ChildProcess.build File.expand_path(File.join(Kernel.__dir__, '../bin', "BrowserStackLocal#{case
+    when OS.windows? then 'Windows'; when OS.linux? then 'Linux'; when OS.mac? then 'Mac'; end}")),
+            '-force', '-forcelocal', Config.fetch(:password)
+    p.io.inherit!
+    p.start
+    sleep 4.5
+    raise "Problem with tunnel" unless p.alive?
+    yield
+  ensure
+    p.stop# unless p.alive?
+  end
 end

data/lib/bs_plus/browser.rb

@@ -6,6 +6,7 @@ require 'selenium-webdriver'
 require 'launchy'
 require 'hashie'
 require 'cgi'
+require 'capybara'
 require 'bs_plus/config'
 
 module BsPlus
@@ -43,35 +44,88 @@ class Browser < Hashie::Dash
   ]
   Popular = (Desktop + Mobile)
 
-  def snapshot url
-    # Input capabilities
+
+  def new_session options={}
+    options.reverse_merge! local: true
     caps = Selenium::WebDriver::Remote::Capabilities.new.tap {|c|
       self.stringify_keys.select{|k,v| v}.each {|k,v| c[k] = v}
-      c["browserstack.debug"] = "true"
-      c["name"]               = "Running BrowserStack from command line"
+      c["browserstack.debug"] = 'true'
+      c['browserstack.local'] = (!!options[:local]).to_s
+      c['acceptSslCerts']     = 'true'
+      c["name"]               = 'Running bs_plus from command line'
     }
 
-    driver = Selenium::WebDriver.for(:remote,
-      url: "https://#{Config.fetch(:username)}:#{Config.fetch(:password)}"\
-           "@hub.browserstack.com/wd/hub",
-      desired_capabilities: caps)
+    Capybara.register_driver(:"#{to_s}") { |app|
+      Capybara::Selenium::Driver.new(app, browser: :remote,
+        url: "https://#{Config.fetch(:username)}:#{Config.fetch(:password)}"\
+             "@hub-eu.browserstack.com/wd/hub",
+        desired_capabilities: caps) }
+
+    yield (s = Capybara::Session.new(:"#{to_s}"))
+  ensure
+    s.driver.quit
+  end
 
-    begin
+  def snapshot url
+    new_session do |browser|
       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
+      browser.visit url
+      puts "Reached #{browser.title} from #{self}, saving screenshot"
+      browser.save_screenshot file = CGI.escape("#{url}__#{self}.png")
       puts "Done #{self}"
       Launchy.open "./#{file}"
-    rescue => e
-      puts "#{e.inspect} from #{self}"
     end
+  rescue => e
+    puts "#{e.inspect} from #{self}"
   end
 
   def to_s
     "#{browser}#{browser_version}"\
     "(#{os}-#{os_version}#{':' + device if device})"
   end
+
+  def self.parse browser_string
+    all.select {|b| b.to_s[Regexp.new browser_string, 'i']}
+  end
+
+  def self.logins
+    @logins ||= begin
+      File.expand_path('~/.loginfile.rb').tap! {|home_path|  load home_path  if File.exists? home_path }
+      File.expand_path('./.loginfile.rb').tap! {|local_path| load local_path if File.exists? local_path }
+
+      (defined?(LoginsGlobal) ? LoginsGlobal : {}).merge(defined?(LoginsLocal) ? LoginsLocal : {})
+    end
+  end
+
+  def self.actions
+    @actions ||= begin
+      File.expand_path('~/.loginfile.rb').tap! {|home_path|  load home_path  if File.exists? home_path }
+      File.expand_path('./.loginfile.rb').tap! {|local_path| load local_path if File.exists? local_path }
+
+      (defined?(ActionsGlobal) ? ActionsGlobal : {}).merge(defined?(ActionsLocal) ? ActionsLocal : {})
+    end
+  end
+
+
+
+
+
+
+  def raw_selenium_session options={}
+    options.reverse_merge! local: true
+    caps = Selenium::WebDriver::Remote::Capabilities.new.tap {|c|
+      self.stringify_keys.select{|k,v| v}.each {|k,v| c[k] = v}
+      c["browserstack.debug"] = 'true'
+      c['browserstack.local'] = (!!options[:local]).to_s
+      c['acceptSslCerts']     = 'true'
+      c["name"]               = 'Running bs_plus from command line'
+    }
+
+    driver = Selenium::WebDriver.for(:remote,
+      url: "https://#{Config.fetch(:username)}:#{Config.fetch(:password)}"\
+           "@hub.browserstack.com/wd/hub",
+      desired_capabilities: caps)
+  end
+
 end
 end

data/lib/bs_plus/cli.rb

@@ -3,6 +3,8 @@ require 'rest-client'
 require 'json' unless defined? JSON # wtf is can't activate json-1.8.0, already activated json-1.8.1 (Gem::LoadError)
 require 'parallel'
 require 'bs_plus/browser'
+require 'bs_plus/config'
+require 'os'
 
 module BsPlus
   class Cli < Thor
@@ -21,16 +23,40 @@ module BsPlus
       'popular'  => Browser::Popular,
     }
 
-    desc 'get WHAT [-b BROWSERS]', 'takes snapshot(s)'
+    desc 'get WHAT [-b BROWSERS]', "takes snapshot(s). Browsers: #{BrowsersOption.keys.to_sentence} or one from 'bs list'"
     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/]
 
-      (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}}
+      BsPlus.with_tunnel {
+        (BrowsersOption[options[:browsers]] ||
+         Browser.parse(options[:browsers]).take(1)).
+          tap {|e| puts "Snapshotting with #{e.size} browsers:"}.
+          tap!{|e| Parallel.map(e, in_threads: 5) {|b| b.snapshot url}} }
+    end
+
+    desc 'live URL -b BROWSER', "Opens browser on browserstack. Browser one from 'bs list' by regex"
+    method_option :browser, required: true, aliases: '-b', desc:"Browser one from 'bs list' by regex"
+    def live url
+      url = "http://#{url}" unless url[/http/]
+
+      BsPlus.with_tunnel {
+        (Browser.parse(options[:browser]).first || (raise %Q[#{Browser.all.map(&:to_s).join("\n")}]+"\nCouldn't find browser in the list." )).
+          tap {|e| puts "Opening with #{e}. Please log in to BrowserStack"}.
+          tap!{|b| Launchy.open "https://www.browserstack.com/automate"
+                   b.new_session do |browser|
+                     browser.visit url
+                     loop { browser.has_title?('.'); sleep 30 }
+                   end } }
+    end
+
+    desc 'tunnel', 'Runs BrowserStackLocal binary with your key and --automate flag'
+    def tunnel detach = false
+      #Process.detach
+      system File.join Kernel.__dir__, '../../bin', "BrowserStackLocal#{case
+      when OS.windows? then 'Windows'; when OS.linux? then 'Linux'; when OS.mac? then 'Mac'; end
+      } -force -onlyAutomate -forcelocal #{Config.fetch(:password)}"
     end
   end
 end

data/lib/bs_plus/config.rb

@@ -3,15 +3,15 @@ require 'highline'
 require 'active_support/core_ext/hash'
 
 class BsPlus::Config
-  HomePath  = File.expand_path '~/.browserstack-cred'
-  LocalPath = File.expand_path './.browserstack-cred'
+  HomePath  = File.expand_path '~/.browserstack-plus'
+  LocalPath = File.expand_path './.browserstack-plus'
 
   class <<self
   def init
-    fetch(:username) {HighLine.new.ask('Please enter your browserstack username')}
+    fetch(:username) {HighLine.new.ask('Please enter your browserstack username').to_s}
 
     fetch(:password) {HighLine.new.ask('Please enter your password') {|h|
-                                       h.echo = false  }}
+                                       h.echo = false  }.to_s}
   end
 
   OtherDefaults =

data/lib/bs_plus/version.rb

@@ -1,3 +1,3 @@
 module BsPlus
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Leo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.44.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +252,9 @@ description: This should use your automate plan of browserstack and do screensho
 email:
 - leonid.inbox@gmail.com
 executables:
+- BrowserStackLocalLinux
+- BrowserStackLocalMac
+- BrowserStackLocalWindows.exe
 - bs
 extensions: []
 extra_rdoc_files: []
@@ -205,6 +264,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/BrowserStackLocalLinux
+- bin/BrowserStackLocalMac
+- bin/BrowserStackLocalWindows.exe
 - bin/bs
 - bs_plus.gemspec
 - lib/bs_plus.rb
@@ -238,3 +300,4 @@ signing_key:
 specification_version: 4
 summary: This should use your automate plan of browserstack and do screenshots
 test_files: []
+has_rdoc: