fist_of_fury 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f2ab34c65e469913ca11ac359305f9d9e9516c
-  data.tar.gz: 6985388d0ee90b74159d265f77bbdfd8dbf2553a
+  metadata.gz: 0884954c60927ef15189149f12f7f3f959659992
+  data.tar.gz: a56067b59f06b5ac82bdffc0bc1bafe7f4dcd32f
 SHA512:
-  metadata.gz: 33c713382a9d4c7ecb7a38071ebe5f0508d9cfbd6cbee8d3ae1c127f2b98dc2f2d1925f891b8dfcd2b7d23eacf624f7d76cae3297c719fd22a9b6b149716d526
-  data.tar.gz: d97c72a867e1e55d20287627336daab49a525f5297d3c4da643a527f3781a02a7e5434e0fd95ad01bf12ec11fd0bb9687359945abbc1df25534ab341ed7b741c
+  metadata.gz: 1b34fd018cd5ba4573ff9fcef626e30391d3412ee80cb10c84aa9400a28ee4b64826adaa28ec410d0cd539a517298d08d31841b7a8e76e88a032734c21ca1ae0
+  data.tar.gz: f54298b29a1ee9bf85c74f5b7dee8af71ae62fca3f95ca531bf263a778dad4f02bc577599244ad0bcc9a04848368987f750cefdff7fc0b62fe641c28cd346f73

data/.travis.yml

@@ -5,7 +5,10 @@ rvm:
   - rbx
   - 2.0.0
   - 2.1.0
+  - 2.2.0
+  - 2.3.0
 matrix:
   allow_failures:
+    - rvm: 1.9.3
     - rvm: jruby-19mode
     - rvm: rbx

data/README.md

@@ -1,5 +1,7 @@
 # Fist of Fury
 
