Skip to content
This repository has been archived by the owner on Sep 2, 2019. It is now read-only.

Commit

Permalink
Revert to rspec 1.x because of data mapper.
Browse files Browse the repository at this point in the history
  • Loading branch information
krider2010 committed Sep 17, 2013
1 parent fa8c8c0 commit 4edb961
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -5,7 +5,7 @@ gem "dm-validations", ">= 1.2.0"
gem "dm-types", ">= 1.2.0"
gem "redis", ">= 3.0.4"
gem "jeweler", ">= 1.4.0"
gem "rspec", "~> 2.14.0"
gem "rspec", "~> 1.3.2"
gem "rake", ">= 10.0.3"
gem "hiredis", "~> 0.4.0"
# gem "ruby-debug19"
Expand Down
12 changes: 2 additions & 10 deletions Gemfile.lock
Expand Up @@ -4,7 +4,6 @@ GEM
addressable (2.3.5)
bcrypt-ruby (3.1.2)
builder (3.2.2)
diff-lcs (1.2.4)
dm-core (1.2.1)
addressable (~> 2.3)
dm-types (1.2.2)
Expand Down Expand Up @@ -60,14 +59,7 @@ GEM
rdoc (4.0.1)
json (~> 1.4)
redis (3.0.4)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec (1.3.2)
stringex (1.5.1)
uuidtools (2.1.4)

Expand All @@ -82,4 +74,4 @@ DEPENDENCIES
jeweler (>= 1.4.0)
rake (>= 10.0.3)
redis (>= 3.0.4)
rspec (~> 2.14.0)
rspec (~> 1.3.2)
8 changes: 4 additions & 4 deletions Rakefile
Expand Up @@ -8,7 +8,7 @@ rescue LoadError
Bundler.setup
end

require "rspec/core/rake_task"
require 'spec/rake/spectask'

GEM = 'dm-redis-adapter'
GEM_NAME = 'dm-redis-adapter'
Expand Down Expand Up @@ -42,7 +42,7 @@ end
task :default => :spec

desc "Run specs"
RSpec::Core::RakeTask.new do |spec|
spec.pattern = 'spec/**/*_spec.rb'
spec.rspec_opts = ['--backtrace', '--color', '--drb', '--format documentation']
Spec::Rake::SpecTask.new do |t|
t.spec_files = FileList['spec/**/*_spec.rb']
t.spec_opts = %w(-fs --color)
end
6 changes: 3 additions & 3 deletions dm-redis-adapter.gemspec
Expand Up @@ -45,7 +45,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<dm-types>, [">= 1.2.0"])
s.add_runtime_dependency(%q<redis>, [">= 3.0.4"])
s.add_runtime_dependency(%q<jeweler>, [">= 1.4.0"])
s.add_runtime_dependency(%q<rspec>, ["~> 2.14.0"])
s.add_runtime_dependency(%q<rspec>, ["~> 1.3.2"])
s.add_runtime_dependency(%q<rake>, [">= 10.0.3"])
s.add_runtime_dependency(%q<hiredis>, ["~> 0.4.0"])
s.add_runtime_dependency(%q<dm-core>, [">= 1.2.0"])
Expand All @@ -58,7 +58,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<dm-types>, [">= 1.2.0"])
s.add_dependency(%q<redis>, [">= 3.0.4"])
s.add_dependency(%q<jeweler>, [">= 1.4.0"])
s.add_dependency(%q<rspec>, ["~> 2.14.0"])
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
s.add_dependency(%q<rake>, [">= 10.0.3"])
s.add_dependency(%q<hiredis>, ["~> 0.4.0"])
s.add_dependency(%q<dm-core>, [">= 1.2.0"])
Expand All @@ -72,7 +72,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<dm-types>, [">= 1.2.0"])
s.add_dependency(%q<redis>, [">= 3.0.4"])
s.add_dependency(%q<jeweler>, [">= 1.4.0"])
s.add_dependency(%q<rspec>, ["~> 2.14.0"])
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
s.add_dependency(%q<rake>, [">= 10.0.3"])
s.add_dependency(%q<hiredis>, ["~> 0.4.0"])
s.add_dependency(%q<dm-core>, [">= 1.2.0"])
Expand Down

0 comments on commit 4edb961

Please sign in to comment.