actir 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d2de0515f074ce1f2c19a08d1a78cc75bdc50e
-  data.tar.gz: dab76e4796b89fdacda52fb26c3a631acf86ace2
+  metadata.gz: 00404d5aea9546ffd7abdf543d300e2910547ac6
+  data.tar.gz: 829dba036ed2e748e49d7a44dba1dfd1b56141b7
 SHA512:
-  metadata.gz: 831d2d11bae36eaeca6381ca6360fd6134074f8feada932a9f806404d7324eb6b0749e21510e91590dee7fdcef37995ad8147e35e3e5ee5f957f1dc7787f56c9
-  data.tar.gz: 9b462c84fe3741415b26251304b82a9098ceb56830ef75e5de358351b0cb27f98a5be8315ffe1f497fa3994b7c18ae746dc8959a334814fccaf1e67e68d69c3c
+  metadata.gz: 60309c7aa5e470d61aa7e3a61165a9ced30cd76a837331d8bada82bf933b94a15c94d99176b71a19b3c5ca43aef241b4e274aa8ede322640be1692187db2d8af
+  data.tar.gz: 77219578816c605892b2b10b48f6a434368b8b20c4c1588a77d5889b7e9b8ec942c041975b05fb7ef82f3217355c0ebcc1b8a6ab6565e2e52d1794a8acd5dc02

data/lib/actir.rb

@@ -4,6 +4,7 @@ require 'selenium-webdriver'
 lib = File.dirname(__FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'actir/config'
+require 'actir/data'
 require 'actir/initializer'
 require 'actir/remote'
 require 'actir/basic_page'

data/lib/actir/data.rb

@@ -0,0 +1,43 @@
+module Actir
+
+  module Data
+
+    class << self
+
+      def get(key)
+        #按照点分割字符串
+        key_array = key.split(".")  
+        #先取出数组中的第一个元素当做配置文件名称，并从数组中移除此元素
+        file_name = key_array.shift
+        #再取出第二个元素，指定配置项,并移除
+        cfg_name = key_array.shift 
+        hash = cfg_name ? load_file(file(file_name))[cfg_name] : load_file(file(file_name))
+        #遍历key数组
+        until key_array.empty? do
+          key = key_array.shift
+          hash = hash[key]
+        end
+        hash
+      end
+
+      private 
+
+      def file(file_name)
+        File.expand_path(File.join(data_dir, "/#{file_name}.yaml"), __FILE__)
+      end
+
+      #默认配置文件夹路径
+      def data_dir
+        @data_dir ||= File.join($project_path, "data")
+      end
+
+      #读取yaml配置文件
+      def load_file(file)
+        YAML.load_file file
+      end
+
+    end
+
+  end
+
+end

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

data/lib/actir/webdriver/browser.rb

@@ -58,11 +58,11 @@ class Browser
     for i in 1..3
       begin 
       Timeout::timeout(10)  do
-        puts "Time #{i}"
+        # puts "Time #{i}"
         super(uri)
 
         if self.execute_script("return document.readyState;") == "complete"
-          puts "has completed"
+          # puts "has completed"
           hasLoaded = 1
           break
         end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Distribut automated testing framework for Web or App.
@@ -117,8 +117,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -131,6 +131,7 @@ files:
 - lib/actir.rb
 - lib/actir/basic_page.rb
 - lib/actir/config.rb
+- lib/actir/data.rb
 - lib/actir/initializer.rb
 - lib/actir/parallel_tests/cli.rb
 - lib/actir/parallel_tests/grouper.rb
@@ -158,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Application Concurrence Test in Ruby.