operawatir 0.5.1-jruby → 0.6.pre1-jruby

data/CHANGES

@@ -1,3 +1,23 @@
+v0.6.pre1    2011-12-01
+
+  [ENHANCEMENTS]
+
+  * Construction of DesktopWatir now uses desired capabilities, and
+    relies on shared code between OperaWatir and OperaDesktopWatir.
+    (andreastt)
+
+  [BUG FIXES]
+
+  * OperaDesktopHelper missed a line making it impossible to run
+    desktopwatir RSpec tests from `jruby -S rspec test.rb`.
+    (andreastt)
+
+  * Exposing browser.utils.* on DesktopBrowser.  (andreastt)
+
+  [OTHER]
+
+  * Upgraded to OperaDriver v0.8.1.  (andreastt)
+
 v0.5.1       2011-09-20
 
   [OTHER]

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.pre1

data/bin/desktopwatir

@@ -1,13 +1,14 @@
 #!/usr/bin/env jruby
 require 'rubygems'
 require 'optparse'
+require 'stringio'
 require 'rspec'
 require 'rbconfig'
 require 'operawatir'
 
-
 @options = {
-  #:manual        => false,
+  :manual         => false,  # Defining this here so that we are sure
+                             # it doesn't trigger manual mode
   :ng             => false,
   :color_enabled  => true,
   :check_syntax   => false,
@@ -25,21 +26,16 @@ require 'operawatir'
 begin
   OptionParser.new do |opts|
     opts.banner = <<EOS
-
-Usage: desktopwatir [-l|--launcher=BINARY] [-e|--executable=BINARY]
-       [-a|--args=ARGUMENTS] [--no-color] [-q|--no-quit] [-r|--no-restart]
-       [--opera-idle] [-b|--backtrace] [-t|--tag=TAG] [-f|--format=FORMAT]
+Usage: desktopwatir [-m|--manual] [-l|--launcher=BINARY]
+       [-e|--executable=BINARY] [-a|--args=ARGUMENTS] [--no-color]
+       [-q|--no-quit] [-r|--no-restart] [--opera-idle]
+       [-b|--backtrace] [-t|--tag=TAG] [-f|--format=FORMAT]
        [-o|--out=FILE] [-h|--help] [-v|--version] FILES
 EOS
 
     opts.separator ''
     opts.separator 'Specific options:'
 
-    #run without launcher and with manual connection, restart not possible (same as -rq)
-    #opts.on('-m', '--manual', 'Wait for a manual connection from opera:debug') do |c|
-    #  @options[:manual] = c
-    #end
-    
     opts.on('-l', '--launcher=BINARY', 'Path to launcher binary, will use environmental ',
             'variable OPERA_LAUNCHER if not specified') do |c|
       @options[:launcher] = c
@@ -96,6 +92,18 @@ EOS
     opts.separator ''
     opts.separator 'Common options:'
 
+    opts.on_tail('-d', '--debug=LEVEL', 'The logging level to use.  Available levels: SEVERE',
+                 '(highest),  WARNING, INFO (default), CONFIG, FINE,',
+                 'FINER, FINEST (lowest), ALL') do |l|
+      available_levels = ['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST', 'ALL']
+      raise OptionParser::InvalidArgument, l.to_s.inspect unless available_levels.include?(l)
+      @options[:logging_level] = l
+    end
+
+    opts.on_tail('--log=FILE', 'Output the log to a file') do |f|
+      @options[:logging_file] = f
+    end
+
     opts.on_tail('-h', '--help', 'Show this message') do
       abort opts.to_s
     end
@@ -105,7 +113,7 @@ EOS
     end
   end.parse!(ARGV)
 rescue OptionParser::InvalidOption => e
-  abort "desktopwatir: Unknown option `#{e.to_s.sub(/invalid option:\s+/, '')}'"
+  abort "desktopwatir: #{e}"
 end
 
 if ARGV.empty?

data/bin/operawatir

@@ -14,6 +14,7 @@ require 'operawatir'
   :output_stream  => IO.new(1, 'w'),
   :format         => 'progress',
   :no_quit        => false,
+  :no_restart     => false,
   :opera_idle     => false,
   #:full_backtrace => false  # TODO: Provide fix for RSpec
 }
