fanforce-workers 0.4.7 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc1NWI1N2I0YWE5OTNiMjIwMGJlYjM2MTUyN2RlNGJiMGIwYTY3OA==
+    NGY5NDAwMDQxNWJkNzk4Y2MzZTk5ZjdiNzM2MzZlMGFlMGZkMGI4MQ==
   data.tar.gz: !binary |-
-    ZjkxOTgxYjljNGFkZDY3MjhiZmYxM2RiZWJmNTc4Yzc1ODEyMzlhZg==
+    OTIyMDgwM2UzNWM5YjdkMjUwMWNlMzRkZTBkYWYyZmU5YWUxNGM3YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjhiZjdiNmYwNzA3YmM3OTUyYjkwOTA5MWRmYmEyMTJhNDc2YWZhYjgxOTQy
-    ZjE3N2JmYmFhZDMwMWM3YzY2NWJlNjFhZTkzMmQxMmIyY2RiNzFiOWNiNjgx
-    MzQ1ZmJkOWMyNmVmNzM5OTdlNmM4ZjMyNGFlZWQwNmZhNjljODM=
+    OWQ2OGMwYWY1NTQ1ZGE1ZWU1YWQ1NGVjNmJhNjVkZGQwZmMxZjhmNjNiNmIw
+    M2I1MzVhZmMwNjE4N2Q2OGQ4ODI2Yjg5YTY1ZWU0NDRhZmMwNzkxYzMzZTk2
+    NDE4NjdlYWU3MzYzYTQ5MDY2NDYwNmQ4NWJiODY4ODVlMGYzYTI=
   data.tar.gz: !binary |-
-    ZTZhZGMxY2QxNzZjNTA2ZDMyOWJkMWU2MmRhN2UwZTU1ZmM5OWNhYWJmMTQx
-    YjM0YWFkMGYyNWUyYzc2ZWYzNGM0MmUxYjNiNzM5YWM3MjJkOTc5NzYyYzI2
-    NGZiNDRkMTU1MTUwZmEwOTE3MzI5MzhhZGNmYzBmMDY5Nzc1MzI=
+    MWFiZDI2YTI5NWExYmRlOTJkZjcwNTMyNDk5NWE2MGNkYTVkYmY1ZTY1NWRj
+    Y2YxNjU2MDZmM2ZhMGEyNDNkYjUxZmU3ZmI4YTllMjE3ZDlmMmUxMDM2MTBk
+    MDJhMjkzOTdlNjdhMWMyZjExMjk3ODI5M2QxM2VhYWEzZDVjMGQ=

data/README.md

@@ -1,4 +1,4 @@
 fanforce-workers
 ==
 
-Fanforce workers library used by plugins to connect with iron_mg and iron_worker_ng
+Fanforce workers used by addons to connect with iron_mg and iron_worker_ng

data/fanforce-workers.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name        = 'fanforce-workers'
   gem.version     = Fanforce::Workers::VERSION
   gem.date        = '2012-10-19'
-  gem.summary     = %q{Fanforce workers library used by various Fanforce addons.}
+  gem.summary     = %q{Fanforce workers used by various Fanforce addons for background processing.}
   gem.authors     = ['Caleb Clark']
   gem.email       = ['cclark@fanforce.com']
   gem.homepage    = 'http://github.com/fanforce/fanforce-workers'
@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'iron_mq', '~> 4'
-  gem.add_runtime_dependency 'fanforce-api', '~> 0.9'
   gem.add_runtime_dependency 'typhoeus'
+  gem.add_runtime_dependency 'fanforce-api', '~> 0.9'
 end

data/lib/fanforce/workers.rb

@@ -1,6 +1,6 @@
 class Fanforce
   require_relative 'workers/version'
   require_relative 'workers/workers'
-  require_relative 'workers/worker'
+  require_relative 'workers/workers'
 end
 

data/lib/fanforce/workers/iron.rb

@@ -1,3 +1,5 @@
+require 'iron_mq'
+
 class Fanforce::Workers::Iron
 
   def initialize(opts={})

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Workers
-    VERSION = '0.4.7'
+    VERSION = '0.5.1'
   end
 end

data/lib/fanforce/workers/workers.rb

@@ -1,24 +1,14 @@
-require 'iron_mq'
-
 class Fanforce::Workers
 
   def initialize(opts={})
     @opts = opts
   end
 
-  def self.add_error(queue_id, payload)
-    self.new.iron.enqueue("#{queue_id}-ERRORS", payload)
-  end
-
   def iron
     require_relative 'iron'
     @iron ||= Fanforce::Workers::Iron.new(@opts)
   end
 
