cobweb 1.0.17 → 1.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMzY2NkZjAzZjUzMmExMTM1NTQzOTU4ZWY0OWI3Yzk4ODFiOGRmZQ==
+    MTg3ODFiMWE1MmZlYWFjYzZiZjIzZjQ1NmFjZmJmMWU1MDVjZTc5Mg==
   data.tar.gz: !binary |-
-    YjIwOTE0MzY0NzIwNDRhNTNjN2EzYTg3Njc4MzQyYzIwNzUzYmFmYw==
+    ZGU4NmFiYTJlNmZlODRiMjRmNTkzZjMwOWQyMzEyZjU4OGQzMWUxMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmZlODk5ZTZmMDI0MzVkN2M2NDM3MjMzYmM3MjA1MjQ5MDRmMmUwNzU2MzUw
-    YTM5MWNlM2Y4MjJhMWEwMDk3ZDQ3MDJkNDBhOTExNWRhNWU4OWE4N2JmYjU3
-    YzM2NzYzZWJmNjM3MjQzZThlOGM2NGMzMzAxZDdhZTFjMTQxYTI=
+    ZDVmN2MwYzBiMjQ1N2E2YjBmYmM0ZTk5ZWJjMGVkN2VmMDM4ODhkNTQ0OTIx
+    ZTg4YzMzMWE0OTY2ZjgyNWRiNzZlZjgyZDlkM2Y4MTQ2OTVmZTg5Zjc1NTA1
+    MTZhYzc2ZmYwNmM2ODRlMmViODljMGFjODYwNTY5OThlNjY2M2Y=
   data.tar.gz: !binary |-
-    NDBhZTdlZjc1NTljMGE4NTU2M2UyZWM5YzZhNjQ2OTc1ZTQ5NjJmOGRiY2E2
-    MTc4ZDAxMmRjNTlkMjMzZGRlZGZiODQzYmZlZWMwYzIxMTlhOWZlZDEyY2Fh
-    ZjFmYWY5NTgwYTc1OTY1ODdkOWY3NThhODk1ZWEwMWY1N2M4OTQ=
+    M2M2YzU4ZTE5YzkxMWVmNmJiNTQ5OWFhNDExZGUwNzkxMGEzY2IyYTFmYTJl
+    YTE0OWI2ZmZhN2I0ZjA2YjU4NWFmNmUwMjY5ZDM4YWQ3ZmJkZmViNzRlNWMw
+    ZWMzNjIwNDkxNDk0NmMxOTE3NzljMGQ5MjlmYzgyODc3ZWQ2ZTY=

data/README.textile

@@ -1,5 +1,5 @@
 
-h1. Cobweb v1.0.17
+h1. Cobweb v1.0.18
 
 "@cobweb_gem":https://twitter.com/cobweb_gem
 !https://badge.fury.io/rb/cobweb.png!:http://badge.fury.io/rb/cobweb

data/lib/cobweb_version.rb

@@ -3,7 +3,7 @@ class CobwebVersion
   
   # Returns a string of the current version
   def self.version
-    "1.0.17"
+    "1.0.18"
   end
 
 end

data/lib/crawl_finished_worker.rb

@@ -1,4 +1,4 @@
-require 'sidekiq'
+
 require File.expand_path(File.dirname(__FILE__) + '/sidekiq/cobweb_helper')
 
 # If your client is single-threaded, we just need a single connection in our Redis connection pool
@@ -15,8 +15,7 @@ class CrawlFinishedWorker
   
   include Sidekiq::Worker
 
-  sidekiq_options queue: "crawl_finished_worker"
-  
+  sidekiq_options queue: "crawl_finished_worker" if SIDEKIQ_INSTALLED
   
   def perform(statistics)
     puts "Dummy Finished Job"

data/lib/crawl_process_worker.rb

@@ -1,5 +1,4 @@
 
-require 'sidekiq'
 require File.expand_path(File.dirname(__FILE__) + '/sidekiq/cobweb_helper')
 
 # If your client is single-threaded, we just need a single connection in our Redis connection pool
@@ -16,7 +15,7 @@ class CrawlProcessWorker
   
   include Sidekiq::Worker
 
