moto 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d372116a3d958f4b63271540b60d41d035f270e
-  data.tar.gz: c9aa807fd63cae0abe92f9103c1c44ea4f431235
+  metadata.gz: 67513bc98ab3246d5619d69d560a15956f4d01f7
+  data.tar.gz: e062119f15ac74b5012c701525a0e2ff6c1463ab
 SHA512:
-  metadata.gz: 274cc49288e9aaf523e23c64b9fd572d127c469f45213d234039e4fefc4cec598d97755e3208caea948cd2f24975b75dc74f857c18ae43f853b10422cd64eb1d
-  data.tar.gz: e101a87b1351073c09ac40cefc1fe76613a94783d25db13f2b4494c18756acce963d98f5639a429e2d684f83ce1139c0f81197958589e5b4b15bab75ad9c1a5a
+  metadata.gz: 93f8ce00760e6ea9e2c37d7f873d5a1e2bc1fa6a4f9f316e365ba0584a98eeff49445822683fb2e9da608f22424e14a5818b732e075cefcea8a1ff0e6908b026
+  data.tar.gz: dad258914f1fd10fa21f30614621c9dc9ab2f552a87d420cf848ab33880765dbc52aac23412e674e20018d92baf3b1c6728853a7281bbaebf9acc6514c8aa4f7

data/lib/cli.rb

@@ -1,19 +1,9 @@
-# TODO: fix this dumb verification of current working directory
-unless File.exists? "#{Dir.pwd}/config/moto.rb"
-  puts 'Config file (config/moto.rb) not present.'
-  puts 'Does current working directory contain Moto application?'
-  exit 1
-end
-
 require 'logger'
 require 'pp'
 require 'yaml'
 require 'active_support/inflector'
 require 'active_support/core_ext/object/blank'
 
-require 'bundler/setup'
-Bundler.require
-
 module MotoApp
   DIR = Dir.pwd
 end
@@ -32,6 +22,7 @@ require_relative './result'
 require_relative './assert'
 require_relative './test'
 require_relative './page'
+require_relative './version'
 require_relative './clients/base'
 require_relative './listeners/base'
 require_relative './listeners/console'

data/lib/clients/website.rb

@@ -2,15 +2,19 @@ require 'capybara'
 
 module Moto
   module Clients
-	
-  	class Website < Moto::Clients::Base
+
+    class Website < Moto::Clients::Base
 
       attr_reader :session
-      
+
       ignore_logging(:page)
       ignore_logging(:context)
       ignore_logging(:session)
-  		 		
+
+      def init
+        register_grid_driver
+      end
+
       def start_run
         # TODO: make session driver configurable
         context.runner.my_config[:capybara][:default_selector] &&
@@ -18,32 +22,50 @@ module Moto
         @session = Capybara::Session.new(context.runner.my_config[:capybara][:default_driver])
         @pages = {}
       end
-      
+
       def end_run
-        @session.driver.browser.close # TODO: check that it really works
+        @session.driver.quit
       end
-      
+
       def start_test(test)
         # @context.current_test.logger.info("Hi mom, I'm opening some pages!")
         @session.reset_session!
       end
-  
+
       def end_test(test)
         @session.reset_session!
-      end   
-  		
-  		def page(p)
-  		  page_class_name = "#{self.class.name}::Pages::#{p}"
-  		  page_class_name.gsub!('Moto::', 'MotoApp::')
-  		  if @pages[page_class_name].nil?
+      end
+
+      def page(p)
+        page_class_name = "#{self.class.name}::Pages::#{p}"
+        page_class_name.gsub!('Moto::', 'MotoApp::')
+        if @pages[page_class_name].nil?
           a = page_class_name.underscore.split('/')
-          page_path = a[1..20].join('/')
-          require "#{MotoApp::DIR}/lib/#{page_path}"	    
-  		    @pages[page_class_name] = page_class_name.constantize.new(self)
-  		  end
-  		  @pages[page_class_name]
-  		end
-  		
-  	end
+          page_path = a[1..-1].join('/')
+          require "#{MotoApp::DIR}/lib/#{page_path}"
+          @pages[page_class_name] = page_class_name.constantize.new(self)
+        end
+        @pages[page_class_name]
+      end
+
+      private
+
+      def register_grid_driver
+        grid_config = context.runner.my_config[:capybara][:grid]
+        return if grid_config.nil?
+        if grid_config[:capabilities].nil?
+          capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
+        else
+          capabilities = Selenium::WebDriver::Remote::Capabilities.new(grid_config[:capabilities])
+        end
+        Capybara.register_driver :grid do |app|
+          Capybara::Selenium::Driver.new(app,
+                                        :browser => :remote,
+                                        :url => grid_config[:url],
+                                        :desired_capabilities => capabilities)
+        end
+      end
+
+    end
   end
 end

