Resolve merge

This commit is contained in:
ragaskar 2009-11-28 12:09:19 -08:00
commit 73597fc8a5
3 changed files with 27 additions and 7 deletions

View File

@ -12,6 +12,10 @@ namespace :jeweler do
gemspec.description = "Jasmine Ruby" gemspec.description = "Jasmine Ruby"
gemspec.authors = ["Rajan Agaskar"] gemspec.authors = ["Rajan Agaskar"]
gemspec.files = FileList.new('bin/*', 'lib/**/**', 'jasmine/lib/**', 'jasmine/contrib/ruby/**', 'tasks/**', 'templates/**') gemspec.files = FileList.new('bin/*', 'lib/**/**', 'jasmine/lib/**', 'jasmine/contrib/ruby/**', 'tasks/**', 'templates/**')
gemspec.add_dependency('rspec', '>= 1.1.5')
gemspec.add_dependency('rack', '>= 1.0.0')
gemspec.add_dependency('thin', '>= 1.2.4')
end end
Jeweler::GemcutterTasks.new Jeweler::GemcutterTasks.new
rescue LoadError rescue LoadError

6
geminstaller.yml Normal file
View File

@ -0,0 +1,6 @@
---
gems:
- name: rake
version: 0.8.7
- name: jeweler
version: 1.4.0

View File

@ -1,6 +1,6 @@
# Generated by jeweler # Generated by jeweler
# DO NOT EDIT THIS FILE # DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
Gem::Specification.new do |s| Gem::Specification.new do |s|
@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Rajan Agaskar"] s.authors = ["Rajan Agaskar"]
s.date = %q{2009-10-30} s.date = %q{2009-11-26}
s.default_executable = %q{jasmine} s.default_executable = %q{jasmine}
s.description = %q{Jasmine Ruby} s.description = %q{Jasmine Ruby}
s.email = %q{ragaskar@gmail.com} s.email = %q{ragaskar@gmail.com}
@ -27,6 +27,7 @@ Gem::Specification.new do |s|
"jasmine/lib/jasmine-0.10.0.js", "jasmine/lib/jasmine-0.10.0.js",
"jasmine/lib/jasmine.css", "jasmine/lib/jasmine.css",
"jasmine/lib/json2.js", "jasmine/lib/json2.js",
"lib/jasmine-ruby.rb",
"lib/jasmine-ruby/jasmine_helper.rb", "lib/jasmine-ruby/jasmine_helper.rb",
"lib/jasmine-ruby/jasmine_meta_spec.rb", "lib/jasmine-ruby/jasmine_meta_spec.rb",
"lib/jasmine-ruby/jasmine_runner.rb", "lib/jasmine-ruby/jasmine_runner.rb",
@ -34,14 +35,13 @@ Gem::Specification.new do |s|
"lib/jasmine-ruby/run.html", "lib/jasmine-ruby/run.html",
"lib/jasmine-ruby.rb", "lib/jasmine-ruby.rb",
"templates/example_spec.js", "templates/example_spec.js",
"templates/spec_helper.js",
"templates/jasmine_helper.rb", "templates/jasmine_helper.rb",
"templates/Rakefile" "templates/spec_helper.js"
] ]
s.homepage = %q{http://github.com/ragaskar/jasmine-ruby} s.homepage = %q{http://github.com/ragaskar/jasmine-ruby}
s.rdoc_options = ["--charset=UTF-8"] s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"] s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.4} s.rubygems_version = %q{1.3.5}
s.summary = %q{Jasmine Ruby} s.summary = %q{Jasmine Ruby}
s.test_files = [ s.test_files = [
"spec/jasmine_spec.rb" "spec/jasmine_spec.rb"
@ -52,8 +52,18 @@ Gem::Specification.new do |s|
s.specification_version = 3 s.specification_version = 3
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rspec>, [">= 1.1.5"])
s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
s.add_runtime_dependency(%q<thin>, [">= 1.2.4"])
else else
s.add_dependency(%q<rspec>, [">= 1.1.5"])
s.add_dependency(%q<rack>, [">= 1.0.0"])
s.add_dependency(%q<thin>, [">= 1.2.4"])
end end
else else
s.add_dependency(%q<rspec>, [">= 1.1.5"])
s.add_dependency(%q<rack>, [">= 1.0.0"])
s.add_dependency(%q<thin>, [">= 1.2.4"])
end end
end end