simpleworker 0.0.1 → 0.1.0

data/spec/simpleworker/task_queue_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../spec_helper.rb', __FILE__)
+
+module SimpleWorker
+  describe TaskQueue do
+    let(:redis)      { double(Redis, :script => 'my_sha') }
+    let(:jobid)      { 'my_jobid' }
+    let(:task)       { 'my_task' }
+    let(:hostname)   { 'my_hostname' }
+    let(:task_queue) { TaskQueue.new(redis, hostname, jobid) }
+
+    before(:each) do
+      redis.should_receive(:get).with("simpleworker:config:my_jobid").and_return({'task_timeout' => 10}.to_json)
+    end
+
+    it 'can log node start' do
+      redis.should_receive(:rpush).with('simpleworker:log:my_jobid', ['on_node_start', hostname].to_json)
+
+      task_queue.fire_start
+    end
+
+    it 'can log node stop' do
+      redis.should_receive(:rpush).with('simpleworker:log:my_jobid', ['on_node_stop', hostname].to_json)
+
+      task_queue.fire_stop
+    end
+
+    it 'can log task start' do
+      redis.should_receive(:rpush).with('simpleworker:log:my_jobid', ['on_task_start', hostname, task].to_json)
+
+      task_queue.fire_task_start(task)
+    end
+
+    it 'can log task stop' do
+      redis.should_receive(:rpush).with('simpleworker:log:my_jobid', ['on_task_stop', hostname, task].to_json)
+
+      task_queue.fire_task_stop(task)
+    end
+
+    it 'can log message' do
+      msg = 'hello'
+      redis.should_receive(:rpush).with('simpleworker:log:my_jobid', ['on_log', hostname, msg].to_json)
+
+      task_queue.fire_log_message(msg)
+    end
+
+    it 'can expire current task' do
+      redis.should_receive(:evalsha).and_return('first_task')
+      redis.should_receive(:del).with('simpleworker:active:my_jobid:my_hostname:first_task')
+
+      task_queue.pop
+      task_queue.expire_current_task
+    end
+
+    it 'can pop from reliable queue' do
+      redis.should_receive(:evalsha).and_return('first_task', 'second_task', nil)
+      redis.should_receive(:srem).with("simpleworker:active:#{jobid}", "simpleworker:active:#{jobid}:#{hostname}:first_task")
+      redis.should_receive(:srem).with("simpleworker:active:#{jobid}", "simpleworker:active:#{jobid}:#{hostname}:second_task")
+
+      task_queue.pop.should eq 'first_task'
+      task_queue.pop.should eq 'second_task'
+      task_queue.pop.should be nil
+    end
+
+    it 'can iterate through tasks' do
+      redis.should_receive(:evalsha).and_return('first_task', 'second_task', nil)
+      redis.stub(:srem)
+
+      expect(task_queue).to receive(:fire_task_start).exactly(2).times
+      expect(task_queue).to receive(:fire_task_stop).exactly(2).times
+
+      result = []
+      task_queue.each_task { |task| result << task }
+      result.should eq ['first_task', 'second_task']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simpleworker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,22 +74,40 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/basic.rb
+- examples/cucumber_worker.rb
+- examples/local_worker.rb
+- examples/ssh_worker.rb
+- examples/worker.rb
 - lib/simpleworker.rb
-- lib/simpleworker/abstract_worker.rb
-- lib/simpleworker/bash/simple-localworker
-- lib/simpleworker/bash/ssh-remoteworker
+- lib/simpleworker/abstract_listener.rb
+- lib/simpleworker/event_monitor.rb
+- lib/simpleworker/event_server.rb
 - lib/simpleworker/local_worker.rb
+- lib/simpleworker/logging_listener.rb
+- lib/simpleworker/redis_support.rb
+- lib/simpleworker/retry_listener.rb
 - lib/simpleworker/runner.rb
+- lib/simpleworker/scripts/expired_tasks.lua
+- lib/simpleworker/scripts/lpopall.lua
+- lib/simpleworker/scripts/reliable_queue.lua
 - lib/simpleworker/ssh_worker.rb
+- lib/simpleworker/task_queue.rb
 - lib/simpleworker/version.rb
 - simpleworker.gemspec
+- spec/simpleworker/event_monitor_spec.rb
+- spec/simpleworker/event_server_spec.rb
 - spec/simpleworker/local_worker_spec.rb
+- spec/simpleworker/logging_listener_spec.rb
+- spec/simpleworker/retry_listener_spec.rb
 - spec/simpleworker/runner_spec.rb
 - spec/simpleworker/ssh_worker_spec.rb
+- spec/simpleworker/task_queue_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jesg/simpleworker
 licenses:
@@ -102,7 +134,12 @@ signing_key:
 specification_version: 4
 summary: Distribute ruby scripts on multiple machines
 test_files:
+- spec/simpleworker/event_monitor_spec.rb
+- spec/simpleworker/event_server_spec.rb
 - spec/simpleworker/local_worker_spec.rb
+- spec/simpleworker/logging_listener_spec.rb
+- spec/simpleworker/retry_listener_spec.rb
 - spec/simpleworker/runner_spec.rb
 - spec/simpleworker/ssh_worker_spec.rb
+- spec/simpleworker/task_queue_spec.rb
 - spec/spec_helper.rb

data/lib/simpleworker/abstract_worker.rb

@@ -1,42 +0,0 @@
-
-module SimpleWorker::AbstractWorker
-
-  attr_accessor :script, :cmd
-
-  def start
-    if script.kind_of? Array
-      @process = ChildProcess.build *script
-    else
-      @process = ChildProcess.build script
-    end
-
-    @process.io.inherit!
-
-    set_process_env
-
-    @process.start
-  end
-
-  def wait
-    @process.wait
-  end
-
-  def stop
-    @process.stop
-  end
-
-  def env
-    @env
-  end
-
-  private
-
-  def set_process_env
-    env['cmd'] ||= cmd
-
-    env.each do |key, value|
-      @process.environment[key] = value
-    end
-  end
-
-end

data/lib/simpleworker/bash/simple-localworker

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Ruby Version $(ruby -v)"
-echo "Which ruby: $(which ruby)"
-
-bundle install
-bundle exec ${cmd}
-

data/lib/simpleworker/bash/ssh-remoteworker

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-rsync -ar --delete  -e ssh "${PWD}/" "${user}@${host}:${directory}"
-
-remote_script=$(cat << EOF
-
-cd ${directory};
-echo "Ruby Version: \$(ruby -v)";
-echo "Which ruby: \$(which ruby)";
-
-echo "PWD: \${PWD}";
-
-bundle install;
-bundle exec ${cmd};
-
-EOF
-)
-
-ssh "${user}@${host}" "bash -lc '${remote_script}'"
-
-rsync -ar -e ssh "${user}@${host}:${directory}/" "${PWD}/"