More cleanup, removal of extraneous includes.

SpeciesFileGroup · Apr 27, 2015 · 7b13938 · 7b13938
1 parent fe4cb1c
commit 7b13938
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/lib/taxonifi.rb b/lib/taxonifi.rb
@@ -29,9 +29,9 @@ module Taxonifi
       variety
   }
 
-  require File.expand_path(File.join(File.dirname(__FILE__), 'splitter/splitter'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'assessor/assessor'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'export/export'))
+ require File.expand_path(File.join(File.dirname(__FILE__), 'splitter/splitter'))
+ require File.expand_path(File.join(File.dirname(__FILE__), 'assessor/assessor'))
+ require File.expand_path(File.join(File.dirname(__FILE__), 'export/export'))
 
   # TODO use **/*.rb syntax
   %w{model utils lumper}.each do |dir|

diff --git a/test/helper.rb b/test/helper.rb
@@ -1,25 +1,30 @@
 require 'rubygems'
-require 'bundler'
-require 'byebug'
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/taxonifi'))
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
 
+require 'bundler/setup'
+Bundler.setup
+
+require 'byebug'
 require 'test/unit'
+
+# require File.expand_path(File.join(File.dirname(__FILE__), '../lib/taxonifi.rb'))
+
+# begin
+#   Bundler.setup(:default, :development)
+# rescue Bundler::BundlerError => e
+#   $stderr.puts e.message
+#   $stderr.puts "Run `bundle install` to install missing gems"
+#   exit e.status_code
+# end
+
+
 #require 'shoulda'
 
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-class Test::Unit::TestCase
-end
+# class Test::Unit::TestCase
+# end
 
 # TODO: rename to reflect format
 def generic_csv_with_names