-  sidekiq_options queue: "crawl_process_worker"
+  sidekiq_options queue: "crawl_process_worker" if SIDEKIQ_INSTALLED
   
   def perform(content)
     content = HashUtil.deep_symbolize_keys(content)

data/lib/crawl_worker.rb

@@ -1,4 +1,3 @@
-require 'sidekiq'
 require File.expand_path(File.dirname(__FILE__) + '/cobweb')
 require File.expand_path(File.dirname(__FILE__) + '/sidekiq/cobweb_helper')
 
@@ -14,8 +13,7 @@ require File.expand_path(File.dirname(__FILE__) + '/sidekiq/cobweb_helper')
 
 class CrawlWorker
   include Sidekiq::Worker
-  sidekiq_options queue: "crawl_worker"
-  sidekiq_options retry: false
+  sidekiq_options :queue => "crawl_worker", :retry => false if SIDEKIQ_INSTALLED
   
   def perform(content_request)
     # setup the crawl class to manage the crawl of this object

data/lib/sidekiq/cobweb_helper.rb

@@ -1,3 +1,11 @@
+if Gem::Specification.find_all_by_name("sidekiq", ">=3.0.0").count > 1
+  SIDEKIQ_INSTALLED = true
+  require 'sidekiq'
+else
+  SIDEKIQ_INSTALLED = false
+  puts "can't find sidekiq gem"
+end
+
 module Sidekiq
   module Worker
     module ClassMethods

data/spec/cobweb/crawl_worker_spec.rb

@@ -4,25 +4,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe CrawlWorker, :local_only => true do
 
   before(:all) do
-    #store all existing resque process ids so we don't kill them afterwards
-    @existing_processes = `ps aux | grep sidekiq | grep -v grep | awk '{print $2}'`.split("\n")
-    puts @existing_processes
-    @existing_processes.should be_empty
-  
-    # START WORKERS ONLY FOR CRAWL QUEUE SO WE CAN COUNT ENQUEUED PROCESS AND FINISH QUEUES
-    puts "Starting Workers... Please Wait..."
-    `mkdir log`
-    `rm -rf output.log`
-    io = IO.popen("nohup sidekiq -r ./lib/crawl_worker.rb -q crawl_worker > ./log/output.log &")
-    puts "Workers Started."
-  
+    
+    if SIDEKIQ_INSTALLED    
+      #store all existing resque process ids so we don't kill them afterwards
+      @existing_processes = `ps aux | grep sidekiq | grep -v grep | awk '{print $2}'`.split("\n")
+      puts @existing_processes
+      @existing_processes.should be_empty
+    
+      # START WORKERS ONLY FOR CRAWL QUEUE SO WE CAN COUNT ENQUEUED PROCESS AND FINISH QUEUES
+      puts "Starting Workers... Please Wait..."
+      `mkdir log`
+      `rm -rf output.log`
+      io = IO.popen("nohup sidekiq -r ./lib/crawl_worker.rb -q crawl_worker > ./log/output.log &")
+      puts "Workers Started."
+    end  
   end
 
   before(:each) do
+    pending("Sidkiq not installed") unless SIDEKIQ_INSTALLED
     @base_url = "http://localhost:3532/"
     @base_page_count = 77
   
-    clear_queues
+    clear_sidekiq_queues
   end
 
   describe "with no crawl limit" do
@@ -198,7 +201,7 @@ describe CrawlWorker, :local_only => true do
       command = "kill #{(@all_processes - @existing_processes).join(" ")}"
       IO.popen(command)
     end
-    clear_queues
+    clear_sidekiq_queues
   end
 
 end
@@ -234,7 +237,7 @@ def running?(crawl_id)
   result
 end
 
-def clear_queues
+def clear_sidekiq_queues
   Sidekiq.redis do |conn|
     conn.smembers("queues").each do |queue_name|
       conn.del("queue:#{queue_name}")

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec/samples/sample_serve
 require File.expand_path(File.dirname(__FILE__) + '/../spec/http_stubs')
 require 'mock_redis'
 require 'thin' if ENV["TRAVIS_RUBY_VERSION"].nil?
-require 'sidekiq'
 
 require 'coveralls'
 Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobweb
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis