grid_tools 0.0.3 → 0.0.4

data/bin/grid_tools

@@ -35,27 +35,45 @@ command :start do |c|
     end
     
     if args[0] == "hub"
-      #if `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/).count < 3 
+      if GridTools.windows?
         binaries =  File.expand_path(File.dirname(File.expand_path(__FILE__)) + '/../binaries')
-        cmd = "java -jar #{binaries}/selenium-server-standalone* -browserTimeout 300 -role hub >> ~/hub.log 2>&1 &"
+        binaries.gsub!("/", "\\")
+        cmd = "start java -jar #{binaries}\\selenium-server-standalone-2.29.0.jar -role hub -browserTimeout 300"
         system cmd
-        #pid = `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/)[0]
-        puts "Started a hub."# [pid: #{pid}]"
-      #else
-      # raise "Hub or node already started,"
-      #end
+        puts "Started a hub."
+      else
+        #if `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/).count < 3 
+          binaries =  File.expand_path(File.dirname(File.expand_path(__FILE__)) + '/../binaries')
+          cmd = "java -jar #{binaries}/selenium-server-standalone* -browserTimeout 300 -role hub >> ~/hub.log 2>&1 &"
+          system cmd
+          pid = `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/)[0]
+          puts "Started a hub. [pid: #{pid}]"
+        #else
+        # raise "Hub or node already started,"
+        #end
+      end
     end 
     
     if args[0] == "node"
-      #if `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/).count < 3
+      if GridTools.windows?
         binaries =  File.expand_path(File.dirname(File.expand_path(__FILE__)) + '/../binaries')
-        cmd = "java -jar #{binaries}/selenium-server-standalone* -role wd -hub http://#{options[:h]}:4444/grid/register -trustAllSSLCertificates >> ~/node.log 2>&1 &"
+        binaries.gsub!("/", "\\")
+        cmd = "start java -jar #{binaries}\\selenium-server-standalone-2.29.0.jar -role wd -hub http://#{options[:h]}:4444/grid/register -trustAllSSLCertificates"
         system cmd
-        #pid = `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/)[0]
-        puts "Started a node. "# [pid: #{pid}]"
-      #else
-      # raise "Hub or node already started."
-      #end
+        puts "Started a node."
+      else
+        #if `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/).count < 3
+          binaries =  File.expand_path(File.dirname(File.expand_path(__FILE__)) + '/../binaries')
+          platform = "MAC" if GridTools.mac?
+          platform = "LINUX" if GridTools.linux?
+          cmd = "java -jar #{binaries}/selenium-server-standalone* -role wd -hub http://#{options[:h]}:4444/grid/register -browser \"browserName=firefox,maxInstances=5,platform=#{platform}\" -browser \"browserName=chrome,maxInstances=5,platform=#{platform}\" -trustAllSSLCertificates >> ~/node.log 2>&1 &"
+          system cmd
+          pid = `ps -e -o pid,args | awk '/selenium-server/ { print $1 }'`.split(/\n/)[0]
+          puts "Started a node. [pid: #{pid}]"
+        #else
+        #  raise "Hub or node already started."
+        #end
+      end
     end
 
 

data/lib/grid_tools/version.rb

@@ -1,3 +1,3 @@
 module GridTools
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/grid_tools.rb

@@ -12,10 +12,10 @@ module GridTools
    (/darwin/ =~ RUBY_PLATFORM) != nil
  end
  def self.unix?
-   !OS.windows?
+   !GridTools.windows?
  end
  def self.linux?
-   OS.unix? and not OS.mac?
+   GridTools.unix? and not GridTools.mac?
  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: