Merge pull request #250 from rranelli/remove-require-spec-helper

jdantonio · jdantonio · commit 2d2b36466944 · 2015-02-24T22:39:02.000-05:00
Remove unnecessary `require 'spec_helper'`
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--require spec_helper
+--format progress
diff --git a/spec/concurrent/actor_spec.rb b/spec/concurrent/actor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'concurrent/actor'
 
 module Concurrent
diff --git a/spec/concurrent/agent_spec.rb b/spec/concurrent/agent_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'dereferenceable_shared'
 require_relative 'observable_shared'
 
diff --git a/spec/concurrent/async_spec.rb b/spec/concurrent/async_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Async do
diff --git a/spec/concurrent/atomic/atomic_boolean_spec.rb b/spec/concurrent/atomic/atomic_boolean_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :atomic_boolean do
 
   describe 'construction' do
diff --git a/spec/concurrent/atomic/atomic_fixnum_spec.rb b/spec/concurrent/atomic/atomic_fixnum_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :atomic_fixnum do
 
   context 'construction' do
diff --git a/spec/concurrent/atomic/condition_spec.rb b/spec/concurrent/atomic/condition_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Condition do
diff --git a/spec/concurrent/atomic/copy_on_notify_observer_set_spec.rb b/spec/concurrent/atomic/copy_on_notify_observer_set_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'observer_set_shared'
 
 module Concurrent
@@ -7,4 +6,4 @@ module Concurrent
     it_behaves_like 'an observer set'
   end
 
-end
+end
diff --git a/spec/concurrent/atomic/copy_on_write_observer_set_spec.rb b/spec/concurrent/atomic/copy_on_write_observer_set_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'observer_set_shared'
 
 module Concurrent
@@ -7,4 +6,4 @@ module Concurrent
     it_behaves_like 'an observer set'
   end
 
-end
+end
diff --git a/spec/concurrent/atomic/count_down_latch_spec.rb b/spec/concurrent/atomic/count_down_latch_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :count_down_latch do
 
   let(:latch) { described_class.new(3) }
diff --git a/spec/concurrent/atomic/cyclic_barrier_spec.rb b/spec/concurrent/atomic/cyclic_barrier_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe CyclicBarrier do
diff --git a/spec/concurrent/atomic/event_spec.rb b/spec/concurrent/atomic/event_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Event do
diff --git a/spec/concurrent/atomic/observer_set_shared.rb b/spec/concurrent/atomic/observer_set_shared.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples "an observer set" do
 
   let (:observer_set) { described_class.new }
diff --git a/spec/concurrent/atomic/semaphore_spec.rb b/spec/concurrent/atomic/semaphore_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :semaphore do
   let(:semaphore) { described_class.new(3) }
 
diff --git a/spec/concurrent/atomic/thread_local_var_spec.rb b/spec/concurrent/atomic/thread_local_var_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rbconfig'
 
 module Concurrent
diff --git a/spec/concurrent/atomic_spec.rb b/spec/concurrent/atomic_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :atomic do
 
   specify :test_construct do
diff --git a/spec/concurrent/channel/buffered_channel_spec.rb b/spec/concurrent/channel/buffered_channel_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe BufferedChannel do
diff --git a/spec/concurrent/channel/channel_spec.rb b/spec/concurrent/channel/channel_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Channel do
diff --git a/spec/concurrent/channel/probe_spec.rb b/spec/concurrent/channel/probe_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative '../observable_shared'
 
 module Concurrent
@@ -11,9 +10,9 @@ module Concurrent
     describe 'behavior' do
 
       # observable
-      
+
       subject{ Channel::Probe.new }
-      
+
       def trigger_observable(observable)
         observable.set('value')
       end
diff --git a/spec/concurrent/channel/unbuffered_channel_spec.rb b/spec/concurrent/channel/unbuffered_channel_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe UnbufferedChannel do
diff --git a/spec/concurrent/collection/blocking_ring_buffer_spec.rb b/spec/concurrent/collection/blocking_ring_buffer_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe BlockingRingBuffer do
diff --git a/spec/concurrent/collection/priority_queue_spec.rb b/spec/concurrent/collection/priority_queue_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :priority_queue do
 
   subject{ described_class.new }
diff --git a/spec/concurrent/collection/ring_buffer_spec.rb b/spec/concurrent/collection/ring_buffer_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe RingBuffer do
diff --git a/spec/concurrent/configuration_spec.rb b/spec/concurrent/configuration_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Configuration do
diff --git a/spec/concurrent/dataflow_spec.rb b/spec/concurrent/dataflow_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe 'dataflow' do
@@ -233,7 +231,7 @@ def fib_with_dot(n)
         sleep(0.1)
         expect(expected.value).to eq 13
       end
-      
+
     end
   end
 end