+## DEPRECATED: This project is no longer maintained. I recommend using it only for messing around with the concept. If you're interested in taking this over, let me know.
+
 [![Build Status](https://travis-ci.org/facto/fist_of_fury.png?branch=master)](https://travis-ci.org/facto/fist_of_fury)
 [![Dependency Status](https://gemnasium.com/facto/fist_of_fury.svg)](https://gemnasium.com/facto/fist_of_fury)
 [![Coverage Status](https://coveralls.io/repos/facto/fist_of_fury/badge.png)](https://coveralls.io/r/facto/fist_of_fury)
@@ -53,6 +55,8 @@ class SayHiJob
 end
 ```
 
+**GOTCHA WARNING:** If you define the recurrence rules within the job classes themselves, you may run into an issue where your jobs never run in development. By default, Rails does not eager load code in development, and thus will not load your job classes, resulting in your jobs not being scheduled. Either set `config.eager_load = true` in `development.rb` or reference your job classes somewhere in an initializer (`config/fist_of_fury.rb` is a good candidate).
+
 If you did not run the install generator, you need to kick off the process somewhere (like an initializer) with this:
 
 ```Ruby

data/fist_of_fury.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'coveralls'
   end
 
-  gem.add_dependency 'sucker_punch', '>= 1.1.0'
-  gem.add_dependency 'celluloid',    '>= 0.15.2'
+  gem.add_dependency 'sucker_punch', '~> 1.5.0'
   gem.add_dependency 'ice_cube',     '~> 0.11.3'
 end

data/lib/fist_of_fury/dispatcher.rb

@@ -3,9 +3,7 @@ module FistOfFury
     include Logging
 
     def dispatch(worker, time)
-      worker.schedule_next(time) do
-        enqueue(worker, worker.next_scheduled_occurrence)
-      end
+      enqueue(worker) if worker.scheduled_time_met?(time)
     rescue StandardError => e
       # TODO: exception handling support
       raise e
@@ -13,13 +11,9 @@ module FistOfFury
 
     protected
 
-    def enqueue(worker, next_run_time)
+    def enqueue(worker)
       klass = worker.to_s
       info "Enqueue: #{klass}"
-      last_run_time = FistOfFury.store["#{klass}:next"] || -1
-      next_run_time = next_run_time.to_f
-      FistOfFury.store["#{klass}:last"] = last_run_time
-      FistOfFury.store["#{klass}:next"] = next_run_time
       worker.new.async.perform
     rescue StandardError => e
       # TODO: exception handling support

data/lib/fist_of_fury/recurrent.rb

@@ -11,27 +11,13 @@ module FistOfFury
         @schedule ||= FistOfFury::Schedule.new
       end
 
-      def last_scheduled_occurrence
-        scheduled_occurrence 'last'
-      end
-
-      def next_scheduled_occurrence
-        scheduled_occurrence 'next'
-      end
-
       def recurs(options={}, &block)
         schedule.instance_eval(&block)
         schedule.options = options
       end
 
-      def schedule_next(time, &block)
-        schedule.schedule_next(time, &block)
-      end
-
-      private
-
-      def scheduled_occurrence(key)
-        (FistOfFury.store["#{self.class.to_s}:#{key}"] || -1).to_f
+      def scheduled_time_met?(time)
+        schedule.scheduled_time_met?(time)
       end
     end
 

data/lib/fist_of_fury/schedule.rb

@@ -3,6 +3,7 @@ module FistOfFury
     attr_accessor :options, :ice_cube_schedule, :last_occurrence
 
     def initialize
+      start_time = FistOfFury.config.utc ? Time.now.utc : Time.now
       self.ice_cube_schedule = IceCube::Schedule.new(start_time)
     end
 
@@ -18,31 +19,25 @@ module FistOfFury
       end
     end
 
-    def schedule_next(time)
-      return unless can_schedule_next?(time)
+    def scheduled_time_met?(time)
+      self.last_occurrence = next_occurrence(time) unless last_occurrence
+      return false if last_occurrence_is_next_occurrence?(time)
       self.last_occurrence = next_occurrence(time)
-      yield
+      true
     end
 
     def to_s
       ice_cube_schedule.to_s
     end
 
-    def start_time
-      @start_time ||= FistOfFury.config.utc ? Time.now.utc : Time.now
-    end
-
     private
 
-    def next_occurrence(time)
-      ice_cube_schedule.next_occurrence(time)
+    def last_occurrence_is_next_occurrence?(time)
+      last_occurrence == next_occurrence(time)
     end
 
-    def can_schedule_next?(time)
-      unless last_occurrence
-        self.last_occurrence = next_occurrence(time)
-      end
-      last_occurrence != next_occurrence(time)
+    def next_occurrence(time)
+      ice_cube_schedule.next_occurrence(time)
     end
   end
 end

data/lib/fist_of_fury/version.rb

@@ -1,3 +1,3 @@
 module FistOfFury
-  VERSION = '0.2.7'
+  VERSION = '0.3.0'
 end

data/lib/fist_of_fury.rb

@@ -46,11 +46,6 @@ module FistOfFury
   def dispatcher
     FistOfFury::Supervisor.dispatcher
   end
-
-  def store
-    @store ||= {}
-  end
-
   def attack!
     yield if block_given?
     FistOfFury::Supervisor.run!

data/spec/fist_of_fury/dispatcher_sharedspec.rb

@@ -10,11 +10,18 @@ shared_examples_for 'a dispatcher' do
 
     let(:worker) { double('worker') }
 
-    it 'delegates scheduling to the worker' do
-      expect(worker).to receive(:schedule_next) do |*args, &block|
-        expect(args).to include(time)
-        expect(block).to_not be_nil
-      end
+    it 'does not enqueue the worker if the scheduled time has not been met' do
+      expect(worker).to receive(:scheduled_time_met?).with(time).and_return(false)
+      subject.dispatch(worker, time)
+    end
+
+    it 'enqueues the worker when the schedule time is met' do
+      expect(worker).to receive(:scheduled_time_met?).with(time).and_return(true)
+      double_worker = double('worker')
+      double_async = double('async')
+      expect(worker).to receive(:new).and_return(double_worker)
+      expect(double_worker).to receive(:async).and_return(double_async)
+      expect(double_async).to receive(:perform)
       subject.dispatch(worker, time)
     end
   end

data/spec/fist_of_fury/recurrent_sharedspec.rb

@@ -16,20 +16,6 @@ shared_examples_for 'a job with recurrence' do
     end
   end
 
-  describe '::last_scheduled_occurrence' do
-    it 'calls scheduled_occurrence with the right arguments' do
-      expect(described_class).to receive(:scheduled_occurrence).with('last')
-      described_class.last_scheduled_occurrence
-    end
-  end
-
-  describe '::next_scheduled_occurrence' do
-    it 'calls scheduled_occurrence with the right arguments' do
-      expect(described_class).to receive(:scheduled_occurrence).with('next')
-      described_class.next_scheduled_occurrence
-    end
-  end
-
   describe '::recurs' do
     it 'evaluate the block within the context of the schedule and sets the options' do
       block = lambda {}
@@ -42,15 +28,15 @@ shared_examples_for 'a job with recurrence' do
     end
   end
 
-  describe '::schedule_next' do
+  describe '::scheduled_time_met?' do
     let(:block) { lambda {} }
     let(:time) { double('time') }
     let(:schedule) { double('schedule') }
 
     it 'delegates to the schedule' do
       described_class.schedule = schedule
-      expect(schedule).to receive(:schedule_next).with(time)
-      described_class.schedule_next(time, &block)
+      expect(schedule).to receive(:scheduled_time_met?).with(time)
+      described_class.scheduled_time_met?(time, &block)
     end
   end
 end

data/spec/fist_of_fury/schedule_spec.rb

@@ -6,54 +6,39 @@ describe FistOfFury::Schedule do
   describe '#initialize' do
     it 'creates an IceCube schedule' do
       ice_cube_schedule = double('ice_cube_schedule')
-      start_time = double('start_time')
-      allow_any_instance_of(described_class).to receive(:start_time).and_return(start_time)
-      allow(IceCube::Schedule).to receive(:new).with(start_time).and_return(ice_cube_schedule)
+      allow(IceCube::Schedule).to receive(:new).and_return(ice_cube_schedule)
       expect_any_instance_of(described_class).to receive(:ice_cube_schedule=).with(ice_cube_schedule)
       schedule
     end
   end
 
-  describe '#schedule_next' do
+  describe '#scheduled_time_met?' do
     let(:time) { double('time') }
-    let(:block) { lambda {} }
     let(:next_occurrence) { double('next_occurrence') }
 
     before :each do
-      allow(schedule).to receive(:next_occurrence).and_return(next_occurrence)
+      allow(schedule).to receive(:next_occurrence).with(time).and_return(next_occurrence)
     end
 
-    context 'when it should be scheduled' do
-      before :each do
-        allow(schedule).to receive(:can_schedule_next?).and_return(true)
-      end
-
-      it 'calls the block' do
-        block_called = false
-        schedule.schedule_next(time) { block_called = true }
-        expect(block_called).to eq true
+    context 'when it has been met' do
+      before do
+        allow(schedule).to receive(:last_occurrence_is_next_occurrence?).and_return(false)
       end
 
       it 'sets the last occurrence' do
-        expect(schedule).to receive(:last_occurrence=).with(next_occurrence)
-        schedule.schedule_next(time, &block)
+        expect(schedule).to receive(:last_occurrence=).with(next_occurrence).exactly(2).times
+        schedule.scheduled_time_met?(time)
       end
     end
 
-    context 'when it should not be scheduled' do
-      before :each do
-        allow(schedule).to receive(:can_schedule_next?).and_return(false)
-      end
-
-      it 'does not call the block' do
-        block_called = false
-        schedule.schedule_next(time) { block_called = true }
-        expect(block_called).to eq false
+    context 'when it has not been met' do
+      before do
+        allow(schedule).to receive(:last_occurrence_is_next_occurrence?).and_return(true)
       end
 
       it 'does not set the last occurrence' do
-        expect(schedule).not_to receive(:last_occurrence=).with(next_occurrence)
-        schedule.schedule_next(time, &block)
+        expect(schedule).to receive(:last_occurrence=).with(next_occurrence)
+        schedule.scheduled_time_met?(time)
       end
     end
   end

data/spec/fist_of_fury_spec.rb

@@ -25,12 +25,6 @@ describe FistOfFury do
     end
   end
 
-  describe '#store' do
-    it 'starts out as an empty hash' do
-      expect(FistOfFury.store).to eq Hash.new
-    end
-  end
-
   describe '#dispatcher' do
     it "delegates to the supervisor's dispatcher" do
       expect(FistOfFury::Supervisor).to receive(:dispatcher)

metadata

@@ -1,153 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: fist_of_fury
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua Rieken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   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: rake
   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: rspec
   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: guard
   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: guard-rspec
   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: ruby_gntp
   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: coveralls
   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: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
 description: Recurring jobs for Sucker Punch
@@ -157,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -210,17 +196,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Recurring jobs for Sucker Punch