karousel 0.9.12 → 0.9.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef18213079b6107700ded2ee615b158c67bf25f1
+  data.tar.gz: d2cf60a1dd89e6f2a6084c4c4c8ab7439b78a4c4
+SHA512:
+  metadata.gz: 4682cd248ab139cea564a88d3d55d6cf609e19d50f738c701379386944b90dee7a7afb941418fa7d95ac1dde5fac7d50775af4bfffe377572408d6bf62017541
+  data.tar.gz: ce54f921aa5862c3941c8159b56b90ed2263ec5dc252daa60df4c38ad4a85013dd1a7fae60bf27bc60f2b0abdcf25e826afe4372dc1bb28c542b015e6e31ba66

data/CHANGELOG

@@ -0,0 +1 @@
+0.9.13 -- major bug fixes

data/Gemfile

@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'jeweler'
+gem 'jeweler', '~> 1.8'
 
 group :test, :development do
-  gem 'cucumber'
-  gem 'rspec'
-  gem 'debugger'
+  gem 'cucumber', '~> 1.3'
+  gem 'rspec', '~> 2.14'
+  gem 'debugger', '~> 1.6'
 end
 
 

data/Gemfile.lock

@@ -1,47 +1,79 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.1.3)
+    addressable (2.3.5)
+    builder (3.2.2)
     columnize (0.3.6)
-    cucumber (1.2.1)
+    cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    debugger (1.2.0)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    git (1.2.5)
-    jeweler (1.8.4)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber
-  debugger
-  jeweler
-  rspec
+  cucumber (~> 1.3)
+  debugger (~> 1.6)
+  jeweler (~> 1.8)
+  rspec (~> 2.14)

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.9.13

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/cucumber

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'cucumber' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('cucumber', 'cucumber')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/jeweler

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'jeweler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('jeweler', 'jeweler')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/nokogiri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'nokogiri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('nokogiri', 'nokogiri')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rdebug

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdebug' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('debugger', 'rdebug')

data/bin/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'ri')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/karousel.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "karousel"
-  s.version = "0.9.12"
+  s.version = "0.9.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitry Mozzherin", "David Shorthouse"]
-  s.date = "2012-09-24"
+  s.date = "2013-09-18"
   s.description = "Use it if you have waaay too many items in your workers' queue"
   s.email = "dmozzherin@gmail.com"
