capy 1.3.0 → 1.4.0

data/README.md

@@ -31,6 +31,14 @@ Change the browser:
 
     $ capy -b firefox example.capy
 
+Using the webkit:
+
+    $ gem install capybara-webkit
+
+and capy with '-w' option
+
+    $ capy -w example.capy
+
 ### JavaScript Mode
 
     # example.js

data/examples/google_search.capy

@@ -1,5 +1,6 @@
 #!/usr/bin/env capy
 
-visit 'http://google.com/'
+visit 'http://google.co.jp/'
 fill_in 'q', :with => 'ruby'
-page.evaluate_script("document.forms[0].submit()")
+js 'document.forms[0].submit()'
+puts js('document.getElementsByName("q")[0].value + "の検索結果: " + document.getElementById("resultStats").textContent')

data/lib/capy.rb

@@ -15,21 +15,19 @@ module Capy
         on :j, :js, 'eval script as javascript with -a option'
         on :a, :'app-host=', 'app host'
         on :s, :'stop', 'stop after eval script'
+        on :w, :webkit, 'use capybara webkit'
       end
       return 1 if opts.help?
 
       trap('INT') { exit }
 
-      Capybara.register_driver :selenium do |app|
-        Capybara::Selenium::Driver.new(app, :browser => opts[:browser].to_sym)
-      end
-      Capybara.current_driver = :selenium
-      Capybara.app_host = opts[:'app-host']
+      setup_capybara
 
       @mode = opts.js? ? :javascript : :capybara
 
       evaluater = Evaluater.new
-      evaluater.visit (Capybara.app_host) if Capybara.app_host
+
+      evaluater.visit Capybara.app_host if Capybara.app_host
 
       if args.empty?
         start_shell evaluater
@@ -40,7 +38,8 @@ module Capy
             return 1
           end
           puts "Running: #{script_file} ..."
-          evaluater.eval_script File.read(script_file), mode
+          result = evaluater.eval_script File.read(script_file), mode
+          puts "=> #{result.inspect}".cyan
           start_shell evaluater if opts.stop?
         end
       end
@@ -54,6 +53,22 @@ module Capy
       1
     end
 
+    def setup_capybara
+      if opts.webkit?
+        require 'capybara-webkit'
+        Capybara.register_driver :webkit do |app|
+          Capybara::Driver::Webkit.new(app, :browser => Capybara::Driver::Webkit::Browser.new)
+        end
+        Capybara.current_driver = :webkit
+      else
+        Capybara.register_driver :selenium do |app|
+          Capybara::Selenium::Driver.new(app, :browser => opts[:browser].to_sym)
+        end
+        Capybara.current_driver = :selenium
+      end
+      Capybara.app_host = opts[:'app-host']
+    end
+
     EXIT_COMMANDS = %w(exit quit)
 
     def start_shell(evaluater)
@@ -108,6 +123,15 @@ module Capy
   class Evaluater
     include Capybara::DSL
 
+    def initialize
+      if page.driver.respond_to?(:header)
+        page.driver.header(
+          'user-agent',
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.55.3 (KHTML, like Gecko) Version/5.1.5 Safari/534.55.3'
+        )
+      end
+    end
+
     def eval_script(script, mode)
       case mode
       when :javascript

data/lib/capy/version.rb

@@ -1,3 +1,3 @@
 module Capy
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,79 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capy
-version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
-authors:
+authors: 
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-24 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: slop
-  requirement: &70160342289140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *70160342289140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &70160342288100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70160342288100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: colored
-  requirement: &70160342287140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70160342287140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70160342286280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70160342286280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &70160342281840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70160342281840
+  version_requirements: *id005
 description: Capybara Script Runner
-email:
+email: 
 - jugyo.org@gmail.com
-executables:
+executables: 
 - capy
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -90,31 +115,41 @@ files:
 - spec/fixtures/foo.capy
 - spec/fixtures/foo.js
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/jugyo
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The capy command to run the script written in Capybara DSL.
-test_files:
+test_files: 
 - spec/capy_spec.rb
 - spec/fixtures/foo.capy
 - spec/fixtures/foo.js