-  def self.enqueue(queue_id, payload)
-    self.new.enqueue(queue_id, payload)
-  end
-
   def enqueue(queue_id, payload)
     raise 'Payload being sent to the queue must be a Hash' if !payload.is_a?(Hash)
     iron.enqueue queue_id, params: payload, retries: 0
@@ -31,4 +21,63 @@ class Fanforce::Workers
     msg.delete
   end
 
+  ##########################################################################################
+
+  def self.add_error(queue_id, payload)
+    self.new.iron.enqueue("#{queue_id}-ERRORS", payload)
+  end
+
+  def self.enqueue(queue_id, payload)
+    self.new.enqueue(queue_id, payload)
+  end
+
+  ##########################################################################################
+
+  def self.run(worker_data, &code_block)
+    require '.pluginenv'
+    require 'iron_mq'
+    require 'fanforce/api'
+
+    run_validations
+    run_worker IronMQ::Client.new.queue(worker_data['worker_id']).get(timeout: 3600), worker_data, &code_block
+  end
+
+  def self.run_validations
+
+  end
+
+  def run_worker(msg, worker_data, &code_block)
+    puts '----------------------------------------------------------'
+    print 'PROCESSING MESSAGE: '
+    task_data = Fanforce.decode_json(msg.body)
+
+    set_env_vars(worker_data['env_vars'])
+    code_block.call(task_data[:params].clone, task_data[:retries])
+    msg.delete
+
+  rescue Exception => e
+    if msg.nil?
+      puts 'MESSAGE IS NIL'
+      return
+    end
+    task_data[:last_error] = {
+        exception: e.class.name,
+        message: e.message,
+        backtrace: e.backtrace,
+        raised_at: Time.now
+    }
+    task_data[:last_error][:curl_command] = e.curl_command if e.respond_to?(:curl_command)
+    task_data[:env_vars] = worker_data['env_vars']
+
+    puts "ADDING TO ERROR QUEUE: #{task_data.to_json}"
+    self.add_error worker_data['worker_id'], task_data
+    msg.delete
+    puts 'DELETED MESSAGE'
+  end
+
+  def set_env_vars(vars)
+    vars.each {|k,v| ENV[k.to_s]=v }
+    load 'fanforce/api/ff_globals.rb'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-workers
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.1
 platform: ruby
 authors:
 - Caleb Clark
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: fanforce-api
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: fanforce-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: 
 email:
 - cclark@fanforce.com
@@ -67,7 +67,6 @@ files:
 - lib/fanforce/workers.rb
 - lib/fanforce/workers/iron.rb
 - lib/fanforce/workers/version.rb
-- lib/fanforce/workers/worker.rb
 - lib/fanforce/workers/workers.rb
 homepage: http://github.com/fanforce/fanforce-workers
 licenses: []
@@ -91,5 +90,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Fanforce workers library used by various Fanforce addons.
+summary: Fanforce workers used by various Fanforce addons for background processing.
 test_files: []

data/lib/fanforce/workers/worker.rb

@@ -1,65 +0,0 @@
-class Fanforce::Worker
-
-  def self.run(worker_data, &code_block)
-    self.new(worker_data, &code_block)
-  end
-
-  def initialize(worker_data, &code_block)
-    require_dependencies
-    run_validations
-
-    @worker_data = worker_data
-    @code_block = code_block
-
-    run_worker iron_mq.queue(worker_data['worker_id']).get(timeout: 3600)
-  end
-
-  def require_dependencies
-    require '.pluginenv'
-    require 'iron_mq'
-    require 'fanforce/api'
-  end
-
-  def run_validations
-
-  end
-
-  def iron_mq
-    @iron_mq ||= IronMQ::Client.new
-  end
-
-  def run_worker(msg)
-    puts '----------------------------------------------------------'
-    print 'PROCESSING MESSAGE: '
-    task_data = Fanforce.decode_json(msg.body)
-
-    set_env_vars(@worker_data['env_vars'])
-    @code_block.call(task_data[:params].clone, task_data[:retries])
-    msg.delete
-
-  rescue Exception => e
-    if msg.nil?
-      puts 'MESSAGE IS NIL'
-      return
-    end
-    task_data[:last_error] = {
-        exception: e.class.name,
-        message: e.message,
-        backtrace: e.backtrace,
-        raised_at: Time.now
-    }
-    task_data[:last_error][:curl_command] = e.curl_command if e.respond_to?(:curl_command)
-    task_data[:env_vars] = @worker_data['env_vars']
-
-    puts "ADDING TO ERROR QUEUE: #{task_data.to_json}"
-    Fanforce::Workers.add_error @worker_data['worker_id'], task_data
-    msg.delete
-    puts 'DELETED MESSAGE'
-  end
-
-  def set_env_vars(vars)
-    vars.each {|k,v| ENV[k.to_s]=v }
-    load 'fanforce/api/ff_globals.rb'
-  end
-
-end