popup 0.0.6 → 0.0.7

data/lib/popup/exceptions.rb

@@ -3,6 +3,7 @@ module ATT
   class RootNotSetError < RootException ; end
   class WindowNotFoundError < RootException ; end
   class FileNotFoundError < RootException ; end
+  class FileAlreadyExistError < RootException; end
   class NotImplementError < RootException ; end
   class NotRecordError < RootException; end
   class MutliWindowsMatchError < RootException; end

data/lib/popup/file_ext.rb

@@ -7,7 +7,7 @@ module ATT
     
     private
     def check_file_not_exist?(file_path)
-      raise FileNotFoundError,"#{file_path} has existed" if File.file?( window_full_path(file_path) )
+      raise FileAlreadyExistError,"#{file_path} has existed" if File.file?( window_full_path(file_path) )
     end
     
     private

data/lib/popup/version.rb

@@ -1,5 +1,5 @@
 module ATT
   class Popup
-    VERSION='0.0.6'
+    VERSION='0.0.7'
   end
 end

data/spec/alert_popup_spec.rb

@@ -19,4 +19,15 @@ describe ATT::AlertPopup do
     alert = @b.button(:id,"alert_popup")
     ATT::AlertPopup.find_when { alert.click_no_wait }.click
   end
+  
+  it "#find_when in one block" do
+    alert = @b.button(:id,"alert_popup")
+    b2 = TestBrowser.get2
+    alert2 = b2.button(:id,"alert_popup")
+    ATT::AlertPopup.find_when {
+      ATT::AlertPopup.find_when { alert2.click_no_wait }.click
+      alert.click_no_wait
+    }.click
+  end
+  
 end

data/spec/save_popup_spec.rb

@@ -1,23 +1,23 @@
-require 'spec_helper'
-
-describe ATT::SavePopup do
-  before(:each) do
-    #@b = TestBrowser.get
-  end
-  
-  it "#exist?" do
-    window = RAutomation::Window.new(:title=>"notexist")
-    o = ATT::SavePopup.new(window)
-    o.should respond_to("exist?")
-    o.should respond_to("assert_exist?")
-  end
-  
-  it "#set #saveas" do
-    window = RAutomation::Window.new(:title=>"notexist")
-    o = ATT::SavePopup.new(window)
-    o.should respond_to("set")
-    o.should respond_to("saveas")
-    
-  end
-   #saveas
-end
+require 'spec_helper'
+
+describe ATT::SavePopup do
+  before(:each) do
+    #@b = TestBrowser.get
+  end
+  
+  it "#exist?" do
+    window = RAutomation::Window.new(:title=>"notexist")
+    o = ATT::SavePopup.new(window)
+    o.should respond_to("exist?")
+    o.should respond_to("assert_exist?")
+  end
+  
+  it "#set #saveas" do
+    window = RAutomation::Window.new(:title=>"notexist")
+    o = ATT::SavePopup.new(window)
+    o.should respond_to("set")
+    o.should respond_to("saveas")
+    
+  end
+   #saveas
+end

data/spec/spec_helper.rb

@@ -16,6 +16,17 @@ class TestBrowser
     at_exit { close rescue nil }
     @browser
   end
+  
+  def self.get2(type= :ie)
+    @server || start_server
+    if @browser2.nil?
+      @browser2 = Watir::Browser.new()
+      @browser2.goto("http://localhost:#{@port}/file.html")
+    end
+    at_exit { @browser2.close rescue nil }
+    @browser2
+  end
+  
   def self.start_server
     @server = PopupServer.new
     @port = @server.port

data/spec/websserver.rb

@@ -0,0 +1,56 @@
+require 'webrick'
+require 'timeout'
+require 'webrick/https'
+class PopupServer
+  
+  attr_reader :port,:run
+  def initialize(port=12346)
+    @run = false
+    @port = port
+    @s = WEBrick::HTTPServer.new(
+    :Port=> @port,
+    :DocumentRoot => File.join(File.join(__FILE__,'..','..','support'),"html_popup"),
+    :SSLEnable=> true,
+    :SSLVerifyClient =>OpenSSL::SSL::VERIFY_NONE,
+    :SSLCertName => [ ["CN", "Hello" ] ]
+    )
+    trap("INT") { @s.shutdown }
+    @s.mount("/html_popup",WEBrick::HTTPServlet::FileHandler,"/file.html")
+  end
+
+  def start(wait_forever = false)
+    raise "popup server is running,can NOT run again" if @run
+    @run = true
+    @s_thread = Thread.new do
+      @s.start
+    end
+    wait
+    @s_thread.join if wait_forever
+  end
+  
+  def wait(timeout=10)
+    Timeout.timeout(timeout,"after #{timeout} popup server still can NOT start") do
+      loop do
+        begin
+          TCPSocket.new("127.0.0.1",@port)
+          return true
+        rescue
+          sleep 0.5
+        end
+      end
+    end
+  end
+  
+  def stop
+    @s.shutdown
+    @run = false
+  end
+
+end
+
+if $0 == __FILE__
+  a = PopupServer.new
+  a.start(true)
+  #sleep 100
+  #a.stop
+end

metadata

@@ -1,44 +1,57 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: popup
-version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - yafei Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-08 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rautomation
-  requirement: &11017188 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *11017188
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: ffi
-  requirement: &11016912 !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 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *11016912
+  version_requirements: *id002
 description: popup operation for all windows version.
 email: lyfi2003@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/popup/alert_popup.rb
 - lib/popup/confirm_popup.rb
 - lib/popup/constants/file_popup.yml
@@ -60,33 +73,45 @@ files:
 - spec/save_popup_spec.rb
 - spec/spec_helper.rb
 - spec/webserver.rb
+- spec/websserver.rb
 - support/file_popup/test.txt
 - support/file_popup/test1.txt
 - support/html_popup/file.html
 - Rakefile
 - README.md
-homepage: http://200.200.0.35:81/svn/popup
+has_rdoc: true
+homepage: https://github.com/windy/popup
 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 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: popup operation for all windows version.
 test_files: []
+