capy 1.2.0 → 1.3.0

data/README.md

@@ -31,6 +31,19 @@ Change the browser:
 
     $ capy -b firefox example.capy
 
+### JavaScript Mode
+
+    # example.js
+
+    location 'http://www.wikipedia.org/'
+    ...
+
+run capy with '-j' option
+
+    $ capy -j example.js
+
+See also the [examples](https://github.com/jugyo/capy/tree/master/examples).
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec

data/bin/capy

@@ -2,4 +2,4 @@
 require 'capy'
 args = ARGV.dup
 ARGV.clear
-Capy.run(args)
+exit Capy.run(args)

data/capy.gemspec

@@ -18,4 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'slop', '~>3.1'
   gem.add_runtime_dependency 'capybara'
   gem.add_runtime_dependency 'colored'
+
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rr"
 end

data/examples/twitter.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env capy -s -j
+location.href = 'http://twitter.com'

data/lib/capy.rb

@@ -6,14 +6,17 @@ require 'capybara/dsl'
 
 module Capy
   class << self
-    attr_reader :opts
+    attr_reader :opts, :mode
 
     def run(args)
-      @opts = Slop.parse!(args, :help => true) do
+      @opts = Slop.parse!(args, :help => true, :strict => true) do
         banner "capy [script.capy]\n"
         on :b, :browser=, 'chrome, firefox', :default => 'chrome'
+        on :j, :js, 'eval script as javascript with -a option'
+        on :a, :'app-host=', 'app host'
+        on :s, :'stop', 'stop after eval script'
       end
-      exit if opts.help?
+      return 1 if opts.help?
 
       trap('INT') { exit }
 
@@ -21,21 +24,39 @@ module Capy
         Capybara::Selenium::Driver.new(app, :browser => opts[:browser].to_sym)
       end
       Capybara.current_driver = :selenium
+      Capybara.app_host = opts[:'app-host']
+
+      @mode = opts.js? ? :javascript : :capybara
+
+      evaluater = Evaluater.new
+      evaluater.visit (Capybara.app_host) if Capybara.app_host
 
       if args.empty?
-        start_shell
+        start_shell evaluater
       else
         args.each do |script_file|
-          abort "No such file: #{script_file}".red unless File.exists?(script_file)
+          unless File.exists?(script_file)
+            puts "No such file: #{script_file}".red
+            return 1
+          end
           puts "Running: #{script_file} ..."
-          eval_script script_file
+          evaluater.eval_script File.read(script_file), mode
+          start_shell evaluater if opts.stop?
         end
       end
+
+      0
+    rescue Slop::InvalidOptionError => e
+      puts e.message.red
+      1
+    rescue => e
+      error e
+      1
     end
 
     EXIT_COMMANDS = %w(exit quit)
 
-    def start_shell(evaluater = Evaluater.new)
+    def start_shell(evaluater)
       return if @_start_shell
       @_start_shell = true
 
@@ -65,7 +86,7 @@ module Capy
           return
         else
           begin
-            result = evaluater.instance_eval(buf)
+            result = evaluater.eval_script(buf, mode)
             puts "=> #{result.inspect}".cyan
           rescue => e
             error e
@@ -76,17 +97,10 @@ module Capy
       @_start_shell = false
     end
 
-    def eval_script(script_file)
-      evaluater = Evaluater.new
-      evaluater.instance_eval(File.read(script_file), script_file, 1)
-    rescue => e
-      error e
-    end
-
     private
 
     def error(e)
-      puts "#{e.backtrace[0]} #{e}".red
+      puts "#{e.backtrace[0]} #{e} (#{e.class})".red
       puts "\t#{e.backtrace[1..-1].join("\n\t")}".red
     end
   end
@@ -94,6 +108,24 @@ module Capy
   class Evaluater
     include Capybara::DSL
 
+    def eval_script(script, mode)
+      case mode
+      when :javascript
+        javascript script
+      else
+        capybara script
+      end
+    end
+
+    def javascript(script)
+      page.evaluate_script script.sub(/\A#!.*\n/, '')
+    end
+    alias_method :js, :javascript
+
+    def capybara(script)
+      instance_eval script
+    end
+
     def host(app_host)
       Capybara.app_host = app_host
     end

data/lib/capy/version.rb

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

data/spec/capy_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe Capy do
+  before do
+    stub(Capy).start_shell.with_any_args
+  end
+
+  context '$ capy' do
+    it 'start shell' do
+      mock(Capy).start_shell.with_any_args
+      Capy.run([]).should == 0
+    end
+  end
+
+  context '$ capy -h' do
+    it 'show help' do
+      Capy.run(%w(-h)).should == 1
+    end
+  end
+
+  context '$ capy -b firefox' do
+
+  end
+
+  context '$ capy -a http://google.com/' do
+    it 'visit http://google.com/' do
+      any_instance_of(Capy::Evaluater) do |evaluater|
+        mock(evaluater).visit('http://google.com/')
+      end
+      mock(Capy).start_shell.with_any_args
+      Capy.run(%w(-a http://google.com/)).should == 0
+    end
+  end
+
+  context '$ capy foo.capy' do
+    context 'file is exists' do
+      it 'eval script' do
+        file = File.expand_path('../fixtures/foo.capy', __FILE__)
+        script = File.read(file)
+        any_instance_of(Capy::Evaluater) do |evaluater|
+          mock(evaluater).eval_script(script, :capybara)
+        end
+        Capy.run([file]).should == 0
+      end
+    end
+
+    context 'file is not exists' do
+      it 'does not eval script' do
+        any_instance_of(Capy::Evaluater) do |evaluater|
+          mock(evaluater).eval_script.with_any_args.never
+        end
+        Capy.run(%w(bar.capy)).should == 1
+      end
+    end
+  end
+
+  context '$ capy foo.capy' do
+    it 'eval script and stop' do
+      file = File.expand_path('../fixtures/foo.capy', __FILE__)
+      any_instance_of(Capy::Evaluater) do |evaluater|
+        mock(evaluater).eval_script.with_any_args
+      end
+      mock(Capy).start_shell.with_any_args
+      Capy.run(['-s', file]).should == 0
+    end
+  end
+
+  context '$ capy -j foo.js' do
+    it 'does not eval script' do
+      mock(Capy).eval_script_file.with_any_args.never
+      Capy.run(%w(-j foo.js)).should == 1
+    end
+  end
+
+  context '$ capy -j foo.js' do
+    context 'file is exists' do
+      it 'eval script' do
+        file = File.expand_path('../fixtures/foo.js', __FILE__)
+        script = File.read(file)
+        any_instance_of(Capy::Evaluater) do |evaluater|
+          mock(evaluater).eval_script(script, :javascript)
+        end
+        Capy.run(['-j', file]).should == 0
+      end
+    end
+
+    context 'file is not exists' do
+      it 'does not eval script' do
+        mock(Capy).eval_script_file.with_any_args.never
+        Capy.run(%w(bar.capy)).should == 1
+      end
+    end
+  end
+end

data/spec/fixtures/foo.capy

@@ -0,0 +1 @@
+visit 'http://example.com/'

data/spec/fixtures/foo.js

@@ -0,0 +1 @@
+alert('foo');

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'capy'
+require 'rspec'
+require 'rr'
+
+RSpec.configure do |config|
+  config.mock_with :rr
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70095394509140 !ruby/object:Gem::Requirement
+  requirement: &70160342289140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70095394509140
+  version_requirements: *70160342289140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70095394508720 !ruby/object:Gem::Requirement
+  requirement: &70160342288100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095394508720
+  version_requirements: *70160342288100
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70095394508260 !ruby/object:Gem::Requirement
+  requirement: &70160342287140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095394508260
+  version_requirements: *70160342287140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70160342286280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70160342286280
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70160342281840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70160342281840
 description: Capybara Script Runner
 email:
 - jugyo.org@gmail.com
@@ -60,9 +82,14 @@ files:
 - bin/capy
 - capy.gemspec
 - examples/google_search.capy
+- examples/twitter.js
 - examples/wikipedia_search.capy
 - lib/capy.rb
 - lib/capy/version.rb
+- spec/capy_spec.rb
+- spec/fixtures/foo.capy
+- spec/fixtures/foo.js
+- spec/spec_helper.rb
 homepage: https://github.com/jugyo
 licenses: []
 post_install_message: 
@@ -87,4 +114,8 @@ rubygems_version: 1.8.10
 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
+- spec/spec_helper.rb