Merge branch 'fix_gemspecs' of https://github.com/Nitrodist/strongbox

Conflicts:
	Rakefile

Rakefile

@@ -3,6 +3,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'strongbox'
@@ -17,6 +18,15 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc 'Generate documentation for the strongbox gem.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title = 'Strongbox'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
 desc "Generate a gemspec file for GitHub"
 task :gemspec do
   $spec = eval(File.read('strongbox.gemspec'))

strongbox.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
   s.add_runtime_dependency 'activerecord'
-  s.add_development_dependency 'thoughtbot-shoulda'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'thoughtbot-shoulda', '>= 2.9.0'
+  s.add_development_dependency 'sqlite3', '~> 1.3.7'
+  s.add_development_dependency 'rake', '>= 10.0.0'
+  s.add_development_dependency 'rdoc', '~> 2.4.0'
 end

test/test_helper.rb

@@ -2,12 +2,10 @@
 RAILS_ROOT = ROOT
 $LOAD_PATH << File.join(ROOT, 'lib')
 
-require 'rubygems'
 require 'test/unit'
 require 'sqlite3'
 require 'active_record'
 require 'logger'
-gem 'thoughtbot-shoulda', ">= 2.9.0"
 require 'shoulda'
 begin require 'redgreen'; rescue LoadError; end