ice_cube 0.7.5 → 0.7.6

data/lib/ice_cube/schedule.rb

@@ -125,9 +125,7 @@ module IceCube
 
     # All of the occurrences
     def all_occurrences
-      unless end_time || recurrence_rules.all?(&:terminating?)
-        raise ArgumentError.new('Rule must specify either an until date or a count to use #all_occurrences')
-      end
+      raise ArgumentError.new('Rule must specify either an until date or a count to use #all_occurrences') unless terminating?
       find_occurrences(start_time)
     end
 
@@ -180,6 +178,43 @@ module IceCube
       end
     end
 
+    # Determine if this schedule conflicts with another schedule
+    # @param [IceCube::Schedule] other_schedule - The schedule to compare to
+    # @param [Time] closing_time - the last time to consider
+    # @return [Boolean] whether or not the schedules conflict at all
+    def conflicts_with?(other_schedule, closing_time = nil)
+      unless terminating? || other_schedule.terminating? || closing_time
+        raise ArgumentError.new 'At least one schedule must be terminating to use #conflicts_with?'
+      end
+      # Pick the terminating schedule, and other schedule
+      # No need to reverse if terminating? or there is a closing time
+      terminating_schedule = self
+      unless terminating? || closing_time
+        terminating_schedule, other_schedule = other_schedule, terminating_schedule
+      end
+      # Go through each occurrence of the terminating schedule and determine
+      # if the other occurs at that time
+      last_time = nil
+      terminating_schedule.each_occurrence do |time|
+        if closing_time && time > closing_time
+          last_time = closing_time
+          break
+        end
+        last_time = time
+        return true if other_schedule.occurring_at?(time)
+      end
+      # Due to durations, we need to walk up to the end time, and verify in the
+      # other direction
+      if last_time
+        other_schedule.each_occurrence do |time|
+          break if time > last_time
+          return true if terminating_schedule.occurring_at?(time)
+        end
+      end
+      # No conflict, return false
+      false
+    end
+
     # Determine if the schedule occurs at a specific time
     def occurs_at?(time)
       occurs_between?(time, time)
@@ -261,6 +296,12 @@ module IceCube
       schedule
     end
 
+    # Determine if the schedule will end
+    # @return [Boolean] true if ending, false if repeating forever
+    def terminating?
+      end_time || recurrence_rules.all?(&:terminating?)
+    end
+
     private
 
     # Reset all rules for another run

data/lib/ice_cube/version.rb

@@ -1,5 +1,5 @@
 module IceCube
 
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2012-01-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240051831480 !ruby/object:Gem::Requirement
+  requirement: &20210700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240051831480
+  version_requirements: *20210700
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70240051830160 !ruby/object:Gem::Requirement
+  requirement: &20210140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70240051830160
+  version_requirements: *20210140
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70240051829120 !ruby/object:Gem::Requirement
+  requirement: &20209560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240051829120
+  version_requirements: *20209560
 description: ice_cube is a recurring date library for Ruby.  It allows for quick,
   programatic expansion of recurring date rules.
 email: john@crepezzi.com
@@ -51,43 +51,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ice_cube/builders/hash_builder.rb
-- lib/ice_cube/builders/ical_builder.rb
-- lib/ice_cube/builders/string_builder.rb
-- lib/ice_cube/errors/count_exceeded.rb
-- lib/ice_cube/errors/until_exceeded.rb
-- lib/ice_cube/rule.rb
-- lib/ice_cube/rules/daily_rule.rb
-- lib/ice_cube/rules/hourly_rule.rb
-- lib/ice_cube/rules/minutely_rule.rb
-- lib/ice_cube/rules/monthly_rule.rb
-- lib/ice_cube/rules/secondly_rule.rb
-- lib/ice_cube/rules/weekly_rule.rb
-- lib/ice_cube/rules/yearly_rule.rb
-- lib/ice_cube/schedule.rb
 - lib/ice_cube/single_occurrence_rule.rb
+- lib/ice_cube/schedule.rb
+- lib/ice_cube/version.rb
 - lib/ice_cube/time_util.rb
-- lib/ice_cube/validated_rule.rb
-- lib/ice_cube/validations/count.rb
-- lib/ice_cube/validations/daily_interval.rb
-- lib/ice_cube/validations/day.rb
-- lib/ice_cube/validations/day_of_month.rb
+- lib/ice_cube/validations/minute_of_hour.rb
+- lib/ice_cube/validations/secondly_interval.rb
 - lib/ice_cube/validations/day_of_week.rb
-- lib/ice_cube/validations/day_of_year.rb
-- lib/ice_cube/validations/hour_of_day.rb
 - lib/ice_cube/validations/hourly_interval.rb
-- lib/ice_cube/validations/lock.rb
-- lib/ice_cube/validations/minute_of_hour.rb
 - lib/ice_cube/validations/minutely_interval.rb
+- lib/ice_cube/validations/lock.rb
 - lib/ice_cube/validations/month_of_year.rb
-- lib/ice_cube/validations/monthly_interval.rb
+- lib/ice_cube/validations/yearly_interval.rb
 - lib/ice_cube/validations/schedule_lock.rb
-- lib/ice_cube/validations/second_of_minute.rb
-- lib/ice_cube/validations/secondly_interval.rb
+- lib/ice_cube/validations/hour_of_day.rb
 - lib/ice_cube/validations/until.rb
+- lib/ice_cube/validations/monthly_interval.rb
+- lib/ice_cube/validations/day_of_year.rb
+- lib/ice_cube/validations/day_of_month.rb
+- lib/ice_cube/validations/second_of_minute.rb
 - lib/ice_cube/validations/weekly_interval.rb
-- lib/ice_cube/validations/yearly_interval.rb
-- lib/ice_cube/version.rb
+- lib/ice_cube/validations/daily_interval.rb
+- lib/ice_cube/validations/count.rb
+- lib/ice_cube/validations/day.rb
+- lib/ice_cube/rules/hourly_rule.rb
+- lib/ice_cube/rules/minutely_rule.rb
+- lib/ice_cube/rules/yearly_rule.rb
+- lib/ice_cube/rules/secondly_rule.rb
+- lib/ice_cube/rules/weekly_rule.rb
+- lib/ice_cube/rules/daily_rule.rb
+- lib/ice_cube/rules/monthly_rule.rb
+- lib/ice_cube/errors/until_exceeded.rb
+- lib/ice_cube/errors/count_exceeded.rb
+- lib/ice_cube/rule.rb
+- lib/ice_cube/validated_rule.rb
+- lib/ice_cube/builders/ical_builder.rb
+- lib/ice_cube/builders/string_builder.rb
+- lib/ice_cube/builders/hash_builder.rb
 - lib/ice_cube.rb
 - spec/spec_helper.rb
 homepage: http://seejohnrun.github.com/ice_cube/