Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use Bundler gem conventions.

Use stable version of shoulda-context. Remove rdoc-related code.
  • Loading branch information...
commit 26fb35aae9929c7250aa8cb75570bf0ea18e02c6 1 parent 22740fd
Gabe Berke-Williams authored November 11, 2011
12  Gemfile
... ...
@@ -1,12 +1,14 @@
1 1
 source 'http://rubygems.org'
2 2
 
3 3
 gemspec
4  
-gem 'rake', '~> 0.9.2'
5 4
 
6 5
 # For test Rails application
  6
+gem 'shoulda-context', '~> 1.0.0'
7 7
 gem 'sqlite3', :platform => :ruby
8  
-gem 'activerecord-jdbc-adapter', :platform => :jruby
  8
+
  9
+# Can't wrap in platform :jruby do...end block because appraisal doesn't support
  10
+# it
  11
+gem 'activerecord-jdbc-adapter',        :platform => :jruby
9 12
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
10  
-gem 'jdbc-sqlite3', :platform => :jruby
11  
-gem 'jruby-openssl', :platform => :jruby
12  
-gem 'shoulda-context', '~> 1.0.0.beta1'
  13
+gem 'jdbc-sqlite3',                     :platform => :jruby
  14
+gem 'jruby-openssl',                    :platform => :jruby
34  Rakefile
... ...
@@ -1,22 +1,9 @@
1  
-require 'rubygems'
2  
-require 'bundler/setup'
3  
-require 'rake'
4  
-require 'rdoc/task'
5  
-require 'rubygems/package_task'
  1
+require 'bundler'
6 2
 require 'rspec/core/rake_task'
7 3
 require 'cucumber/rake/task'
8 4
 require 'appraisal'
9 5
 
10  
-$LOAD_PATH.unshift("lib")
11  
-require 'shoulda/matchers/version'
12  
-
13  
-Rake::RDocTask.new { |rdoc|
14  
-  rdoc.rdoc_dir = 'doc'
15  
-  rdoc.title    = "Shoulda -- Making tests easy on the fingers and eyes"
16  
-  rdoc.options << '--line-numbers'
17  
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
18  
-  rdoc.rdoc_files.include('README.rdoc', 'CONTRIBUTION_GUIDELINES.rdoc', 'lib/**/*.rb')
19  
-}
  6
+Bundler::GemHelper.install_tasks
20 7
 
21 8
 RSpec::Core::RakeTask.new do |t|
22 9
   t.pattern = "spec/**/*_spec.rb"
@@ -24,23 +11,6 @@ RSpec::Core::RakeTask.new do |t|
24 11
   t.verbose = false
25 12
 end
26 13
 
27  
-desc "Run code-coverage analysis using rcov"
28  
-RSpec::Core::RakeTask.new(:coverage) do |t|
29  
-  t.rspec_opts = '--color --format progress'
30  
-  t.rcov = true
31  
-  t.rcov_opts = %{--exclude osx\/objc,spec,gems\/ --failure-threshold 100}
32  
-  t.pattern = "spec/**/*_spec.rb"
33  
-end
34  
-
35  
-eval("$specification = begin; #{IO.read('shoulda-matchers.gemspec')}; end")
36  
-Gem::PackageTask.new $specification do |pkg|
37  
-  pkg.need_tar = true
38  
-  pkg.need_zip = true
39  
-end
40  
-
41  
-desc "Clean files generated by rake tasks"
42  
-task :clobber => [:clobber_rdoc, :clobber_package]
43  
-
44 14
 Cucumber::Rake::Task.new do |t|
45 15
   t.fork = false
46 16
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
3  gemfiles/3.0.gemfile
@@ -2,13 +2,12 @@
2 2
 
3 3
 source "http://rubygems.org"
4 4
 
5  
-gem "rake", "~> 0.9.2"
  5
+gem "shoulda-context", "~> 1.0.0"
6 6
 gem "sqlite3", :platform=>:ruby
7 7
 gem "activerecord-jdbc-adapter", :platform=>:jruby
