Merge pull request #17 from jfelchner/bug/constants-set-multiple-times

Convert require_relative to regular requires

Author: rrrene

lib/inch.rb

@@ -5,12 +5,12 @@ module Inch
 
 require 'forwardable'
 
-require_relative 'inch/api'
-require_relative 'inch/core_ext'
-require_relative 'inch/codebase'
-require_relative 'inch/code_object'
-require_relative 'inch/evaluation'
-require_relative 'inch/cli'
+require 'inch/api'
+require 'inch/core_ext'
+require 'inch/codebase'
+require 'inch/code_object'
+require 'inch/evaluation'
+require 'inch/cli'
 
-require_relative 'inch/config'
+require 'inch/config'
 require File.join(File.dirname(__FILE__), '..', 'config', 'defaults.rb')

lib/inch/api.rb

@@ -23,14 +23,14 @@ module API
   end
 end
 
-require_relative 'api/options/base'
-require_relative 'api/options/filter'
-require_relative 'api/options/suggest'
+require 'inch/api/options/base'
+require 'inch/api/options/filter'
+require 'inch/api/options/suggest'
 
-require_relative 'api/compare'
-require_relative 'api/filter'
-require_relative 'api/get'
-require_relative 'api/list'
-require_relative 'api/suggest'
-require_relative 'api/stats'
-require_relative 'api/diff'
+require 'inch/api/compare'
+require 'inch/api/filter'
+require 'inch/api/get'
+require 'inch/api/list'
+require 'inch/api/suggest'
+require 'inch/api/stats'
+require 'inch/api/diff'

lib/inch/api/compare.rb

@@ -1,2 +1,2 @@
-require_relative 'compare/code_objects'
-require_relative 'compare/codebases'
+require 'inch/api/compare/code_objects'
+require 'inch/api/compare/codebases'

lib/inch/cli.rb

@@ -21,9 +21,9 @@ def get_term_columns(default = 80)
   end
 end
 
-require_relative 'cli/arguments'
-require_relative 'cli/sparkline_helper'
-require_relative 'cli/trace_helper'
-require_relative 'cli/yardopts_helper'
+require 'inch/cli/arguments'
+require 'inch/cli/sparkline_helper'
+require 'inch/cli/trace_helper'
+require 'inch/cli/yardopts_helper'
 
-require_relative 'cli/command'
+require 'inch/cli/command'

lib/inch/cli/command.rb

@@ -1,19 +1,19 @@
-require_relative 'command/base'
-require_relative 'command/base_list'
-require_relative 'command/base_object'
+require 'inch/cli/command/base'
+require 'inch/cli/command/base_list'
+require 'inch/cli/command/base_object'
 
-require_relative 'command/options/base'
-require_relative 'command/options/base_list'
-require_relative 'command/options/base_object'
+require 'inch/cli/command/options/base'
+require 'inch/cli/command/options/base_list'
+require 'inch/cli/command/options/base_object'
 
-require_relative 'command/output/base'
+require 'inch/cli/command/output/base'
 
-require_relative 'command_parser'
+require 'inch/cli/command_parser'
 
-require_relative 'command/list'
-require_relative 'command/show'
-require_relative 'command/stats'
-require_relative 'command/suggest'
-require_relative 'command/console'
-require_relative 'command/inspect'
-require_relative 'command/diff'
+require 'inch/cli/command/list'
+require 'inch/cli/command/show'
+require 'inch/cli/command/stats'
+require 'inch/cli/command/suggest'
+require 'inch/cli/command/console'
+require 'inch/cli/command/inspect'
+require 'inch/cli/command/diff'

lib/inch/cli/command/console.rb

@@ -1,6 +1,6 @@
 require 'pry'
-require_relative 'options/console'
-require_relative 'output/console'
+require 'inch/cli/command/options/console'
+require 'inch/cli/command/output/console'
 
 module Inch
   module CLI

