brake 0.1.4 → 0.1.5

data/lib/brake.rb

@@ -46,21 +46,22 @@ class Brake
         opts.on("-t", "--tags @high,@login", Array, "Array:  A list of all tagged test to be run" ) { |o| options.push([:tags, o]) }
         opts.on("-l", "--log_level debug", String, "String: The log output level debug|info" ) { |o| options.push([:log_level, o]) }
         opts.separator ""
-        opts.separator "Browser options:"
-        opts.on("-H", "--[no-]highlight", "Bool: To turn off the highlight of elements" ) { |o| options.push([:highlight, o]) }
-        opts.separator ""
         opts.separator "BrandwatchWeb options:"
-        opts.on("-b", "--browser chrome", String, "String: The type of browser to run" ) { |o| options.push([:browser, o]) }
+        opts.on("-c", "--controller chrome", String, "String: The type of controller to run (API, Chrome, Safari)" ) { |o| options.push([:controller, o]) }
         opts.on("-s", "--screen 1280,1024", Array, "Array:  The width,hight of the browser window" ) { |o| options.push([:screen, o]) }
         opts.on("--pos", "--position 0,0", Array, "Array:  The x,y coords of the browser 0,0 top left" ) { |o| options.push([:position, o]) }
         opts.separator ""
         opts.separator "API options:"
         opts.on("-v", "--version 00", String, "String: API Version number" ) { |o| options.push([:version, o]) }
         opts.separator ""
-        opts.separator "For furthur assistance please contact Ben Slaughter"
+        opts.separator "Browser options:"
+        opts.on("-H", "--[no-]highlight", "Bool: To turn off the highlight of elements" ) { |o| options.push([:highlight, o]) }
+        opts.separator ""
         opts.on("-u", "--[no-]untangle", "Bool: Turns Debug on/off" ) { |o| untangle = o }
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
+          puts "For furthur assistance please contact Ben Slaughter or Jonathan Chrisp"
+          puts "bens@brandwatch.com or jonathan@brandwatch.com"
           exit
         end
       end.parse!
@@ -90,8 +91,8 @@ class Brake
           arguments[:log_level] = "LOGLEVEL=#{value[1].downcase}"
         when :highlight
           arguments[:highlight] = "HIGHLIGHT=true"
-        when :browser
-          arguments[:browser] = "BROWSERNAME=#{value[1].downcase}"
+        when :controller
+          arguments[:controller] = "CONTROLLER=#{value[1].downcase}"
         when :screen
           arguments.push( "SCREENWIDTH=#{value[1][0].downcase} SCREENHEIGHT=#{value[1][1].downcase}" )
         when :position
@@ -113,10 +114,10 @@ class Brake
       puts "WARNING: No Defaults set for default task"
       Rake::Task[:default].invoke( arguments.values.join( ' ' ) )
     when 'brandwatchweb', 'bw'
-      arguments = arguments.merge({ :platform => "PLATFORM=brandwatchweb", :env => 'ENVIRONMENT=release', :browser => 'BROWSERNAME=chrome' })
+      arguments = { :platform => "PLATFORM=brandwatchweb", :env => 'ENVIRONMENT=release', :controller => 'CONTROLLER=chrome' }.merge(arguments)
       Rake::Task[:brandwatchWeb].invoke( arguments.values.join( ' ' ) )
     when 'brandwatchapi', 'api'
-      arguments = arguments.merge({ :platform => "PLATFORM=brandwatchapi", :env => 'ENVIRONMENT=int', :version => 'VERSION=1' })
+      arguments = { :platform => "PLATFORM=brandwatchapi", :env => 'ENVIRONMENT=int', :controller => 'CONTROLLER=api', :version => 'VERSION=1' }.merge(arguments)
       Rake::Task[:brandwatchAPI].invoke( arguments.values.join( ' ' ) )
     else
       puts "WARNING: No Defaults set for custom task"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake