capy 1.0.0 → 1.1.0

data/lib/capy.rb

@@ -1,3 +1,4 @@
+require 'readline'
 require "capy/version"
 require "slop"
 require "colored"
@@ -9,12 +10,15 @@ module Capy
 
     def run(args)
       @opts = Slop.parse!(args, :help => true) do
-        banner "capy foo.capy\n"
+        banner "capy [script.capy]\n"
+        on :b, :browser=, 'chrome, firefox', :default => 'chrome'
         on :n, :nonstop
       end
       exit if opts.help?
 
-      Capybara.register_driver(:selenium) { |app| Capybara::Selenium::Driver.new(app, :browser => :chrome) }
+      Capybara.register_driver :selenium do |app|
+        Capybara::Selenium::Driver.new(app, :browser => opts[:browser].to_sym)
+      end
       Capybara.current_driver = :selenium
 
       if args.empty?
@@ -28,16 +32,34 @@ module Capy
       end
     end
 
-    def start_shell
-      require 'readline'
+    def start_shell(evaluater = Evaluater.new)
+      exit_commands = %w(exit quit)
+
       Readline.completion_proc = lambda do |text|
-        (Capybara::DSL.instance_methods + [:exit]).grep /^#{Regexp.quote(text.strip)}/
+        (Capybara::DSL.instance_methods + exit_commands).grep(/^#{Regexp.quote(text.strip)}/)
       end
-      evaluater = Evaluater.new
+
+      history_file = File.expand_path('~/.capy_history')
+      if File.exists?(history_file)
+        File.read(history_file, :encoding => "BINARY").
+          encode!(:invalid => :replace, :undef => :replace).
+          split(/\n/).
+          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'
+        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
         else
           begin
@@ -51,15 +73,13 @@ module Capy
     end
 
     def eval_script(script_file)
-      Evaluater.new.instance_eval(<<-SCRIPT, script_file, 1)
-      #{File.read(script_file)}
-      SCRIPT
+      evaluater = Evaluater.new
+      evaluater.instance_eval(File.read(script_file), script_file, 1)
     rescue => e
       error e
     ensure
       unless opts.nonstop?
-        print 'Press Enter to exit: '.bold
-        gets
+        start_shell(evaluater)
       end
     end
 

data/lib/capy/version.rb

@@ -1,3 +1,3 @@
 module Capy
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,57 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capy
-version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 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: &70155069650840 !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: *70155069650840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &70155069650400 !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: *70155069650400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: colored
-  requirement: &70155069649900 !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: *70155069649900
+  version_requirements: *id003
 description: Capybara Script Runner
-email:
+email: 
 - jugyo.org@gmail.com
-executables:
+executables: 
 - capy
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - LICENSE
 - README.md
@@ -62,28 +81,39 @@ 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
-      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: []
+