Skip to content

Commit

Permalink
Bump tiny.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Aug 30, 2009
1 parent 9deed54 commit 6bfb2fe
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
0.11.5
0.11.6
15 changes: 8 additions & 7 deletions lib/thor/util.rb
Expand Up @@ -137,17 +137,18 @@ def self.camel_case(str)
# inherit from Thor or Thor::Group.
#
def self.namespace_to_thor_class_and_task(namespace, raise_if_nil=true)
klass, task_name = Thor::Util.find_by_namespace(namespace), nil
if namespace.include?(?:)
pieces = namespace.split(":")
task = pieces.pop
klass = Thor::Util.find_by_namespace(pieces.join(":"))
end

if klass.nil? && namespace.include?(?:)
namespace = namespace.split(":")
task_name = namespace.pop
klass = Thor::Util.find_by_namespace(namespace.join(":"))
unless klass
klass, task = Thor::Util.find_by_namespace(namespace), nil
end

raise Error, "could not find Thor class or task '#{namespace}'" if raise_if_nil && klass.nil?

return klass, task_name
return klass, task
end

# Receives a path and load the thor file in the path. The file is evaluated
Expand Down
8 changes: 4 additions & 4 deletions thor.gemspec
Expand Up @@ -2,11 +2,11 @@

Gem::Specification.new do |s|
s.name = %q{thor}
s.version = "0.11.5"
s.version = "0.11.6"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Yehuda Katz", "Jos\303\251 Valim"]
s.date = %q{2009-08-05}
s.date = %q{2009-08-30}
s.description = %q{A scripting framework that replaces rake, sake and rubigen}
s.email = %q{ruby-thor@googlegroups.com}
s.executables = ["thor", "rake2thor"]
Expand Down Expand Up @@ -51,12 +51,11 @@ Gem::Specification.new do |s|
"lib/thor/task.rb",
"lib/thor/util.rb"
]
s.has_rdoc = true
s.homepage = %q{http://yehudakatz.com}
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{textmate}
s.rubygems_version = %q{1.3.2}
s.rubygems_version = %q{1.3.5}
s.summary = %q{A scripting framework that replaces rake, sake and rubigen}
s.test_files = [
"spec/rake_compat_spec.rb",
Expand All @@ -75,6 +74,7 @@ Gem::Specification.new do |s|
"spec/shell/color_spec.rb",
"spec/group_spec.rb",
"spec/thor_spec.rb",
"spec/fixtures/application.rb",
"spec/fixtures/doc/config.rb",
"spec/fixtures/bundle/execute.rb",
"spec/util_spec.rb",
Expand Down

0 comments on commit 6bfb2fe

Please sign in to comment.