Merge pull request resque#679 from postmodern/cleanup

Cleanup

Author: steveklabnik

.document

@@ -0,0 +1,3 @@
+- 
+HISTORY.md
+LICENSE.txt

.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
+doc/
 test/dump.rdb

Gemfile

@@ -2,8 +2,17 @@ source :rubygems
 
 gemspec
 
+group :development do
+  gem 'rake'
+  gem 'yard'
+end
+
+group :documentation do
+  gem 'rdoc'
+  gem 'redcarpet'
+end
+
 group :test do
-  gem "rake"
   gem "rack-test", "~> 0.5"
   gem "mocha", "~> 0.9.7"
   gem "yajl-ruby", "~>0.8.2", :platforms => :mri

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -499,7 +499,7 @@ then `CONT` to start it again.
 
 If your workers remain idle for too long they may lose their MySQL
 connection. If that happens we recommend using [this
-Gist](http://gist.github.com/238999).
+Gist](https://gist.github.com/238999).
 
 
 <a name='section_The_Front_End'></a>
@@ -866,11 +866,11 @@ Plugins and Hooks
 -----------------
 
 For a list of available plugins see
-<http://wiki.github.com/defunkt/resque/plugins>.
+<https://wiki.github.com/defunkt/resque/plugins>.
 
 If you'd like to write your own plugin, or want to customize Resque
 using hooks (such as `Resque.after_fork`), see
-[docs/HOOKS.md](http://github.com/defunkt/resque/blob/master/docs/HOOKS.md).
+[docs/HOOKS.md](https://github.com/defunkt/resque/blob/master/docs/HOOKS.md).
 
 
 <a name='section_Namespaces'></a>
@@ -977,7 +977,7 @@ Once you've made your great commits:
 1. [Fork][1] Resque
 2. Create a topic branch - `git checkout -b my_branch`
 3. Push to your branch - `git push origin my_branch`
-4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch
+4. Create a [Pull Request](https://help.github.com/pull-requests/) from your branch
 5. That's it!
 
 
@@ -997,12 +997,12 @@ Meta
 ----
 
 * Code: `git clone git://github.com/defunkt/resque.git`
-* Home: <http://github.com/defunkt/resque>
-* Docs: <http://defunkt.github.com/resque/>
-* Bugs: <http://github.com/defunkt/resque/issues>
+* Home: <https://github.com/defunkt/resque>
+* Docs: <http://rubydoc.info/gems/resque/frames>
+* Bugs: <https://github.com/defunkt/resque/issues>
 * List: <[email protected]>
 * Chat: <irc://irc.freenode.net/resque>
-* Gems: <http://gemcutter.org/gems/resque>
+* Gems: <http://rubygems.org/gems/resque>
 
 This project uses [Semantic Versioning][sv].
 
@@ -1013,9 +1013,9 @@ Author
 
 Chris Wanstrath :: [email protected] :: @defunkt
 
-[0]: http://github.com/blog/542-introducing-resque
-[1]: http://help.github.com/forking/
-[2]: http://github.com/defunkt/resque/issues
+[0]: https://github.com/blog/542-introducing-resque
+[1]: https://help.github.com/forking/
+[2]: https://github.com/defunkt/resque/issues
 [sv]: http://semver.org/
-[rs]: http://github.com/defunkt/redis-namespace
-[cb]: http://wiki.github.com/defunkt/resque/contributing
+[rs]: https://github.com/defunkt/redis-namespace
+[cb]: https://wiki.github.com/defunkt/resque/contributing

README.markdown README.mdREADME.markdown renamed to README.md

@@ -1,7 +1,21 @@
+require 'rubygems'
+
+begin
+  require 'bundler/setup'
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install bundler` to install Bundler"
+  exit -1
+end
+
 #
-# Setup
+# Bundler
 #
+require 'bundler/gem_tasks'
 
+#
+# Setup
+#
 $LOAD_PATH.unshift 'lib'
 require 'resque/tasks'
 
@@ -13,17 +27,15 @@ end
 #
 # Tests
 #
-
 require 'rake/testtask'
 
-task :default => :test
-
 Rake::TestTask.new do |test|
   test.verbose = true
   test.libs << "test"
   test.libs << "lib"
   test.test_files = FileList['test/**/*_test.rb']
 end
+task :default => :test
 
 if command? :kicker
   desc "Launch Kicker (like autotest)"
@@ -37,32 +49,12 @@ end
 #
 # Install
 #
-
 task :install => [ 'redis:install', 'dtach:install' ]
 
 
 #
 # Documentation
 #
-
-begin
-  require 'sdoc_helpers'
-rescue LoadError
-end
-
-
-#
-# Publishing
-#
-
-desc "Push a new version to Gemcutter"
-task :publish do
-  require 'resque/version'
-
-  sh "gem build resque.gemspec"
-  sh "gem push resque-#{Resque::Version}.gem"
-  sh "git tag v#{Resque::Version}"
-  sh "git push origin v#{Resque::Version}"
-  sh "git push origin master"
-  sh "git clean -fd"
-end
+require 'yard'
+YARD::Rake::YardocTask.new
+task :docs => :yard

Rakefile

@@ -4,21 +4,17 @@ require 'resque/version'
 Gem::Specification.new do |s|
   s.name              = "resque"
   s.version           = Resque::Version
-  s.date              = Time.now.strftime('%Y-%m-%d')
   s.summary           = "Resque is a Redis-backed queueing system."
-  s.homepage          = "http://github.com/defunkt/resque"
+  s.homepage          = "https://github.com/defunkt/resque"
   s.email             = "[email protected]"
   s.authors           = [ "Chris Wanstrath", "Terence Lee" ]
 
-  s.files             = %w( README.markdown Rakefile LICENSE HISTORY.md )
-  s.files            += Dir.glob("lib/**/*")
-  s.files            += Dir.glob("bin/**/*")
-  s.files            += Dir.glob("man/**/*")
-  s.files            += Dir.glob("test/**/*")
-  s.files            += Dir.glob("tasks/**/*")
-  s.executables       = [ "resque", "resque-web" ]
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
 
-  s.extra_rdoc_files  = [ "LICENSE", "README.markdown" ]
+  s.extra_rdoc_files  = [ "LICENSE.txt", "HISTORY.md", "README.md" ]
   s.rdoc_options      = ["--charset=UTF-8"]
 
   s.add_dependency "redis-namespace", "~> 1.0"