@@ -24,10 +25,11 @@ require 'operawatir'
 begin
   OptionParser.new do |opts|
     opts.banner = <<EOS
-Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [--binary=BINARY]
-       [-a|--args=ARGUMENTS] [-q|--no-quit] [--opera-idle] [-b|--backtrace]
-       [--no-color] [-t|--tag=TAG] [-f|--format=FORMAT] [-o|--out=FILE]
-       [-d|--debug=LEVEL] [--log=FILE] [-h|--help] [-v|--version] FILES
+Usage: operawatir [-m|--manual] [-l|--launcher=BINARY]
+       [--binary=BINARY] [-a|--args=ARGUMENTS] [-q|--no-quit]
+       [--opera-idle] [-b|--backtrace] [--no-color] [-t|--tag=TAG]
+       [-f|--format=FORMAT] [-o|--out=FILE] [-d|--debug=LEVEL]
+       [--log=FILE] [-h|--help] [-v|--version] FILES
 EOS
 
     opts.separator ''

data/lib/operawatir.rb

@@ -4,8 +4,9 @@ require 'deprecated'
 require 'java'
 include Java
 
-%w(commons-jxpath-1.3.jar protobuf-java-2.4.1.jar selenium-nodeps-20100909.jar
-   operadriver-v0.7.3.jar commons-io-2.0.1.jar guava-r09.jar).each { |jar| require "operadriver/#{jar}" }
+%w(commons-jxpath-1.3.jar commons-exec-1.1.jar protobuf-java-2.4.1.jar
+    selenium-java-2.13.0.jar operalaunchers-0.3.jar operadriver-v0.8.1.jar
+    guava-10.0.1.jar).each { |jar| require "operadriver/#{jar}" }
 
 include_class org.openqa.selenium.WebDriver
 include_class org.openqa.selenium.remote.RemoteWebElement

data/lib/operawatir/browser.rb

@@ -199,17 +199,19 @@ class OperaWatir::Browser
 
 private
 
-  def self.desired_capabilities
-    @desired_capabilities ||= DesiredCapabilities.new.tap { |s|
-      s.setCapability('opera.logging.level', self.settings[:logging_level]) if self.settings[:logging_level]
-      s.setCapability('opera.logging.file', self.settings[:logging_file]) if self.settings[:logging_file]
-      s.setCapability('opera.autostart', false) if self.settings[:manual]
-      s.setCapability('opera.launcher', self.settings[:launcher]) if self.settings[:launcher]
-      s.setCapability('opera.binary', self.settings[:path]) if self.settings[:path]
-      s.setCapability('opera.arguments', self.settings[:args].to_s) if self.settings[:args]
-      s.setCapability('opera.no_quit', true) if self.settings[:no_quit]
-      s.setCapability('opera.idle', true) if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
-    }
+  def self.desired_capabilities(desktopwatir = false)
+    @desired_capabilities ||= DesiredCapabilities.new.tap do |c|
+      c.setCapability('opera.logging.level', self.settings[:logging_level]) if self.settings[:logging_level]
+      c.setCapability('opera.logging.file', self.settings[:logging_file]) if self.settings[:logging_file]
+      c.setCapability('opera.autostart', false) if self.settings[:manual]
+      c.setCapability('opera.launcher', self.settings[:launcher]) if self.settings[:launcher]
+      c.setCapability('opera.binary', self.settings[:path]) if self.settings[:path]
+      c.setCapability('opera.arguments', self.settings[:args].to_s) if self.settings[:args]
+      c.setCapability('opera.no_quit', true) if self.settings[:no_quit]
+      c.setCapability('opera.no_restart', true) if self.settings[:no_restart]
+      c.setCapability('opera.guess_binary_path', false) if desktopwatir
+      c.setCapability('opera.idle', true) if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
+    end
   end
 
 end

data/lib/operawatir/desktop_browser.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module OperaWatir
   class DesktopBrowser < Browser
     include DesktopContainer
@@ -13,7 +14,7 @@ module OperaWatir
     def initialize
       OperaWatir.compatibility! unless OperaWatir.api >= 3
 
