crabfarm 0.6.1 → 0.6.2

data/lib/crabfarm/live/reducer_runner.rb

@@ -5,16 +5,6 @@ module Crabfarm
   module Live
     class ReducerRunner
 
-      class Dsl
-        extend Forwardable
-
-        def initialize(_runner)
-          @runner = _runner
-        end
-
-        def_delegators :@runner, :use_snapshot, :use_params, :clear_params, :use_rspec
-      end
-
       def initialize(_manager, _target)
         @manager = _manager
         @target = _target
@@ -26,10 +16,6 @@ module Crabfarm
         @dsl ||= Dsl.new self
       end
 
-      def snapshot
-        if @snapshot.nil? then snapshot_for(@target) else @snapshot end
-      end
-
       def use_snapshot(_snapshot)
         @snapshot = _snapshot
         @rspec = false
@@ -49,11 +35,6 @@ module Crabfarm
         @rspec = true
       end
 
-      def prepare(_class, _path, _params) # decorator
-        @manager.primary_driver.get("file://#{_path}")
-        nil
-      end
-
       def execute
         strategy = if @rspec
           ReducerRunnerRSpec.new @manager, @target
@@ -61,11 +42,51 @@ module Crabfarm
           ReducerRunnerDirect.new @manager, snapshot, @target, @params
         end
 
-        Factories::SnapshotReducer.with_decorator self do
-          @manager.block_requests { strategy.execute }
+        begin
+          Factories::SnapshotReducer.with_decorator decorator do
+            strategy.execute
+          end
+
+          @manager.show_file decorator.last_path unless decorator.last_path.nil?
+          strategy.show_results
+        rescue Crabfarm::LiveInterrupted
+          Utils::Console.info "Execution interrupted"
+        end
+      end
+
+    private
+
+      def decorator
+        @decorator ||= DisplayFileDecorator.new @manager
+      end
+
+      def snapshot
+        if @snapshot.nil? then snapshot_for(@target) else @snapshot end
+      end
+
+      class Dsl
+        extend Forwardable
+
+        def initialize(_runner)
+          @runner = _runner
+        end
+
+        def_delegators :@runner, :use_snapshot, :use_params, :clear_params, :use_rspec
+      end
+
+      class DisplayFileDecorator
+
+        attr_reader :last_path
+
+        def initialize(_manager)
+          @manager = _manager
+        end
+
+        def prepare(_class, _path, _params)
+          @last_path = _path
+          nil
         end
 
-        strategy.show_results
       end
 
     end

data/lib/crabfarm/live/reducer_runner_direct.rb

@@ -23,8 +23,7 @@ module Crabfarm
       end
 
       def show_results