lib/inch/cli/command/diff.rb

@@ -1,6 +1,6 @@
 require 'pry'
-require_relative 'options/diff'
-require_relative 'output/diff'
+require 'inch/cli/command/options/diff'
+require 'inch/cli/command/output/diff'
 
 module Inch
   module CLI

lib/inch/cli/command/inspect.rb

@@ -1,5 +1,5 @@
-require_relative 'options/inspect'
-require_relative 'output/inspect'
+require 'inch/cli/command/options/inspect'
+require 'inch/cli/command/output/inspect'
 
 module Inch
   module CLI

lib/inch/cli/command/list.rb

@@ -1,5 +1,5 @@
-require_relative 'options/list'
-require_relative 'output/list'
+require 'inch/cli/command/options/list'
+require 'inch/cli/command/output/list'
 
 module Inch
   module CLI

lib/inch/cli/command/show.rb

@@ -1,5 +1,5 @@
-require_relative 'options/show'
-require_relative 'output/show'
+require 'inch/cli/command/options/show'
+require 'inch/cli/command/output/show'
 
 module Inch
   module CLI

lib/inch/cli/command/stats.rb

@@ -1,5 +1,5 @@
-require_relative 'options/stats'
-require_relative 'output/stats'
+require 'inch/cli/command/options/stats'
+require 'inch/cli/command/output/stats'
 
 module Inch
   module CLI

lib/inch/cli/command/suggest.rb

@@ -1,5 +1,5 @@
-require_relative 'options/suggest'
-require_relative 'output/suggest'
+require 'inch/cli/command/options/suggest'
+require 'inch/cli/command/output/suggest'
 
 module Inch
   module CLI

lib/inch/code_object.rb

@@ -3,6 +3,6 @@ module CodeObject
   end
 end
 
-require_relative 'code_object/converter'
-require_relative 'code_object/provider'
-require_relative 'code_object/proxy'
+require 'inch/code_object/converter'
+require 'inch/code_object/provider'
+require 'inch/code_object/proxy'

lib/inch/code_object/provider.rb

@@ -33,4 +33,4 @@ def self.provider_for(type)
   end
 end
 
-require_relative 'provider/yard'
+require 'inch/code_object/provider/yard'

lib/inch/code_object/provider/yard.rb

@@ -51,7 +51,7 @@ def self.parse(dir, config = Inch::Config.codebase)
 
 log.level = ::Logger::UNKNOWN # basically disable YARD's logging
 
-require_relative 'yard/parser'
-require_relative 'yard/docstring'
-require_relative 'yard/nodoc_helper'
-require_relative 'yard/object'
+require 'inch/code_object/provider/yard/parser'
+require 'inch/code_object/provider/yard/docstring'
+require 'inch/code_object/provider/yard/nodoc_helper'
+require 'inch/code_object/provider/yard/object'

lib/inch/code_object/provider/yard/object.rb

@@ -50,10 +50,10 @@ def cache_key(yard_object)
   end
 end
 
-require_relative 'object/base'
-require_relative 'object/namespace_object'
-require_relative 'object/class_object'
-require_relative 'object/constant_object'
-require_relative 'object/method_object'
-require_relative 'object/method_parameter_object'
-require_relative 'object/module_object'
+require 'inch/code_object/provider/yard/object/base'
+require 'inch/code_object/provider/yard/object/namespace_object'
+require 'inch/code_object/provider/yard/object/class_object'
+require 'inch/code_object/provider/yard/object/constant_object'
+require 'inch/code_object/provider/yard/object/method_object'
+require 'inch/code_object/provider/yard/object/method_parameter_object'
+require 'inch/code_object/provider/yard/object/module_object'

lib/inch/code_object/provider/yard/object/method_object.rb

@@ -1,4 +1,4 @@
-require_relative 'method_signature'
+require 'inch/code_object/provider/yard/object/method_signature'
 
 module Inch
   module CodeObject

lib/inch/code_object/proxy.rb

@@ -29,10 +29,10 @@ def class_for(code_object)
   end
 end
 
-require_relative 'proxy/base'
-require_relative 'proxy/namespace_object'
-require_relative 'proxy/class_object'
-require_relative 'proxy/constant_object'
-require_relative 'proxy/method_object'
-require_relative 'proxy/method_parameter_object'
-require_relative 'proxy/module_object'
+require 'inch/code_object/proxy/base'
+require 'inch/code_object/proxy/namespace_object'
+require 'inch/code_object/proxy/class_object'
+require 'inch/code_object/proxy/constant_object'
+require 'inch/code_object/proxy/method_object'
+require 'inch/code_object/proxy/method_parameter_object'
+require 'inch/code_object/proxy/module_object'

lib/inch/codebase.rb

@@ -15,8 +15,8 @@ def self.parse(dir, config = nil)
   end
 end
 
-require_relative 'codebase/proxy'
-require_relative 'codebase/objects'
-require_relative 'codebase/objects_filter'
-require_relative 'codebase/serializer'
+require 'inch/codebase/proxy'
+require 'inch/codebase/objects'
+require 'inch/codebase/objects_filter'
+require 'inch/codebase/serializer'
 

lib/inch/config.rb

@@ -20,5 +20,5 @@ def run(&block)
   end
 end
 
-require_relative 'config/base'
-require_relative 'config/codebase'
+require 'inch/config/base'
+require 'inch/config/codebase'

lib/inch/core_ext.rb

@@ -1 +1 @@
-require_relative 'core_ext/string'
+require 'inch/core_ext/string'

lib/inch/evaluation.rb

@@ -15,20 +15,20 @@ def self.class_for(code_object)
   end
 end
 
-require_relative 'utils/read_write_methods'
+require 'inch/utils/read_write_methods'
 
-require_relative 'evaluation/file'
-require_relative 'evaluation/grade'
-require_relative 'evaluation/grade_list'
-require_relative 'evaluation/object_schema'
-require_relative 'evaluation/priority_range'
+require 'inch/evaluation/file'
+require 'inch/evaluation/grade'
+require 'inch/evaluation/grade_list'
+require 'inch/evaluation/object_schema'
+require 'inch/evaluation/priority_range'
 
-require_relative 'evaluation/role/base'
-require_relative 'evaluation/role/missing'
-require_relative 'evaluation/role/object'
-require_relative 'evaluation/role/method'
-require_relative 'evaluation/role/method_parameter'
-require_relative 'evaluation/role/namespace'
-require_relative 'evaluation/role/constant'
+require 'inch/evaluation/role/base'
+require 'inch/evaluation/role/missing'
+require 'inch/evaluation/role/object'
+require 'inch/evaluation/role/method'
+require 'inch/evaluation/role/method_parameter'
+require 'inch/evaluation/role/namespace'
+require 'inch/evaluation/role/constant'
 
-require_relative 'evaluation/proxy'
+require 'inch/evaluation/proxy'

lib/inch/evaluation/proxy.rb

@@ -17,9 +17,9 @@ def self.class_for(code_object)
   end
 end
 
-require_relative 'proxy/base'
-require_relative 'proxy/namespace_object'
-require_relative 'proxy/class_object'
-require_relative 'proxy/constant_object'
-require_relative 'proxy/method_object'
-require_relative 'proxy/module_object'
+require 'inch/evaluation/proxy/base'
+require 'inch/evaluation/proxy/namespace_object'
+require 'inch/evaluation/proxy/class_object'
+require 'inch/evaluation/proxy/constant_object'
+require 'inch/evaluation/proxy/method_object'
+require 'inch/evaluation/proxy/module_object'

lib/inch/rake.rb

@@ -1,2 +1,2 @@
 require 'inch'
-require_relative 'rake/suggest'
+require 'inch/rake/suggest'