lib/require_smasher.rb in require_smasher-0.3.1 vs lib/require_smasher.rb in require_smasher-0.3.2

@@ -1,35 +1,40 @@
 require 'require_smasher/version'
-require 'require_smasher/require_gem'
+require 'require_smasher/file_smasher'
+require 'require_smasher/classifier'
 require 'require_smasher/require_file'
-require 'require_smasher/require_all'
 
 def require_all(*required_list)
-  RequireAll.req(required_list)
+  classified = Classifier.classify(required_list)
+  gems = classified[:gems]
+  files = classified[:files]
+
+  gems.uniq.each { |gem| require gem } unless gems.empty?
+  RequireFile.require(files) unless files.empty?
 end
 
-def require_gem(gems)
-  return RequireGem.req([gems]) if gems.instance_of?(String)
-  RequireGem.req(gems)
+def require_gem(gem)
+  require gem
+  gem
 end
 
-def require_dir(directories)
-  return RequireFile.require_directories([directories]) if directories.instance_of?(String)
-  RequireFile.require_directories(directories)
+def require_dir(directory)
+  RequireFile.require_directories([directory])
 end
 
-def require_file(files)
-  return RequireFile.require_files([files]) if files.instance_of?(String)
-  RequireFile.require_files(files)
+def require_file(file)
+  require_relative File.expand_path("./#{file}")
+  nil
 end
 
 def require_dirs(*directories)
-  require_dir(directories)
+  RequireFile.require_directories(directories)
 end
 
 def require_gems(*gems)
-  require_gem(gems)
+  raise StandardError, 'Gem was not informed' if gems.empty?
+  gems.uniq.each { |gem| require gem }
 end
 
 def require_files(*files)
-  require_file(files)
+  RequireFile.require(files)
 end