-      self.driver = OperaDesktopDriver.new(self.class.opera_driver_settings)
+      self.driver        = OperaDesktopDriver.new(self.class.desired_capabilities(true))
       self.active_window = OperaWatir::Window.new(self)
       self.preferences   = OperaWatir::Preferences.new(self)
       self.keys          = OperaWatir::Keys.new(self)
@@ -604,8 +605,8 @@ module OperaWatir
       return 0 if win_id == 0
 
       #Ensure is Expanded
-      if quick_button(:name, "Destails_expand").value == 0
-        quick_button(:name, "Destails_expand").toggle_with_click
+      if quick_button(:name, "Details_expand").value == 0
+        quick_button(:name, "Details_expand").toggle_with_click
       end
 
       quick_checkboxes("Clear Private Data Dialog").each do |box|
@@ -796,26 +797,11 @@ module OperaWatir
 
 private
 
-   def close_menu
+    def close_menu
       wait_start
       key_press_direct("Esc")
       wait_for_menu_closed("")
-   end
-
-
-   def self.opera_driver_settings
-     @opera_driver_settings ||= OperaDriverSettings.new.tap {|s|
-       #s.setRunOperaLauncherFromOperaDriver true
-       s.setAutostart false if self.settings[:manual]
-       s.setOperaLauncherBinary self.settings[:launcher]
-       s.setOperaBinaryLocation self.settings[:path]
-#       s.setOperaBinaryArguments self.settings[:args].to_s + ' -autotestmode'
-       s.setNoQuit self.settings[:no_quit]
-       s.setNoRestart self.settings[:no_restart]
-       s.setGuessOperaPath false
-       s.setUseOperaIdle false if !self.settings[:opera_idle]
-     }
-   end
+    end
 
     # Gets the parent widget name of which there is none here
     def parent_widget

data/lib/operawatir/desktop_helper.rb

@@ -107,3 +107,5 @@ private
     end
   end
 end
+
+OperaWatir::DesktopHelper.run!

data/operawatir.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{operawatir}
-  s.version = "0.5.1"
+  s.version = "0.6.pre1"
   s.platform = %q{jruby}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andreas Tolf Tolfsen", "Chris Lloyd", "Stuart Knightley", "Deniz Turkoglu"]
-  s.date = %q{2011-09-20}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Andreas Tolf Tolfsen}, %q{Chris Lloyd}, %q{Stuart Knightley}, %q{Deniz Turkoglu}]
+  s.date = %q{2011-12-01}
   s.description = %q{    OperaWatir is a part of the Watir (pronounced water) family of
     free software Ruby libraries for automating web browsers.
     OperaWatir provides a querying engine and Ruby bindings for a
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
     browser.  It aims for full compliancy with the Watir 2 and Watir 3
     specifications.
 }
-  s.email = ["andreastt@opera.com", "christopherl@opera.com", "stuartk@opera.com", "dturkoglu@opera.com"]
-  s.executables = ["desktopwatir", "operawatir"]
+  s.email = [%q{andreastt@opera.com}, %q{christopherl@opera.com}, %q{stuartk@opera.com}, %q{dturkoglu@opera.com}]
+  s.executables = [%q{desktopwatir}, %q{operawatir}]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -37,12 +37,13 @@ Gem::Specification.new do |s|
     "bin/operawatir",
     "lib/operadriver/APACHE_2.0_LICENSE.txt",
     "lib/operadriver/NEW_BSD_LICENSE.txt",
-    "lib/operadriver/commons-io-2.0.1.jar",
+    "lib/operadriver/commons-exec-1.1.jar",
     "lib/operadriver/commons-jxpath-1.3.jar",
-    "lib/operadriver/guava-r09.jar",
-    "lib/operadriver/operadriver-v0.7.3.jar",
+    "lib/operadriver/guava-10.0.1.jar",
+    "lib/operadriver/operadriver-v0.8.1.jar",
+    "lib/operadriver/operalaunchers-0.3.jar",
     "lib/operadriver/protobuf-java-2.4.1.jar",
-    "lib/operadriver/selenium-nodeps-20100909.jar",
+    "lib/operadriver/selenium-java-2.13.0.jar",
     "lib/operawatir.rb",
     "lib/operawatir/actions.rb",
     "lib/operawatir/browser.rb",
