Permalink
Browse files

Merge branch 'master' of git@github.com:wycats/thor

  • Loading branch information...
2 parents 1269450 + 10696af commit 7107e04f467ffdb4182815bf2a7361c29f235b0c @josevalim josevalim committed Oct 16, 2009
Showing with 3 additions and 7 deletions.
  1. +2 −1 Thorfile
  2. +0 −1 bin/rake2thor
  3. +1 −1 bin/thor
  4. +0 −1 lib/thor.rb
  5. +0 −3 spec/spec_helper.rb
View
@@ -1,4 +1,3 @@
-require 'rubygems'
require 'thor/rake_compat'
require 'spec/rake/spectask'
require 'rdoc/task'
@@ -10,11 +9,13 @@ class Default < Thor
include Thor::RakeCompat
Spec::Rake::SpecTask.new(:spec) do |t|
+ t.libs << 'lib'
t.spec_opts = ['--options', "spec/spec.opts"]
t.spec_files = FileList['spec/**/*_spec.rb']
end
Spec::Rake::SpecTask.new(:rcov) do |t|
+ t.libs << 'lib'
t.spec_opts = ['--options', "spec/spec.opts"]
t.spec_files = FileList['spec/**/*_spec.rb']
t.rcov = true
View
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
-require 'rubygems'
require 'ruby2ruby'
require 'parse_tree'
if Ruby2Ruby::VERSION >= "1.2.0"
View
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# -*- mode: ruby -*-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'thor')
+require 'thor'
require 'thor/runner'
Thor::Runner.start
View
@@ -1,4 +1,3 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
require 'thor/base'
require 'thor/group'
require 'thor/actions'
View
@@ -1,10 +1,7 @@
$TESTING=true
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
require 'thor'
require 'stringio'
-require 'rubygems'
require 'rr'
require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).

0 comments on commit 7107e04

Please sign in to comment.