diff --git a/spec/concurrent/delay_spec.rb b/spec/concurrent/delay_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'dereferenceable_shared'
 require_relative 'obligation_shared'
 
diff --git a/spec/concurrent/dereferenceable_shared.rb b/spec/concurrent/dereferenceable_shared.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :dereferenceable do
 
   it 'defaults :dup_on_deref to false' do
diff --git a/spec/concurrent/exchanger_spec.rb b/spec/concurrent/exchanger_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe Exchanger do
diff --git a/spec/concurrent/executor/cached_thread_pool_shared.rb b/spec/concurrent/executor/cached_thread_pool_shared.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'thread_pool_shared'
 
 shared_examples :cached_thread_pool do
diff --git a/spec/concurrent/executor/executor_service_shared.rb b/spec/concurrent/executor/executor_service_shared.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'global_thread_pool_shared'
 
 shared_examples :executor_service do
diff --git a/spec/concurrent/executor/fixed_thread_pool_shared.rb b/spec/concurrent/executor/fixed_thread_pool_shared.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'thread_pool_shared'
 require 'thread'
 
diff --git a/spec/concurrent/executor/global_thread_pool_shared.rb b/spec/concurrent/executor/global_thread_pool_shared.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples :global_thread_pool do
 
   context '#post' do
diff --git a/spec/concurrent/executor/immediate_executor_spec.rb b/spec/concurrent/executor/immediate_executor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/indirect_immediate_executor_spec.rb b/spec/concurrent/executor/indirect_immediate_executor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/java_cached_thread_pool_spec.rb b/spec/concurrent/executor/java_cached_thread_pool_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if Concurrent::TestHelpers.jruby?
 
   require_relative 'cached_thread_pool_shared'
diff --git a/spec/concurrent/executor/java_fixed_thread_pool_spec.rb b/spec/concurrent/executor/java_fixed_thread_pool_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if Concurrent::TestHelpers.jruby?
 
   require_relative 'fixed_thread_pool_shared'
diff --git a/spec/concurrent/executor/java_single_thread_executor_spec.rb b/spec/concurrent/executor/java_single_thread_executor_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if Concurrent::TestHelpers.jruby?
 
   require_relative 'executor_service_shared'
diff --git a/spec/concurrent/executor/java_thread_pool_executor_spec.rb b/spec/concurrent/executor/java_thread_pool_executor_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 if Concurrent::TestHelpers.jruby?
 
   require_relative 'thread_pool_executor_shared'
diff --git a/spec/concurrent/executor/per_thread_executor_spec.rb b/spec/concurrent/executor/per_thread_executor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/ruby_cached_thread_pool_spec.rb b/spec/concurrent/executor/ruby_cached_thread_pool_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'cached_thread_pool_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/ruby_fixed_thread_pool_spec.rb b/spec/concurrent/executor/ruby_fixed_thread_pool_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'fixed_thread_pool_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/ruby_single_thread_executor_spec.rb b/spec/concurrent/executor/ruby_single_thread_executor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/ruby_thread_pool_executor_spec.rb b/spec/concurrent/executor/ruby_thread_pool_executor_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'thread_pool_executor_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/safe_task_executor_spec.rb b/spec/concurrent/executor/safe_task_executor_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe SafeTaskExecutor do
diff --git a/spec/concurrent/executor/serialized_execution_spec.rb b/spec/concurrent/executor/serialized_execution_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 module Concurrent
diff --git a/spec/concurrent/executor/thread_pool_class_cast_spec.rb b/spec/concurrent/executor/thread_pool_class_cast_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module Concurrent
 
   describe SingleThreadExecutor do
diff --git a/spec/concurrent/executor/thread_pool_executor_shared.rb b/spec/concurrent/executor/thread_pool_executor_shared.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'thread_pool_shared'
 
 shared_examples :thread_pool_executor do
@@ -174,7 +173,7 @@
       expect(subject.remaining_capacity).to eq expected_max
     end
   end
-  
+
   context '#fallback_policy' do
 
     let!(:min_threads){ 1 }
@@ -230,7 +229,7 @@
         all_tasks_posted = Concurrent::Event.new
 
         latch = Concurrent::CountDownLatch.new(max_threads)
-        
+
         initial_executed = Concurrent::AtomicFixnum.new(0)
         subsequent_executed = Concurrent::AtomicFixnum.new(0)
 
@@ -243,7 +242,7 @@
         # Wait for all those tasks to be taken off the queue onto a
         # worker thread and start executing
         latch.wait
-        
+
         # Fill up the queue (with a task that won't complete until
         # all tasks are posted)
         max_queue.times do
@@ -277,7 +276,7 @@
         all_tasks_posted = Concurrent::Event.new
 
         latch = Concurrent::CountDownLatch.new(max_threads)
-        
+
         initial_executed = Concurrent::AtomicFixnum.new(0)
         subsequent_executed = Concurrent::AtomicFixnum.new(0)
 
