cleanup require's

lib/command_line_reporter.rb

@@ -1,7 +1,12 @@
 require 'stringio'
-require 'table'
 
-Dir.glob(File.join(File.dirname(__FILE__), 'command_line_reporter', 'formatter', '*.rb')).each {|r| require r}
+require 'command_line_reporter/options_validator'
+require 'command_line_reporter/formatter/progress'
+require 'command_line_reporter/formatter/nested'
+require 'command_line_reporter/row'
+require 'command_line_reporter/column'
+require 'command_line_reporter/table'
+require 'command_line_reporter/version'
 
 module CommandLineReporter
   include OptionsValidator

lib/command_line_reporter/column.rb

@@ -1,4 +1,3 @@
-require 'options_validator'
 require 'colored'
 
 module CommandLineReporter

lib/command_line_reporter/formatter/nested.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'options_validator'
 require 'colored'
 
 module CommandLineReporter

lib/command_line_reporter/formatter/progress.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'options_validator'
 require 'colored'
 
 module CommandLineReporter

lib/command_line_reporter/row.rb

@@ -1,6 +1,3 @@
-require 'column'
-require 'options_validator'
-
 module CommandLineReporter
   class Row
     include OptionsValidator

lib/command_line_reporter/table.rb

@@ -1,6 +1,3 @@
-require 'row'
-require 'options_validator'
-
 module CommandLineReporter
   class Table
     include OptionsValidator

spec/column_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'column'
 
 describe CommandLineReporter::Column do
   describe '#initialize' do

spec/command_line_reporter_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'command_line_reporter'
 
 describe CommandLineReporter do
   let :use_class do

spec/nested_formatter_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'nested_formatter'
 
 describe CommandLineReporter::NestedFormatter do
   subject { CommandLineReporter::NestedFormatter.instance }

spec/options_validator_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'options_validator'
 
 describe OptionsValidator do
   subject { Class.new.extend(OptionsValidator) }

spec/progress_formatter_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'progress_formatter'
 
 describe CommandLineReporter::ProgressFormatter do
   subject { CommandLineReporter::ProgressFormatter.instance }

spec/row_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'row'
 
 describe CommandLineReporter::Row do
   let(:cols) { 10.times.map {|v| CommandLineReporter::Column.new("test#{v}")} }

spec/spec_helper.rb

@@ -1,4 +1,6 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Dir[File.dirname(__FILE__) + "../lib/*.rb"].each {|f| require f}
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+require 'command_line_reporter'
+
+require_relative 'support/helpers/stdout'
+require_relative 'support/matchers/argument'

spec/table_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'table'
 
 describe CommandLineReporter::Table do
   context 'creation' do