sqewer 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376905158864071505965ba29e27d67552fed4dc
-  data.tar.gz: 1cffb36287c14210508ca0c36357109fd9862c3d
+  metadata.gz: edded56859437d9b7bce9424d2c00b4a8d999756
+  data.tar.gz: aaa87e0f5ab8a4fe1b0c73682e4282bd7b52534b
 SHA512:
-  metadata.gz: 7669344c1b8c11aacac7ca2d7ba7e6792301fb4711cb4c9de4c4b3cbaf6eb2157ddfe96fec137433cb12279214ab948f349af340629bf2ae1909c46050200fd9
-  data.tar.gz: e2ef1bf783999d3b8fab81c86be905be543ac34a7887adc21eaf39cb7096b44e8cc150ea0698bae5571d2c40dae5de2021c95cb2da7a972ff94f96b171eab825
+  metadata.gz: 8c0394391564b80cd5148dfb4446561ae29902e4e05fc62360b0d0fa454effb25d6bc62978f3b2a81fcd3021c7cc59afbad8031c6bb5fcef1cfd18965e87f233
+  data.tar.gz: 7daa39ca0ee05abf18c65f9bfbe59d334160522243a3a1fb0589ba413070893d89f0896e57597506678459951337bb29a4fa686fb6442d99ae47aef8f7f65d35

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
   gem 'dotenv'
   gem 'rake'
   gem "rspec", "~> 3.2.0"
+  gem 'rspec-wait'
   gem 'simplecov', :require => false
 #  gem "autospec" -> I would love to have this, but it wants capybara-webkit too :-(
   gem "rdoc", "~> 3.12"

data/lib/sqewer/isolator.rb

@@ -51,7 +51,9 @@ class Sqewer::Isolator
     middleware_stack.around_execution(job, context) do
       job.method(:run).arity.zero? ? job.run : job.run(context)
     end
-    logger.info { "[worker] Finished #{job.inspect} in %0.2fs" % (Time.now - t) }
+    # FIXME: do not mix templating and format strings
+    delta = Time.now - t
+    logger.info { "[worker] Finished %s in %0.2fs" % [job.inspect, delta] }
   rescue => e
     logger.error { "[worker] Failed #{job.inspect} with a #{e}" } if job
     raise e

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/spec_helper.rb

@@ -2,36 +2,17 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
-require 'simplecov'
-
+require 'rspec/wait'
 require 'dotenv'
-Dotenv.load
-
 require 'aws-sdk'
+require 'simplecov'
+Dotenv.load
 
 SimpleCov.start
 require 'sqewer'
 
-module Polling
-  # Call the given block every N seconds, and return once the
-  # block returns a truthy value. If it still did not return
-  # the value after fail_after, fail the spec.
-  def poll(every: 0.5, fail_after:, &check_block)
-    started_polling = Time.now
-    loop do
-      return if check_block.call
-      sleep(every)
-      if (Time.now - started_polling) > fail_after
-        fail "Waited for #{fail_after} seconds for the operation to complete but it didnt"
-      end
-    end
-  end
-end
-
 RSpec.configure do |config| 
   config.order = 'random'
-  config.include Polling
-  
   config.around :each do | example |
     if example.metadata[:sqs]
       queue_name = 'conveyor-belt-test-queue-%s' % SecureRandom.hex(6)

data/spec/sqewer/cli_spec.rb

@@ -1,6 +1,10 @@
 require_relative '../spec_helper'
 
-describe Sqewer::CLI, :sqs => true do
+describe Sqewer::CLI, :sqs => true, :wait => {timeout: 120} do
+  after :each do
+    Dir.glob('*-result').each{|path| File.unlink(path) }
+  end
+    
   describe 'runs the commandline app, executes jobs and then quits cleanly' do
     it 'on a USR1 signal' do
       submitter = Sqewer::Connection.default
@@ -17,13 +21,12 @@ describe Sqewer::CLI, :sqs => true do
         end
       end
    
-      sleep 8 # Give it some time to process all the jobs
+      sleep 10 # Give it some time to process all the jobs
       Process.kill("USR1", pid)
-      sleep 2
+      wait_for { Process.wait(pid) }
       
       generated_files = Dir.glob('*-result')
       expect(generated_files).not_to be_empty
-      generated_files.each{|path| File.unlink(path) }
     
       stderr.rewind
       log_output = stderr.read
@@ -47,7 +50,8 @@ describe Sqewer::CLI, :sqs => true do
    
       sleep 4
       Process.kill("TERM", pid)
-    
+      wait_for { Process.wait(pid) }
+      
       generated_files = Dir.glob('*-result')
       expect(generated_files).not_to be_empty
       generated_files.each{|path| File.unlink(path) }

data/spec/sqewer/worker_spec.rb

@@ -97,8 +97,8 @@ describe Sqewer::Worker, :sqs => true do
       worker.start
       
       begin
-        poll(fail_after: 3) { File.exist?('initial-job-run') }
-        poll(fail_after: 3) { File.exist?('secondary-job-run') }
+        wait_for { File.exist?('initial-job-run') }.to eq(true)
+        wait_for { File.exist?('secondary-job-run') }.to eq(true)
         
         File.unlink('initial-job-run')
         File.unlink('secondary-job-run')
@@ -130,8 +130,8 @@ describe Sqewer::Worker, :sqs => true do
       worker.start
       
       begin
-        poll(fail_after: 3) { File.exist?('initial-job-run') }
-        poll(fail_after: 3) { File.exist?('secondary-job-run') }
+        wait_for { File.exist?('initial-job-run') }.to eq(true)
+        wait_for { File.exist?('secondary-job-run') }.to eq(true)
         
         File.unlink('initial-job-run')
         File.unlink('secondary-job-run')

data/sqewer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sqewer 3.0.0 ruby lib
+# stub: sqewer 3.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sqewer"
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-01-25"
+  s.date = "2016-02-03"
   s.description = "Process jobs from SQS"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<dotenv>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 3.2.0"])
+      s.add_development_dependency(%q<rspec-wait>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -86,6 +87,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dotenv>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 3.2.0"])
+      s.add_dependency(%q<rspec-wait>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -100,6 +102,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dotenv>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 3.2.0"])
+    s.add_dependency(%q<rspec-wait>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement