selenium-dsl 0.1.3 → 0.1.5

data/Gemfile

@@ -1,9 +1,7 @@
 source "https://rubygems.org"
-
-group :test do
-  gem "minitest"
-end
-
 gem "selenium-webdriver"
-gem "pry"
-gem "term-ansicolor"
+gem "term-ansicolor"
+# gem "pry"
+# group :test do
+#   gem "minitest"
+# end

data/Gemfile.lock

@@ -4,29 +4,21 @@ GEM
     addressable (2.3.2)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
     ffi (1.1.5)
     libwebsocket (0.1.5)
       addressable
-    method_source (0.8.1)
-    minitest (4.2.0)
-    multi_json (1.3.7)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
+    multi_json (1.4.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    slop (3.3.3)
+    term-ansicolor (1.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest
-  pry
   selenium-webdriver
+  term-ansicolor

data/bin/sd

@@ -1,4 +1,49 @@
 require 'selenium_dsl'
 
-codes = IO.read(ARGV[0])
-SeleniumDsl.parser(codes,ARGV[1])
+if ARGV.length>0
+  codes = IO.read(ARGV[0])
+  SeleniumDsl.parser(codes,ARGV[1])
+else
+  puts <<END
+Selenium DSL 
+============
+> selenium-dsl <script-file>  [-mqv] #OR
+> sd <script-file>  [-mqv] 
+--------------------------
+m: mono    --> no color
+q: quit    --> closing browser
+v: verbose --> parsing output 
+
+Script-Reference:
+-----------------
+eng: <string> [params]    --> Commands
+ ex: firefox
+     visit http://google.com
+     *browser: (firefox | chrome | remote | phantomjs)*
+cmd: <css-cmd>            --> DOM Query (DQ)
+ ex: li.g[1]>a
+cmd: <css-cmd>[=<value>]  --> DQ and attr value=Id0123
+ ex: :input_id=Id0123       # <input name="input_id"/>
+cmd: <css-cmd>[~<action>] --> DQ and action (DQA)
+ ex: li.g[1]>a~click
+cmd: <css-cmd>[~<action>][=~<text>] --> DQA and check node text
+ ex: li.g[1]>a~text=~Home
+cmd: <css-cmd>[@<attr>][=~<text>] --> DQ and check node attr
+ ex: :input_id@value=~ayam
+
+Script-BASH-for-cron-job
+------------------------
+#!/bin/bash
+txt=`sd my-website -mq`
+if [ $? -ne 0 ]
+  then
+    echo "Error!!!"
+    echo -e "\\r\\n $txt"   > elog.txt
+    cat emsg.txt elog.txt > email.txt
+    ssmtp site.monitor@gmail.com < email.txt
+  else echo "OK"
+fi
+
+https://github.com/wharsojo/selenium-dsl - Enjoy!!! 
+END
+end

data/bin/selenium-dsl

@@ -1,4 +1,49 @@
 require 'selenium_dsl'
 
-codes = IO.read(ARGV[0])
-SeleniumDsl.parser(codes,ARGV[1])
+if ARGV.length>0
+  codes = IO.read(ARGV[0])
+  SeleniumDsl.parser(codes,ARGV[1])
+else
+  puts <<END
+Selenium DSL 
+============
+> selenium-dsl <script-file>  [-mqv] #OR
+> sd <script-file>  [-mqv] 
+--------------------------
+m: mono    --> no color
+q: quit    --> closing browser
+v: verbose --> parsing output 
+
+Script-Reference:
+-----------------
+eng: <string> [params]    --> Commands
+ ex: firefox
+     visit http://google.com
+     *browser: (firefox | chrome | remote | phantomjs)*
+cmd: <css-cmd>            --> DOM Query (DQ)
+ ex: li.g[1]>a
+cmd: <css-cmd>[=<value>]  --> DQ and attr value=Id0123
+ ex: :input_id=Id0123       # <input name="input_id"/>
+cmd: <css-cmd>[~<action>] --> DQ and action (DQA)
+ ex: li.g[1]>a~click
+cmd: <css-cmd>[~<action>][=~<text>] --> DQA and check node text
+ ex: li.g[1]>a~text=~Home
+cmd: <css-cmd>[@<attr>][=~<text>] --> DQ and check node attr
+ ex: :input_id@value=~ayam
+
+Script-BASH-for-cron-job
+------------------------
+#!/bin/bash
+txt=`sd my-website -mq`
+if [ $? -ne 0 ]
+  then
+    echo "Error!!!"
+    echo -e "\\r\\n $txt"   > elog.txt
+    cat emsg.txt elog.txt > email.txt
+    ssmtp site.monitor@gmail.com < email.txt
+  else echo "OK"
+fi
+
+https://github.com/wharsojo/selenium-dsl - Enjoy!!! 
+END
+end

data/lib/selenium_dsl.rb

@@ -3,7 +3,7 @@ require 'selenium_dsl/commands'
 require 'selenium_dsl/engines'
 require 'selenium_dsl/modules'
 require 'selenium_dsl/macros'
-require 'pry'
+# require 'pry'
 
 require 'term/ansicolor'
 include Term::ANSIColor
@@ -16,7 +16,7 @@ class SeleniumDsl
 
     def init
       nodes    = /^(\>*([\-\w]*(\.[.\[\]\-\d\w]+|[#:][\-\d\w]+)|\w+(\[\w+\=[\d\w"]+\])*)|\/[\w@"=\[\]]+)(\[\d+\])*/
-      action   = /^[~]\w+(\:\w+)*/
+      action   = /^[~@]\w+(\:\w+)*/
       @driver  = nil
       @nodes   = nil
       @return  = nil
@@ -24,7 +24,7 @@ class SeleniumDsl
       @code    = {}
       @path    = '~'
       @opt     = ''
-      @r_eng   = [/^(mock|debug|chrome|firefox|remote|phantomjs|visit|wait|quit|if)/]
+      @r_eng   = [/^(chrome|firefox|remote|phantomjs|visit|wait|quit|if)/] #mock|debug|
       @r_mcr   = [/^\$[\-\w]+ *\=/,/^\$[\-\w]+[^\=]/]
       @r_cmd   = [nodes, action]
       @r_mod   = [/^(def +|end)/]
@@ -64,13 +64,22 @@ class SeleniumDsl
         stx = parse_cmd(line) if !stx
         stx = parse_fnc(line) if !stx
       end
+      @driver.quit if opt_q && @driver
       print "\n"
     end
 
     private
 
+    def opt_m
+      @opt=~/\-.*[m]/
+    end
+
+    def opt_q
+      @opt=~/\-.*[q]/
+    end
+
     def opt_v
-      @opt=~/\-[v]/
+      @opt=~/\-.*[v]/
     end
 
     def _code_
@@ -108,19 +117,22 @@ class SeleniumDsl
     end
 
     def failed
-      print 'F'.red if !opt_v
+      print (opt_m ? 'F' : 'F'.red) if !opt_v
       c = _code_
       l = c[:line]
       r = c[:code]
       y = 2
-      puts "\n=====>>>>ASSERT FAILED!!!<<<<=====".yellow
+      e = "\n=====>>>>ASSERT FAILED!!!<<<<====="
+      puts (opt_m ? e : e.yellow)
       y.times do |idx|
         no = (l-y)+idx
-        tx = r[no].send(idx<(y-1) ? :green : :red)
+        tx = "#{r[no]}#{idx<(y-1) ? '' : ' ...Error'}"
+        tx = (idx<(y-1) ? tx.green : tx.red) if !opt_m
         puts "#{no+1}. #{tx}"
       end
       puts "#{l+1}. #{r[l]}" if r[l]
-      puts caller
+      # puts caller
+      @driver.quit if opt_q && @driver
       Kernel.exit(1)
     end
   end

data/lib/selenium_dsl/commands.rb

@@ -41,9 +41,9 @@ class SeleniumDsl
         @nodes = nodes if nodes
         nodes
       end
-      print '.'.green if !opt_v
-    # rescue Exception => e
-    #   failed
+      print (opt_m ? '.' : '.'.green) if !opt_v
+    rescue Exception => e
+      failed
     end
 
     def find_elements(typ,el,idx)
@@ -71,9 +71,9 @@ class SeleniumDsl
         @nodes = nodes if nodes
         nodes
       end
-      print '.'.green if !opt_v
-    # rescue Exception => e
-    #   failed
+      print (opt_m ? '.' : '.'.green) if !opt_v
+    rescue Exception => e
+      failed
     end
 
     def parse_cmd(line)
@@ -118,10 +118,15 @@ class SeleniumDsl
         if cmd==[] #no command supplied
           cmd << "~val" if (str=prm[/[=~]+/]) && str.length==1
         end
-        c1,c2 = cmd[0].split(':',2)
-        if (exc = in_commands?(c1))
-          @return = nil
-          send("_#{exc}",prm,c2)
+        if cmd[0][0]=="@"
+          @return = @nodes.attribute(cmd[0][1,99])
+          assert(prm)
+        else
+          c1,c2 = cmd[0].split(':',2)
+          if (exc = in_commands?(c1))
+            @return = nil
+            send("_#{exc}",prm,c2)
+          end
         end
         true
       else
@@ -152,9 +157,9 @@ class SeleniumDsl
         line = prm.strip.split(splt,2)
         if line.length==2
           if (parse_cmd(line[0]) && eval("\"#{@return}\" #{splt} /#{line[1]}/"))
-            print '.'.green if !opt_v
+            print (opt_m ? '.' : '.'.green) if !opt_v
           else
-            failed #print 'F'.red if !opt_v
+            failed #print (opt_m ? 'F' : 'F'.red) if !opt_v
           end
         end
       end
@@ -173,7 +178,7 @@ class SeleniumDsl
     def assert(prm)
       if prm[0,2]=='=~'
         if @return =~ /#{prm[2,99].strip}/
-          print '.'.green if !opt_v
+          print (opt_m ? '.' : '.'.green) if !opt_v
         else
           failed
         end

data/lib/selenium_dsl/engines.rb

@@ -47,9 +47,9 @@ class SeleniumDsl
       @mock = true
     end
 
-    def _debug(prm)
-      binding.pry
-    end
+    # def _debug(prm)
+    #   binding.pry
+    # end
 
     def _visit(prm)
       _firefox('') if !@driver

data/selenium-dsl.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 	s.require_paths = ["lib"] 
     s.executables   = ["sd","selenium-dsl"]
 	s.add_runtime_dependency "selenium-webdriver"
-	s.add_runtime_dependency "pry"
 	s.add_runtime_dependency "term-ansicolor"
-	s.post_install_message = ">>Enjoy your SDSL!!!<<"
+	# s.add_runtime_dependency "pry"
+	s.post_install_message = "\ncmd: sd [Enter]\n>>Enjoy your Selenium DSL!!!<<"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +65,11 @@ files:
 - lib/selenium_dsl/macros.rb
 homepage: http://github.com/wharsojo/selenium-dsl
 licenses: []
-post_install_message: ! '>>Enjoy your SDSL!!!<<'
+post_install_message: ! '
+
+  cmd: sd [Enter]
+
+  >>Enjoy your Selenium DSL!!!<<'
 rdoc_options: []
 require_paths:
 - lib