-        @manager.inject_web_tools
-        @manager.show_dialog(
+        @manager.show_message(
           :neutral,
           'Reducing completed!',
           "The page was parsed in #{@elapsed.real} seconds",

data/lib/crabfarm/live/reducer_runner_rspec.rb

@@ -1,14 +1,9 @@
-require 'crabfarm/utils/rspec_runner'
 require 'crabfarm/live/navigator_runner_rspec'
 
 module Crabfarm
   module Live
     class ReducerRunnerRSpec < NavigatorRunnerRSpec
 
-      def execute
-        @examples = Utils::RSpecRunner.run_spec_for spec_for(@target), live: true
-      end
-
     private
 
       def spec_for(_class)

data/lib/crabfarm/live/viewer.rb

@@ -0,0 +1,92 @@
+require 'tempfile'
+require 'crabfarm/utils/console'
+require 'crabfarm/utils/webdriver'
+
+module Crabfarm
+  module Live
+    class Viewer
+
+      INJECTION_TM = 5 # seconds
+
+      attr_reader :driver
+
+      def initialize(_driver)
+        @driver = _driver
+        @injected = false
+      end
+
+      def welcome
+        driver.get 'https://www.crabtrap.io/welcome.html'
+        @injected = false
+      end
+
+      def reset
+        driver.get 'https://www.crabtrap.io/instructions.html'
+        @injected = false
+      end
+
+      def show_file(_path)
+        driver.get "file://#{_path}"
+        @injected = false
+      end
+
+      def show_content(_content)
+        temp_file = Tempfile.new 'cb_live'
+        temp_file.write _content
+        temp_file.close
+
+        begin
+          show_file temp_file.path # block requests? not sure
+        ensure
+          temp_file.unlink
+        end
+      end
+
+      def show_message(_status, _title, _subtitle, _content=nil, _content_type=:text)
+        inject_web_tools
+        Utils::Console.trap_errors 'loading web dialog' do
+          driver.execute_script(
+            "window.crabfarm.showDialog.apply(null, arguments);",
+            _status.to_s,
+            _title,
+            _subtitle,
+            _content,
+            _content_type.to_s
+          );
+        end
+      end
+
+      def show_selector_gadget
+        inject_web_tools
+        Utils::Console.trap_errors 'loading selector gadget' do
+          driver.execute_script(
+            'window.crabfarm.showSelectorGadget();'
+          )
+        end
+      end
+
+    private
+
+      def inject_web_tools
+        return if @injected
+
+        Utils::Console.trap_errors 'injecting web tools' do
+          Utils::Webdriver.inject_style driver, 'https://www.crabtrap.io/selectorgadget_combined.css'
+          Utils::Webdriver.inject_style driver, 'https://www.crabtrap.io/tools.css'
+          Utils::Webdriver.inject_script driver, 'https://www.crabtrap.io/selectorgadget_combined.js'
+          Utils::Webdriver.inject_script driver, 'https://www.crabtrap.io/tools.js'
+          Timeout::timeout(INJECTION_TM) { wait_for_injection }
+        end
+
+        @injected = true
+      end
+
+      def wait_for_injection
+        while driver.execute_script "return (typeof window.crabfarm === 'undefined');"
+          sleep 1.0
+        end
+      end
+
+    end
+  end
+end

data/lib/crabfarm/live/watcher.rb

@@ -59,7 +59,12 @@ module Crabfarm
             end
 
             if target and target < Crabfarm::Live::Interactable
-              @controller.execute_live target
+              if @thread and @thread.alive?
+                @thread.terminate
+                @thread.join
+              end
+
+              @thread = Thread.new { @controller.execute_live target }
               break
             end
           end

data/lib/crabfarm/modes/live.rb

@@ -26,7 +26,7 @@ module Crabfarm
           Utils::Console.exception exc
         ensure
           Utils::Console.system 'Exiting'
-          Crabfarm.live.stop rescue nil
+          Crabfarm.live.stop
         end
       end
 

data/lib/crabfarm/modes/recorder/snapshot.rb

@@ -1,8 +1,8 @@
 require 'rainbow'
 require 'rainbow/ext/string'
 require 'crabfarm/modes/console'
+require 'crabfarm/utils/rspec_runner'
 require 'crabfarm/modes/shared/snapshot_decorator'
-require 'crabfarm/modes/shared/interactive_decorator'
 
 module Crabfarm
   module Modes
@@ -10,20 +10,13 @@ module Crabfarm
       module Snapshot
         extend self
 
-        def start(_context, _navigator, _query=nil)
+        def start(_context, _navigator)
           return puts "Must provide a navigator name" unless _navigator.is_a? String
 
           begin
-            puts "Navigating, waiting to hit a reducer...".color(Console::Colors::NOTICE)
+            puts "Navigating using last #{_navigator} spec, waiting to hit a reducer...".color(Console::Colors::NOTICE)
             Factories::Reducer.with_decorator Shared::SnapshotDecorator do
-              if _query.nil?
-                Factories::Navigator.with_decorator Shared::InteractiveDecorator do
-                  service.transition _context, _navigator
-                end
-              else
-                _query = parse_query_string _query
-                service.transition _context, _navigator, _query
-              end
+              @example = Utils::RSpecRunner.run_single_spec_for spec_for(_navigator)
             end
             puts "Navigation completed".color(Console::Colors::NOTICE)
           rescue Exception => e
@@ -34,20 +27,11 @@ module Crabfarm
 
       private
 
-        def service
-          TransitionService
-        end
-
-        def parse_query_string(_string)
-          result = {}
-
-          parts = _string.split '&'
-          parts.each do |part|
-            key, val = part.split '='
-            result[key.to_sym] = Shared::InteractiveDecorator::InteractiveHash.parse_input val
-          end
-
-          result
+        def spec_for(_class_name)
+          route = Utils::Naming.route_from_constant(_class_name)
+          route = route.join(File::SEPARATOR)
+          route = route + '_spec.rb'
+          File.join('spec','navigators', route)
         end
 
       end

data/lib/crabfarm/support/webdriver_factory.rb

@@ -15,7 +15,7 @@ module Crabfarm
         })
       end
 
