capy 1.1.2 → 1.2.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.log

data/README.md

@@ -21,6 +21,7 @@ Write script
     visit 'http://www.wikipedia.org/'
     fill_in 'search', :with => 'ruby'
     click_on '  →  '
+    stop
 
 and
 
@@ -30,10 +31,6 @@ Change the browser:
 
     $ capy -b firefox example.capy
 
-Run as nonstop mode:
-
-    $ capy -n example.capy
-
 ## Contributing
 
 1. Fork it

data/lib/capy.rb

@@ -12,18 +12,16 @@ module Capy
       @opts = Slop.parse!(args, :help => true) do
         banner "capy [script.capy]\n"
         on :b, :browser=, 'chrome, firefox', :default => 'chrome'
-        on :h, :host=, 'app host'
-        on :n, :nonstop
       end
       exit 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[:host] if opts[:host]
-
       if args.empty?
         start_shell
       else
@@ -35,11 +33,14 @@ module Capy
       end
     end
 
+    EXIT_COMMANDS = %w(exit quit)
+
     def start_shell(evaluater = Evaluater.new)
-      exit_commands = %w(exit quit)
+      return if @_start_shell
+      @_start_shell = true
 
       Readline.completion_proc = lambda do |text|
-        (Evaluater.instance_methods - Object.methods + exit_commands).grep(/^#{Regexp.quote(text.strip)}/)
+        (Evaluater.instance_methods - Object.methods + EXIT_COMMANDS).grep(/^#{Regexp.quote(text.strip)}/)
       end
 
       history_file = File.expand_path('~/.capy_history')
@@ -50,20 +51,18 @@ module Capy
           each { |line| Readline::HISTORY << line }
       end
 
-      puts 'Type `exit` to exit'
-
       while buf = Readline.readline('> ', true)
         unless Readline::HISTORY.count == 1
           Readline::HISTORY.pop if buf.empty? || Readline::HISTORY[-1] == Readline::HISTORY[-2]
         end
 
         case buf.strip
-        when *exit_commands
+        when *EXIT_COMMANDS
           File.open(history_file, 'w') do |file|
             lines = Readline::HISTORY.to_a[([Readline::HISTORY.size - 1000, 0].max)..-1]
             file.print(lines.join("\n"))
           end
-          exit
+          return
         else
           begin
             result = evaluater.instance_eval(buf)
@@ -73,6 +72,8 @@ module Capy
           end
         end
       end
+
+      @_start_shell = false
     end
 
     def eval_script(script_file)
@@ -80,10 +81,6 @@ module Capy
       evaluater.instance_eval(File.read(script_file), script_file, 1)
     rescue => e
       error e
-    ensure
-      unless opts.nonstop?
-        start_shell(evaluater)
-      end
     end
 
     private
@@ -100,5 +97,9 @@ module Capy
     def host(app_host)
       Capybara.app_host = app_host
     end
+
+    def stop
+      Capy.start_shell(self)
+    end
   end
 end

data/lib/capy/version.rb

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

metadata

@@ -1,76 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capy
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: slop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70095394509140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70095394509140
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70095394508720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70095394508720
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &70095394508260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70095394508260
 description: Capybara Script Runner
-email: 
+email:
 - jugyo.org@gmail.com
-executables: 
+executables:
 - capy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -81,39 +63,28 @@ files:
 - examples/wikipedia_search.capy
 - lib/capy.rb
 - lib/capy/version.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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The capy command to run the script written in Capybara DSL.
 test_files: []
-