data/lib/parser.rb

@@ -9,17 +9,32 @@ module Moto
   class Parser
   
     def self.run(argv)
-            
-      # TODO Generate app / Change the way parsing options goes so it doesnt generate them if they`re not needed
-      case argv[0]
-        when 'run' then Moto::Cli.run run_parse(argv)
-        when 'help' then show_help
-        when 'generate' then Moto::AppGenerator.run generate_parse(argv)
-        else puts "Command '#{argv[0]}' not recognized. Type help for list of supported commands."
+      begin
+        # TODO Generate app / Change the way parsing options goes so it doesnt generate them if they`re not needed
+        case argv[0]
+          when '--version' then puts Moto::VERSION
+          when 'run' then Moto::Cli.run run_parse(argv)
+          when 'help' then show_help
+          when 'generate' then Moto::AppGenerator.run generate_parse(argv)
+          else puts "Command '#{argv[0]}' not recognized. Type help for list of supported commands."
+        end
+      rescue Exception => e
+        puts e.message
       end
     end
     
     def self.run_parse(argv)
+
+      # TODO: fix this dumb verification of current working directory.
+      unless File.exists? "#{MotoApp::DIR}/config/moto.rb"
+        msg = "Config file (config/moto.rb) not present.\n"
+        msg << 'Does current working directory contain Moto application?'
+        raise msg
+      end    
+
+      require 'bundler/setup'
+      Bundler.require
+      
       # Default options
       options = {}
       options[:reporters] = []
@@ -33,13 +48,13 @@ module Moto
       # TODO const 
       # TODO reporters should be consts - not strings
       OptionParser.new do |opts|       
-          opts.on('-t', '--tests Tests', Array) { |v| options[:tests ] = v }
-          opts.on('-g', '--tags Tags', Array) { |v| options[:tags ] = v }
-          opts.on('-r', '--reporters Reporters', Array) { |v| options[:reporters] = v }
-          opts.on('-e', '--environments Environment', Array) { |v| options[:environments] = v }
-          opts.on('-c', '--const Const') { |v| options[:const] = v }
-          opts.on('-n', '--name Name') { |v| options[:name] = v }
-          opts.on('-f', '--config Config') { |v| options[:config] = options[:config].merge( eval( v ) ) }
+        opts.on('-t', '--tests Tests', Array) { |v| options[:tests ] = v }
+        opts.on('-g', '--tags Tags', Array) { |v| options[:tags ] = v }
+        opts.on('-r', '--reporters Reporters', Array) { |v| options[:reporters] = v }
+        opts.on('-e', '--environments Environment', Array) { |v| options[:environments] = v }
+        opts.on('-c', '--const Const') { |v| options[:const] = v }
+        opts.on('-n', '--name Name') { |v| options[:name] = v }
+        opts.on('-f', '--config Config') { |v| options[:config] = options[:config].merge( eval( v ) ) }
       end.parse!
 
       if options[:name].empty?
@@ -73,7 +88,8 @@ module Moto
     
     def self.show_help
       puts """
-      Moto CLI Help:
+      Moto (#{Moto::VERSION}) CLI Help:
+      moto --version Display current version
       moto run:      
        -t, --tests = Tests to be executed. For e.x Tests\Failure\Failure.rb should be passed as Tests::Failure
        -r, --reporter = Reporters to be used. Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Moto
+  VERSION = '0.0.17'
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Bartek Wilczek
 - Maciej Stark
+- Radosław Sporny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,6 +75,7 @@ description: This is a development version of a rails philosophy inspired framew
 email:
 - bwilczek@gmail.com
 - stark.maciej@gmail.com
+- r.sporny@gmail.com
 executables:
 - moto
 extensions: []
@@ -93,6 +95,7 @@ files:
 - lib/test_generator.rb
 - lib/test_logging.rb
 - lib/thread_context.rb
+- lib/version.rb
 - lib/clients/base.rb
 - lib/clients/website.rb
 - lib/exceptions/moto.rb