8 8
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
9 9
 gem "jdbc-sqlite3", :platform=>:jruby
10 10
 gem "jruby-openssl", :platform=>:jruby
11  
-gem "shoulda-context", "~> 1.0.0.beta1"
12 11
 gem "rails", "3.0.10"
13 12
 
14 13
 gemspec :path=>"../"
3  gemfiles/3.1.gemfile
@@ -2,13 +2,12 @@
2 2
 
3 3
 source "http://rubygems.org"
4 4
 
5  
-gem "rake", "~> 0.9.2"
  5
+gem "shoulda-context", "~> 1.0.0"
6 6
 gem "sqlite3", :platform=>:ruby
7 7
 gem "activerecord-jdbc-adapter", :platform=>:jruby
8 8
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
9 9
 gem "jdbc-sqlite3", :platform=>:jruby
10 10
 gem "jruby-openssl", :platform=>:jruby
11  
-gem "shoulda-context", "~> 1.0.0.beta1"
12 11
 gem "rails", "3.1.0"
13 12
 gem "uglifier"
14 13
 gem "jquery-rails"
36  shoulda-matchers.gemspec
@@ -2,31 +2,25 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
2 2
 require 'shoulda/matchers/version'
3 3
 
4 4
 Gem::Specification.new do |s|
5  
-  s.name = %q{shoulda-matchers}
6  
-  s.version = Shoulda::Matchers::VERSION.dup
  5
+  s.name        = "shoulda-matchers"
  6
+  s.version     = Shoulda::Matchers::VERSION.dup
  7
+  s.authors     = ["Tammer Saleh", "Joe Ferris", "Ryan McGeary", "Dan Croak",
  8
+                   "Matt Jankowski", "Stafford Brunk"]
  9
+  s.date        = Time.now.strftime("%Y-%m-%d")
  10
+  s.email       = "support@thoughtbot.com"
  11
+  s.homepage    = "http://thoughtbot.com/community/"
  12
+  s.summary     = "Making tests easy on the fingers and eyes"
  13
+  s.description = "Making tests easy on the fingers and eyes"
7 14
 
8  
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9  
-  s.authors = ["Tammer Saleh", "Joe Ferris", "Ryan McGeary", "Dan Croak",
10  
-    "Matt Jankowski", "Stafford Brunk"]
11  
-  s.date = Time.now.strftime("%Y-%m-%d")
12  
-  s.email = %q{support@thoughtbot.com}
13  
-  s.extra_rdoc_files = ["README.rdoc", "CONTRIBUTION_GUIDELINES.rdoc"]
14  
-  s.files = Dir["[A-Z]*", "{bin,lib,rails,test}/**/*"]
15  
-  s.homepage = %q{http://thoughtbot.com/community/}
16  
-  s.rdoc_options = ["--line-numbers", "--main", "README.rdoc"]
  15
+  s.files         = `git ls-files`.split("\n")
  16
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
  17
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
17 18
   s.require_paths = ["lib"]
18  
-  s.rubygems_version = %q{1.3.5}
19  
-  s.summary = %q{Making tests easy on the fingers and eyes}
20  
-  s.description = %q{Making tests easy on the fingers and eyes}
21 19
 
22 20
   s.add_development_dependency("mocha", "~> 0.9.10")
23  
-  s.add_development_dependency("rspec-rails", "~> 2.6.1.beta1")
  21
+  s.add_development_dependency("rspec-rails", "~> 2.6.1")
24 22
   s.add_development_dependency("cucumber", "~> 0.10.0")
25  
-  s.add_development_dependency("appraisal", "~> 0.3.4")
26 23
   s.add_development_dependency("aruba")
27  
-
28  
-  if s.respond_to? :specification_version then
29  
-    s.specification_version = 3
30  
-  else
31  
-  end
  24
+  s.add_development_dependency("appraisal", "~> 0.4.0")
  25
+  s.add_development_dependency("rake", "~> 0.9.2")
32 26
 end

0 notes on commit 26fb35a

Please sign in to comment.
Something went wrong with that request. Please try again.