@@ -292,9 +293,9 @@ Gem::Specification.new do |s|
     "utils/formatters/spartan_formatter.rb"
   ]
   s.homepage = %q{http://www.opera.com/developer/tools/operawatir/}
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{operawatir}
-  s.rubygems_version = %q{1.5.1}
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{Toolkit for automating interactions with the Opera web browser.}
 
   if s.respond_to? :specification_version then

data/spec/operawatir/desktop/quickbutton_spec.rb

@@ -156,11 +156,11 @@ describe 'QuickButton' do
     end
     
     it 'returns value = 1 of button when button is pressed' do
-      browser.quick_button(:name, "Destails_expand").toggle_with_click.should == 1
+      browser.quick_button(:name, "Details_expand").toggle_with_click.should == 1
     end
     
     it 'returns value = 0 of button when button is unpressed' do
-      browser.quick_button(:name, "Destails_expand").toggle_with_click.should == 0
+      browser.quick_button(:name, "Details_expand").toggle_with_click.should == 0
       browser.close_dialog("Clear Private Data Dialog").should close_dialog
     end
     
@@ -182,13 +182,13 @@ describe 'QuickButton' do
     end
   
     it 'expands dialog with click' do
-      browser.quick_button(:name, "Destails_expand").expand_with_click
+      browser.quick_button(:name, "Details_expand").expand_with_click
       browser.quick_button(:name, "button_manage_wand").should be_visible
     end
     
 
     it 'collapses dialog with click ' do
-      browser.quick_button(:name, "Destails_expand").expand_with_click
+      browser.quick_button(:name, "Details_expand").expand_with_click
       browser.quick_button(:name, "button_manage_wand").should_not be_visible
     end
     
@@ -208,13 +208,13 @@ describe 'QuickButton' do
     end
     
     it 'returns 1 when button is pressed' do
-      browser.quick_button(:name, "Destails_expand").toggle_with_click.should == 1
-      browser.quick_button(:name, "Destails_expand").value.should == 1
+      browser.quick_button(:name, "Details_expand").toggle_with_click.should == 1
+      browser.quick_button(:name, "Details_expand").value.should == 1
     end
     
     it 'returns 0 when button is unpressed' do
-      browser.quick_button(:name, "Destails_expand").toggle_with_click.should == 0
-      browser.quick_button(:name, "Destails_expand").value.should == 0
+      browser.quick_button(:name, "Details_expand").toggle_with_click.should == 0
+      browser.quick_button(:name, "Details_expand").value.should == 0
     end
     
     after(:all) do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: operawatir
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.1
+  prerelease: 4
+  version: 0.6.pre1
 platform: jruby
 authors: 
   - Andreas Tolf Tolfsen
@@ -13,8 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +02:00
-default_executable: 
+date: 2011-12-01 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler
@@ -285,12 +284,13 @@ files:
   - bin/operawatir
   - lib/operadriver/APACHE_2.0_LICENSE.txt
   - lib/operadriver/NEW_BSD_LICENSE.txt
-  - lib/operadriver/commons-io-2.0.1.jar
+  - lib/operadriver/commons-exec-1.1.jar
   - lib/operadriver/commons-jxpath-1.3.jar
-  - lib/operadriver/guava-r09.jar
-  - lib/operadriver/operadriver-v0.7.3.jar
+  - lib/operadriver/guava-10.0.1.jar
+  - lib/operadriver/operadriver-v0.8.1.jar
+  - lib/operadriver/operalaunchers-0.3.jar
   - lib/operadriver/protobuf-java-2.4.1.jar
-  - lib/operadriver/selenium-nodeps-20100909.jar
+  - lib/operadriver/selenium-java-2.13.0.jar
   - lib/operawatir.rb
   - lib/operawatir/actions.rb
   - lib/operawatir/browser.rb
@@ -538,7 +538,6 @@ files:
   - utils/formatters/new_spartan_formatter.rb
   - utils/formatters/operahelper_formatter.rb
   - utils/formatters/spartan_formatter.rb
-has_rdoc: true
 homepage: http://www.opera.com/developer/tools/operawatir/
 licenses: []
 
@@ -556,13 +555,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: operawatir
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Toolkit for automating interactions with the Opera web browser.