@@ -290,7 +289,7 @@
         # Wait for all those tasks to be taken off the queue onto a
         # worker thread and start executing
         latch.wait
-        
+
         # Fill up the queue (with a task that won't complete until
         # all tasks are posted)
         max_queue.times do
@@ -320,7 +319,7 @@
         expect(subsequent_executed.value).to be 0
       end
     end
-    
+
     context ':discard' do
 
       subject do
@@ -337,7 +336,7 @@
         all_tasks_posted = Concurrent::Event.new
 
         latch = Concurrent::CountDownLatch.new(max_threads)
-        
+
         initial_executed = Concurrent::AtomicFixnum.new(0)
         subsequent_executed = Concurrent::AtomicFixnum.new(0)
 
@@ -350,7 +349,7 @@
         # Wait for all those tasks to be taken off the queue onto a
         # worker thread and start executing
         latch.wait
-        
+
         # Fill up the queue (with a task that won't complete until
         # all tasks are posted)
         max_queue.times do
@@ -382,7 +381,7 @@
         all_tasks_posted = Concurrent::Event.new
 
         latch = Concurrent::CountDownLatch.new(max_threads)
-        
+
         initial_executed = Concurrent::AtomicFixnum.new(0)
         subsequent_executed = Concurrent::AtomicFixnum.new(0)
 
@@ -395,7 +394,7 @@
         # Wait for all those tasks to be taken off the queue onto a
         # worker thread and start executing
         latch.wait
-        
+
         # Fill up the queue (with a task that won't complete until
         # all tasks are posted)
         max_queue.times do
@@ -475,7 +474,7 @@
         Thread.new do
           5.times{ subject.post{ trigger.wait } }
         end
-        
+
         expect(Thread.list.length).to be < initial + 1 + 5
 
         # Let the executor tasks complete.
diff --git a/spec/concurrent/executor/thread_pool_shared.rb b/spec/concurrent/executor/thread_pool_shared.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require_relative 'executor_service_shared'
 
 shared_examples :thread_pool do
diff --git a/spec/concurrent/executor/timer_set_spec.rb b/spec/concurrent/executor/timer_set_spec.rb
diff --git a/spec/concurrent/future_spec.rb b/spec/concurrent/future_spec.rb
diff --git a/spec/concurrent/ivar_spec.rb b/spec/concurrent/ivar_spec.rb
diff --git a/spec/concurrent/lazy_register_spec.rb b/spec/concurrent/lazy_register_spec.rb
diff --git a/spec/concurrent/mvar_spec.rb b/spec/concurrent/mvar_spec.rb
diff --git a/spec/concurrent/obligation_shared.rb b/spec/concurrent/obligation_shared.rb
diff --git a/spec/concurrent/obligation_spec.rb b/spec/concurrent/obligation_spec.rb
diff --git a/spec/concurrent/observable_shared.rb b/spec/concurrent/observable_shared.rb
diff --git a/spec/concurrent/observable_spec.rb b/spec/concurrent/observable_spec.rb
diff --git a/spec/concurrent/options_parser_spec.rb b/spec/concurrent/options_parser_spec.rb
diff --git a/spec/concurrent/promise_spec.rb b/spec/concurrent/promise_spec.rb
diff --git a/spec/concurrent/scheduled_task_spec.rb b/spec/concurrent/scheduled_task_spec.rb
diff --git a/spec/concurrent/thread_arguments_shared.rb b/spec/concurrent/thread_arguments_shared.rb
diff --git a/spec/concurrent/timer_task_spec.rb b/spec/concurrent/timer_task_spec.rb
diff --git a/spec/concurrent/tvar_spec.rb b/spec/concurrent/tvar_spec.rb
diff --git a/spec/concurrent/utility/processor_count_spec.rb b/spec/concurrent/utility/processor_count_spec.rb
diff --git a/spec/concurrent/utility/timeout_spec.rb b/spec/concurrent/utility/timeout_spec.rb
diff --git a/spec/concurrent/utility/timer_spec.rb b/spec/concurrent/utility/timer_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--require spec_helper`
	`2`	`+--format progress`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`	`1`	`require 'concurrent/actor'`
`3`	`2`
`4`	`3`	`module Concurrent`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`	`1`	`require_relative 'dereferenceable_shared'`
`3`	`2`	`require_relative 'observable_shared'`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`module Concurrent`
`4`	`2`
`5`	`3`	`describe Async do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`shared_examples :atomic_boolean do`
`4`	`2`
`5`	`3`	`describe 'construction' do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`shared_examples :atomic_fixnum do`
`4`	`2`
`5`	`3`	`context 'construction' do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`shared_examples :count_down_latch do`
`4`	`2`
`5`	`3`	`let(:latch) { described_class.new(3) }`