Merge pull request #51 from kytrinyx/unvendor-thor

Remove vendored Thor.
kennethkalmer · Aug 16, 2012 · ad7fa2b · ad7fa2b
2 parents 61df1a9 + b13c595
commit ad7fa2b
Show file tree

Hide file tree

Showing 34 changed files with 3 additions and 4,535 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,6 +4,7 @@ PATH
     daemon-kit (0.1.8.2)
       eventmachine (>= 0.12.10)
       safely (>= 0.3.1)
+      thor
 
 GEM
   remote: http://rubygems.org/
@@ -38,6 +39,7 @@ GEM
     rspec-mocks (2.6.0)
     safely (0.3.1)
     term-ansicolor (1.0.5)
+    thor (0.16.0)
 
 PLATFORMS
   ruby

diff --git a/daemon-kit.gemspec b/daemon-kit.gemspec
@@ -34,6 +34,7 @@ $ daemon-kit -h
                           "TODO.txt",
                          ]
 
+  gem.add_dependency(%q<thor>)
   gem.add_development_dependency(%q<bundler>)
   gem.add_development_dependency(%q<rake>)  
   gem.add_development_dependency(%q<rdoc>)

diff --git a/lib/daemon_kit/generators.rb b/lib/daemon_kit/generators.rb
@@ -1,6 +1,3 @@
-# TODO: Don't always depend on bundled thor
-$:.unshift File.dirname(__FILE__) + '/vendor/thor-0.13.6/lib'
-
 require 'daemon_kit/generators/base'
 
 module DaemonKit

diff --git a/lib/daemon_kit/vendor/thor-0.13.6/CHANGELOG.rdoc b/lib/daemon_kit/vendor/thor-0.13.6/CHANGELOG.rdoc
diff --git a/lib/daemon_kit/vendor/thor-0.13.6/LICENSE b/lib/daemon_kit/vendor/thor-0.13.6/LICENSE