macaron 2.0.1 → 2.0.2

data/README.md

@@ -1,16 +1,16 @@
 # Macaron
 Macaron is a simple web scraper implemented in ruby. It's used for service alive testing.
 
+## Support
+Ruby 1.9.x
+
 ## Install
     gem install macaron
 
 ## Example
 ```ruby
 require 'macaron'
-spawner = Spawner.new()
-
-# 1st argument is for start url, 2nd is for the depth to dig (optional)
-spawner.dig("http://www.google.com/", 2)
+Macaron::Spawner.new("http://www.google.com")
 ```
 
 ## CLI (Command Line Interface)

data/bin/macaron

@@ -1,8 +1,8 @@
-#!/usr/bin/ruby
-require File.dirname(__FILE__) + '/../lib/macaron'
-require 'rubygems'
+#!/usr/bin/env ruby
+$:.unshift File.dirname(__FILE__) + "/../lib"
+
 require 'optparse'
-require 'macaron/version'
+require 'macaron'
 
 options = {:depth => 2}
 options_parser = OptionParser.new do |opts|
@@ -40,4 +40,4 @@ end
 url = ARGV.first
 puts "Started"
 
-Spawner.new(url, options)
+Macaron::Spawner.new(url, options)

data/lib/macaron.rb

@@ -1,6 +1,6 @@
-$: << File.dirname(__FILE__)
-
-require 'macaron/spawner'
-require 'macaron/crawler'
-require 'macaron/page'
-include Macaron
+module Macaron
+  autoload :Version, 'macaron/version'
+  autoload :Spawner, 'macaron/spawner'
+  autoload :Crawler, 'macaron/crawler'
+  autoload :Page   , 'macaron/page'
+end

data/lib/macaron/page.rb

@@ -1,13 +1,11 @@
 require 'open-uri'
 require 'nokogiri'
-require 'thread'
 
 module Macaron
   class Page
     def initialize(url, bot=nil)
       @url = url
       @bot = bot
-      @@bot_lock = Mutex.new
     end
 
     def fetch
@@ -41,7 +39,7 @@ module Macaron
     def content
       if @bot
         # only activate one browser, needs to be thread safe.
-        @@bot_lock.synchronize { 
+        @bot.synchronize {
           @bot.goto(@url)
           @bot.html
         }

data/lib/macaron/spawner.rb

@@ -1,10 +1,11 @@
 require 'timeout'
 require 'observer'
+require 'threadpool'
 require 'watir-webdriver'
 
 module Macaron
   class Spawner
-    def initialize(url, options)
+    def initialize(url, options={})
       @options = options
 
       # threadpool(init workers, max workers, job timeout)
@@ -21,7 +22,10 @@ module Macaron
       @awaiting_counter = 1
 
       # bot is a webdriver
-      bot = Watir::Browser.new if @options[:with_watir]
+      if @options[:with_watir]
+        bot = Watir::Browser.new
+        bot.extend(MonitorMixin)
+      end
 
       loop do
         break if @awaiting_counter == 0
@@ -32,7 +36,7 @@ module Macaron
           next
         end
 
-        job = Macaron::Crawler.new(url, bot)
+        job = Crawler.new(url, bot)
         job.add_observer(self)
 
         threadpool.load(job)
@@ -58,7 +62,7 @@ module Macaron
       if @options[:with_watir]
         10
       else
-        2
+        4
       end
     end
 

data/lib/macaron/version.rb

@@ -1,3 +1,3 @@
 module Macaron
-  Version = "1.0.1"
+  Version = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaron
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-12-11 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: e-threadpool
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: watir-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 description: 
 email: dalema22@gmail.com
 executables:
@@ -26,7 +74,7 @@ files:
 - lib/macaron.rb
 - LICENSE
 - README.md
-homepage: http://github.com/eguitarz/macaron
+homepage: https://github.com/eguitarz/macaron
 licenses: []
 post_install_message: 
 rdoc_options: []