Fix warnings for shadowed variables

Author: avit

lib/ice_cube/schedule.rb

@@ -446,12 +446,12 @@ def enumerate_occurrences(opening_time, closing_time = nil, options = {})
     # Get the next time after (or including) a specific time
     def next_time(time, closing_time)
       loop do
-        min_time = recurrence_rules_with_implicit_start_occurrence.reduce(nil) do |min_time, rule|
+        min_time = recurrence_rules_with_implicit_start_occurrence.reduce(nil) do |best_time, rule|
           begin
-            new_time = rule.next_time(time, start_time, min_time || closing_time)
-            [min_time, new_time].compact.min
+            new_time = rule.next_time(time, start_time, best_time || closing_time)
+            [best_time, new_time].compact.min
           rescue StopIteration
-            min_time
+            best_time
           end
         end
         break unless min_time

spec/examples/active_support_spec.rb

@@ -129,8 +129,8 @@ module IceCube
 
       it "uses schedule zone for occurrences_between with a rule terminated by #count" do
         utc = Time.utc(2013, 1, 1).in_time_zone('UTC')
-        s = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily.count(3) }
-        occurrences_between = s.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
+        schedule = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily.count(3) }
+        occurrences_between = schedule.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
         expect(occurrences_between).to eq([Time.utc(2013, 1, 1), Time.utc(2013, 1, 2)])
         occurrences_between.each do |t|
           expect(t.time_zone).to eq(schedule.start_time.time_zone)
@@ -139,8 +139,8 @@ module IceCube
 
       it "uses schedule zone for occurrences_between with a rule terminated by #until" do
         utc = Time.utc(2013, 1, 1).in_time_zone('UTC')
-        s = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily.until(utc.advance(:days => 3)) }
-        occurrences_between = s.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
+        schedule = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily.until(utc.advance(:days => 3)) }
+        occurrences_between = schedule.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
         expect(occurrences_between).to eq([Time.utc(2013, 1, 1), Time.utc(2013, 1, 2)])
         occurrences_between.each do |t|
           expect(t.time_zone).to eq(schedule.start_time.time_zone)
@@ -149,8 +149,8 @@ module IceCube
 
       it "uses schedule zone for occurrences_between with an unterminated rule" do
         utc = Time.utc(2013, 1, 1).in_time_zone('UTC')
-        s = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily }
-        occurrences_between = s.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
+        schedule = Schedule.new(utc) { |s| s.add_recurrence_rule Rule.daily }
+        occurrences_between = schedule.occurrences_between(reference_time, reference_time + IceCube::ONE_DAY)
         expect(occurrences_between).to eq([Time.utc(2013, 1, 1), Time.utc(2013, 1, 2)])
         occurrences_between.each do |t|
           expect(t.time_zone).to eq(schedule.start_time.time_zone)

spec/examples/regression_spec.rb

@@ -168,9 +168,9 @@ module IceCube
         it 'should exclude a date from a weekly schedule [#55]' do
           Time.zone = 'Eastern Time (US & Canada)'
           t0 = Time.zone.local(2011, 12, 27, 14)
-          schedule = Schedule.new(t0) do |schedule|
-            schedule.add_recurrence_rule Rule.weekly.day(:tuesday, :thursday)
-            schedule.add_exception_time t0
+          schedule = Schedule.new(t0) do |s|
+            s.add_recurrence_rule Rule.weekly.day(:tuesday, :thursday)
+            s.add_exception_time t0
           end
           expect(schedule.first).to eq(Time.zone.local(2011, 12, 29, 14))
         end