when-cron 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420cf2151fc72d5f0b8826761b8b5f0a826539d0
-  data.tar.gz: 43452faf5af725c4c9b6e73a123beea17ac51285
+  metadata.gz: e2398cff23356ee6c9aec3e565f53189d20fe6f1
+  data.tar.gz: 55539ece23018256655584532f24753a342a97fe
 SHA512:
-  metadata.gz: b9b1fb00c0b8239626e911b6d438eb97573571825977f05d910a15d7b1ac0e56d6fe6f8baf77fc1ea2fab95af4a390c1a821893b4b47a254d08f68f4df8710e7
-  data.tar.gz: 8c230d9008b79afc09e9d1a48d36fc853a644a3b9bb031498ccd2f533fdbcfe744180b879027d8fddbb7bea132ca98bff082dbfb098b358341c9cf44c2c7b303
+  metadata.gz: 9cc06fa82520f6ecdb0ee50bf1935d5172455278c00a1df4cb29fa82b96e4c5a26145506639f599c86e68987d8c36dd2c381370cb5ad559f7e2334a3ff6f5d5b
+  data.tar.gz: b86f68fa09dcfd2205b5d10d1f6d484e5e0d8c1ac646dec6cb69bc640a7eacba2fe1aadaf62f71346ed4ba68616fc15efd9edecd8f0599a83397003f3ac58fa2

data/README.md

@@ -37,6 +37,11 @@ When::Cron will raise an error for extremely nonsensical cron strings.
 
 ```When::Cron.new('this is getting ridiculous') # => raises When::Cron::InvalidString```
 
+When::Cron follows this rule (man 5 crontab)
+
+> Note: The day of a command's execution can be specified by two fields -- day of month, and day of week.  If both fields are restricted (ie, are not *), the command will be run
+     when either field matches the current time.  For example, ``30 4 1,15 * 5'' would cause a command to be run at 4:30 am on the 1st and 15th of each month, plus every Friday.
+
 ## Contributing
 
 1. Fork it

data/lib/when-cron/cron/cron.rb

@@ -17,9 +17,16 @@ module When
 
       @minute == time.min &&
       @hour   == time.hour &&
-      @day    == time.day &&
       @month  == time.month &&
-      @wday   == time.wday
+      day_of_week_and_or_day_of_month?(time)
+    end
+
+    def day_of_week_and_or_day_of_month?(time)
+      if @day.wildcard? || @wday.wildcard?
+        @day == time.day && @wday == time.wday
+      else
+        @day == time.day || @wday == time.wday
+      end
     end
 
     private

data/lib/when-cron/cron/cron_part.rb

@@ -35,6 +35,10 @@ module When
       @part == int
     end
 
+    def wildcard?
+      @part.kind_of? Wildcard
+    end
+
     private
 
     def parse(cron_part)

data/spec/lib/when/cron/cron_part_spec.rb

@@ -158,4 +158,22 @@ describe CronPart do
       end
     end
   end
+
+  describe '#wildcard?' do
+    context 'part is a wildcard' do
+      let(:cron_part) { CronPart.new('*') }
+
+      it 'returns true' do
+        expect(cron_part.wildcard?).to eq true
+      end
+    end
+
+    context 'part is not a wildcard' do
+      let(:cron_part) { CronPart.new('1') }
+
+      it 'returns false' do
+        expect(cron_part.wildcard?).to eq false
+      end
+    end
+  end
 end

data/spec/lib/when/cron/cron_spec.rb

@@ -3,6 +3,10 @@ include When
 
 describe Cron do
   let(:now) { Time.new(2013, 6, 15, 12, 30, 30) }
+  let(:hour_earlier)  { now - 3600 }
+  let(:day_earlier)   { now - 3600 * 24 }
+  let(:week_earlier)  { now - 3600 * 24 * 7 }
+  let(:month_earlier) { now - 3600 * 24 * 31 }
 
   describe '.valid?' do
     it 'returns false for strings it cannot interpret' do
@@ -31,23 +35,92 @@ describe Cron do
   describe '#==' do
     context 'simple cron' do
       let(:cron) { Cron.new('30 12 15 6 6') }
+
       it 'returns true for now' do
         expect(cron == now).to eq true
       end
 
       it 'returns false for an hour earlier' do
-        expect(cron == now - 3600).to eq false
+        expect(cron == hour_earlier).to eq false
+      end
+
+      it 'returns true a week earlier' do
+        expect(cron == week_earlier).to eq true
+      end
+
+    end
+
+    context 'day of week and day of month' do
+      context 'day of week is wildcard' do
+        let(:cron) { Cron.new('30 12 15 * *') }
+
+        it 'returns true for now' do
+          expect(cron == now).to eq true
+        end
+
+        it 'returns false for an hour earlier' do
+          expect(cron == hour_earlier).to eq false
+        end
+
+        it 'returns false a week earlier' do
+          expect(cron == week_earlier).to eq false
+        end
+
+        it 'returns true a month earlier' do
+          expect(cron == month_earlier).to eq true
+        end
+      end
+
+      context 'day of month is wildcard' do
+        let(:cron) { Cron.new('30 12 * * 6') }
+
+        it 'returns true for now' do
+          expect(cron == now).to eq true
+        end
+
+        it 'returns false for an hour earlier' do
+          expect(cron == hour_earlier).to eq false
+        end
+
+        it 'returns true a week earlier' do
+          expect(cron == week_earlier).to eq true
+        end
+
+        it 'returns false a month earlier' do
+          expect(cron == month_earlier).to eq false
+        end
+      end
+
+      context 'neither is wildcard' do
+        let(:cron) { Cron.new('30 12 15 * 6') }
+
+        it 'returns true for now' do
+          expect(cron == now).to eq true
+        end
+
+        it 'returns false for an hour earlier' do
+          expect(cron == hour_earlier).to eq false
+        end
+
+        it 'returns true a week earlier' do
+          expect(cron == week_earlier).to eq true
+        end
+
+        it 'returns true a month earlier' do
+          expect(cron == month_earlier).to eq true
+        end
       end
     end
 
     context 'complex cron' do
       let(:cron) { Cron.new('25-35/5 */12 */5 4-8/2 6') }
+
       it 'returns true for now' do
         expect(cron == now).to eq true
       end
 
       it 'returns false for an hour earlier' do
-        expect(cron == now - 3600).to eq false
+        expect(cron == hour_earlier).to eq false
       end
     end
 
@@ -59,7 +132,7 @@ describe Cron do
       end
 
       it 'returns false for a day earlier' do
-        expect(cron == now - 3600 * 24).to eq false
+        expect(cron == day_earlier).to eq false
       end
     end
   end

data/when-cron.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "when-cron"
-  spec.version       = '1.0.2'
+  spec.version       = '1.0.3'
   spec.authors       = ["TH"]
   spec.email         = ["tylerhartland7@gmail.com"]
   spec.description   = %q{A basic cron implementation.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: when-cron
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - TH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic cron implementation.
@@ -148,3 +148,4 @@ test_files:
 - spec/lib/when/cron/wildcard_spec.rb
 - spec/lib/when_spec.rb
 - spec/spec_helper.rb
+has_rdoc: