Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/thor.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require "set"
require "thor/base"
require_relative "thor/base"

class Thor
class << self
Expand Down
14 changes: 7 additions & 7 deletions lib/thor/actions.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require "uri"
require "thor/core_ext/io_binary_read"
require "thor/actions/create_file"
require "thor/actions/create_link"
require "thor/actions/directory"
require "thor/actions/empty_directory"
require "thor/actions/file_manipulation"
require "thor/actions/inject_into_file"
require_relative "core_ext/io_binary_read"
require_relative "actions/create_file"
require_relative "actions/create_link"
require_relative "actions/directory"
require_relative "actions/empty_directory"
require_relative "actions/file_manipulation"
require_relative "actions/inject_into_file"

class Thor
module Actions
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/actions/create_file.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/actions/empty_directory"
require_relative "empty_directory"

class Thor
module Actions
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/actions/create_link.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/actions/create_file"
require_relative "create_file"

class Thor
module Actions
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/actions/directory.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/actions/empty_directory"
require_relative "empty_directory"

class Thor
module Actions
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/actions/inject_into_file.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/actions/empty_directory"
require_relative "empty_directory"

class Thor
module Actions
Expand Down
16 changes: 8 additions & 8 deletions lib/thor/base.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require "thor/command"
require "thor/core_ext/hash_with_indifferent_access"
require "thor/error"
require "thor/invocation"
require "thor/parser"
require "thor/shell"
require "thor/line_editor"
require "thor/util"
require_relative "command"
require_relative "core_ext/hash_with_indifferent_access"
require_relative "error"
require_relative "invocation"
require_relative "parser"
require_relative "shell"
require_relative "line_editor"
require_relative "util"

class Thor
autoload :Actions, "thor/actions"
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/group.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/base"
require_relative "base"

# Thor has a special class called Thor::Group. The main difference to Thor class
# is that it invokes all commands at once. It also include some methods that allows
Expand Down
4 changes: 2 additions & 2 deletions lib/thor/line_editor.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require "thor/line_editor/basic"
require "thor/line_editor/readline"
require_relative "line_editor/basic"
require_relative "line_editor/readline"

class Thor
module LineEditor
Expand Down
8 changes: 4 additions & 4 deletions lib/thor/parser.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/parser/argument"
require "thor/parser/arguments"
require "thor/parser/option"
require "thor/parser/options"
require_relative "parser/argument"
require_relative "parser/arguments"
require_relative "parser/option"
require_relative "parser/options"
8 changes: 4 additions & 4 deletions lib/thor/runner.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "thor"
require "thor/group"
require "thor/core_ext/io_binary_read"
require_relative "../thor"
require_relative "group"
require_relative "core_ext/io_binary_read"

require "yaml"
require "digest/md5"
Expand Down Expand Up @@ -113,7 +113,7 @@ def install(name) # rubocop:disable MethodLength

desc "version", "Show Thor version"
def version
require "thor/version"
require_relative "version"
say "Thor #{Thor::VERSION}"
end

Expand Down
2 changes: 1 addition & 1 deletion lib/thor/shell/color.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/shell/basic"
require_relative "basic"

class Thor
module Shell
Expand Down
2 changes: 1 addition & 1 deletion lib/thor/shell/html.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "thor/shell/basic"
require_relative "basic"

class Thor
module Shell
Expand Down