-      common_setup Selenium::WebDriver.for(:chrome, :desired_capabilities => capabilities), _options
+      common_setup Selenium::WebDriver.for(:chrome, detach: false, desired_capabilities: capabilities), _options
     end
 
     def build_firefox_driver(_options={})

data/lib/crabfarm/templates/Gemfile.erb

@@ -10,6 +10,6 @@ gem 'nokogiri', "~> 1.6.6"
 gem "selenium-webdriver", "~> 2.47"
 
 group :test do
-  gem "rspec", "~> 3.2.0"
+  gem "rspec", "~> 3.3.0"
   gem "rspec-nc"
 end

data/lib/crabfarm/utils/rspec_runner.rb

@@ -6,31 +6,23 @@ module Crabfarm
       extend self
 
       class SilentFormatter
-        ::RSpec::Core::Formatters.register self
-
         def initialize(_output)
+          # do nothing with output (very silent!)
         end
       end
 
-      class DummyOptions
-        def configure(_); end
-      end
-
-      def run_spec_for(_target, _filter=nil)
-
-        _target = Array(_target)
-        # TODO: check target exist?
-
-        first_time_config
+      def run_single_spec_for(_target, _tag=nil)
+        setup_rspec_once
 
         begin
-          ::RSpec.configuration.files_or_directories_to_run = _target
-          ::RSpec.configuration.inclusion_filter = _filter if _filter
+          configuration.reset
 
-          runner = ::RSpec::Core::Runner.new DummyOptions.new
-          runner.run $stderr, $stdout
+          runner = ::RSpec::Core::Runner.new config_options(_target)
+          runner.setup $stderr, $stdout
+          example = skip_all_but_one _tag
+          runner.run_specs(world.ordered_example_groups)
 
-          ::RSpec.world.example_groups.map { |g| g.filtered_examples }.flatten
+          example
         ensure
           ::RSpec.clear_examples
         end
@@ -38,15 +30,55 @@ module Crabfarm
 
     private
 
-      def first_time_config
+      def world
+        ::RSpec.world
+      end
+
+      def configuration
+        ::RSpec.configuration
+      end
+
+      def setup_rspec_once
         unless @ready
-          options = ::RSpec::Core::ConfigurationOptions.new [
+          ::RSpec::Core::Formatters.register SilentFormatter
+          @ready = true
+        end
+      end
+
+      def config_options(_target)
+        ::RSpec::Core::ConfigurationOptions.new [
+            _target,
             '-f','Crabfarm::Utils::RSpecRunner::SilentFormatter'
-          ]
+        ]
+      end
 
-          options.configure ::RSpec.configuration
-          @ready = true
+      def skip_all_but_one(_tag)
+        best_example = world.all_examples.inject(nil) do |best, example|
+          example.metadata[:skip] = true
+          if is_better_example? example, best, _tag
+            example
+          else
+            best
+          end
         end
+
+        best_example.metadata[:skip] = false if best_example
+        best_example
+      end
+
+      def is_better_example?(_new, _old, _tag)
+        return true if _old.nil?
+
+        if _tag
+          new_tagged = !!(_new.metadata[_tag])
+          old_tagged = !!(_old.metadata[_tag])
+
+          # preffer tagged
+          return new_tagged if new_tagged != old_tagged
+        end
+
+        # preffer higher line number
+        return _new.metadata[:line_number] > _old.metadata[:line_number]
       end
 
     end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -417,6 +417,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/crabfarm/adapters/browser/abstract_webdriver.rb
+- lib/crabfarm/adapters/browser/base.rb
 - lib/crabfarm/adapters/browser/chrome.rb
 - lib/crabfarm/adapters/browser/firefox.rb
 - lib/crabfarm/adapters/browser/noop.rb
@@ -463,6 +464,7 @@ files:
 - lib/crabfarm/live/reducer_runner.rb
 - lib/crabfarm/live/reducer_runner_direct.rb
 - lib/crabfarm/live/reducer_runner_rspec.rb
+- lib/crabfarm/live/viewer.rb
 - lib/crabfarm/live/watcher.rb
 - lib/crabfarm/modes/console.rb
 - lib/crabfarm/modes/generator.rb