+  s.executables = ["autospec", "cucumber", "htmldiff", "jeweler", "ldiff", "nokogiri", "rackup", "rake", "rdebug", "ri", "rspec"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -21,12 +22,24 @@ Gem::Specification.new do |s|
     ".rspec",
     ".rvmrc",
     ".travis.yml",
+    "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/autospec",
+    "bin/cucumber",
+    "bin/htmldiff",
+    "bin/jeweler",
+    "bin/ldiff",
+    "bin/nokogiri",
+    "bin/rackup",
+    "bin/rake",
+    "bin/rdebug",
+    "bin/ri",
+    "bin/rspec",
     "features/karousel.feature",
     "features/step_definitions/karousel_steps.rb",
     "features/support/env.rb",
@@ -44,28 +57,28 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/GlobalNamesArchitecture/karousel"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "Job dispenser for parallel workers"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<debugger>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_development_dependency(%q<debugger>, ["~> 1.6"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<debugger>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_dependency(%q<debugger>, ["~> 1.6"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<debugger>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<cucumber>, ["~> 1.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.14"])
+    s.add_dependency(%q<debugger>, ["~> 1.6"])
   end
 end
 

data/lib/karousel.rb

@@ -2,14 +2,14 @@ Dir[File.join(File.dirname(__FILE__), "karousel", "*.rb")].each {|f| require f}
 
 
 class Karousel
-  attr_reader :size, :seats, :time_interval, :cycle_data
+  attr_reader :size, :seats, :time_interval
+  STATUS = { init: 1, sent: 2, success: 3, failure: 4 }
 
   def initialize(klass, size=10, time_interval = 0)
     @klass = klass
     @size = size
     @time_interval = time_interval
     @seats = []
-    @cycle_data = []
   end
 
   def populate
@@ -36,7 +36,7 @@ class Karousel
   def send_request
     @cursor = 0
     @seats.each_with_index do |job, index|
-      if job.status == :sent
+      if job.status == STATUS[:sent]
         @cursor = index
         break
       end
@@ -45,12 +45,11 @@ class Karousel
   end
 
   def check_response
-    @cycle_data = []
     @seats = @seats[@cursor..-1] + @seats[0...@cursor] if @cursor != 0
     @seats.size.times do
       job = @seats.shift
-      @cycle_data << job
-      (job.status != :failure && job.finished? && job.status == :success) ? job.process : @seats.push(job)
+      (job.status != :failure && job.finished?) ? job.process : 
+        @seats.push(job)
     end
     @cursor = 0
   end

data/lib/karousel/job.rb

@@ -1,41 +1,41 @@
 class Karousel
   class Job
-    STATUS = { 1 => :init, 2 => :sent, 3 => :success, 4 => :failure }
     attr_reader :client_job
+    STATUS = { init: 1, sent: 2, success: 3, failure: 4 }
 
     def initialize(client_job)
       raise TypeError.new("Unknown client job type") unless client_job.is_a?(Karousel::ClientJob)
       @client_job = client_job
-      @invert_status = STATUS.invert
     end
 
     def status
-      @status = STATUS[@client_job.status]
-      raise TypeError.new("status must be an integer between 1 and 4") unless @status
+      @status = @client_job.status
+      unless [1,2,3,4].include?(@status)
+        raise TypeError.new('Status must be an integer between 1 and 4') 
+      end
       @status
     end
 
     def status= (new_status)
-      new_status = @invert_status[new_status]
-      raise TypeError.new("Unknown status") unless new_status
+      unless [1,2,3,4].include?(new_status)
+        raise TypeError.new('Status must be an integer between 1 and 4') 
+      end
       @client_job.status = new_status
     end
 
     def send
       is_ok = @client_job.send
-      self.status = is_ok ? :sent : :failure 
+      self.status = (is_ok ? STATUS[:sent] : STATUS[:failure])
       is_ok
     end
 
     def finished?
-      is_ok = @client_job.finished?
-      self.status = is_ok ? :success : :failure
-      is_ok
+      @client_job.finished?
     end
 
     def process
       is_ok = @client_job.process
-      self.status = is_ok ? :success : :failure
+      self.status = (is_ok ? STATUS[:success] : STATUS[:failure])
       is_ok
     end
 

data/spec/karousel_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative 'spec_helper'
 
 describe "Karousel" do
   before(:all) do
@@ -22,12 +22,6 @@ describe "Karousel" do
   
   it "should run with block" do
     karousel = Karousel.new(ClientJobDummy, 20, 0)
-    karousel.run do
-      karousel.cycle_data.size.should > 0
-      statuses = karousel.cycle_data.map {|c| c.status}
-      statuses.uniq!
-      [:failure, :success].should == statuses.sort! if statuses.size > 1
-    end
   end
 
   it "should be able to get loaded with jobs" do 
@@ -35,7 +29,7 @@ describe "Karousel" do
     @karousel.populate
     @karousel.seats.size.should == 20
     @karousel.seats[0].class == Karousel::Job
-    @karousel.seats[0].status.should == :init
+    @karousel.seats[0].status.should == Karousel::STATUS[:init]
   end
 
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'karousel'
+require_relative 'support/client_job_dummy'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/support/client_job_dummy.rb

@@ -1,4 +1,4 @@
-require_relative './dummy_server'
+require_relative 'dummy_server'
 
 class ClientJobDummy < Karousel::ClientJob
   @@dummy_data = 0 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karousel
 version: !ruby/object:Gem::Version
-  version: 0.9.12
-  prerelease: 
+  version: 0.9.13
 platform: ruby
 authors:
 - Dmitry Mozzherin
@@ -10,75 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: Use it if you have waaay too many items in your workers' queue
 email: dmozzherin@gmail.com
-executables: []
+executables:
+- autospec
+- cucumber
+- htmldiff
+- jeweler
+- ldiff
+- nokogiri
+- rackup
+- rake
+- rdebug
+- ri
+- rspec
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -88,12 +90,24 @@ files:
 - .rspec
 - .rvmrc
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/autospec
+- bin/cucumber
+- bin/htmldiff
+- bin/jeweler
+- bin/ldiff
+- bin/nokogiri
+- bin/rackup
+- bin/rake
+- bin/rdebug
+- bin/ri
+- bin/rspec
 - features/karousel.feature
 - features/step_definitions/karousel_steps.rb
 - features/support/env.rb
@@ -110,29 +124,25 @@ files:
 homepage: http://github.com/GlobalNamesArchitecture/karousel
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3048407349789202224
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Job dispenser for parallel workers
 test_files: []