Browse files

Merge pull request #93 from unakatsuo/fix-gemspec

Fix Gemfile & .gemspec
  • Loading branch information...
2 parents 2ec81a8 + b5a4be2 commit 04721ad5c2e4a4648be1fa087e1641cfaa562e17 @zzak zzak committed Aug 16, 2013
Showing with 6 additions and 6 deletions.
  1. +2 −2 Gemfile
  2. +0 −1 Rakefile
  3. +1 −1 lib/sinatra/contrib/version.rb
  4. +3 −2 sinatra-contrib.gemspec
View
4 Gemfile
@@ -1,7 +1,7 @@
-source "http://rubygems.org" unless ENV['QUICK']
+source "https://rubygems.org" unless ENV['QUICK']
gemspec
-gem 'sinatra', :git => 'git://github.com/sinatra/sinatra'
+gem 'sinatra', :github => 'sinatra/sinatra'
group :development, :test do
platform :ruby_18, :jruby do
View
1 Rakefile
@@ -44,7 +44,6 @@ task 'sinatra-contrib.gemspec' do
content.sub!(/ s\.#{field} = \[\n( .*\n)* \]/, updated)
end
- content.sub! /(s\.version.*=\s+).*/, "\\1\"#{Sinatra::Contrib::VERSION}\""
File.open('sinatra-contrib.gemspec', 'w') { |f| f << content }
end
View
2 lib/sinatra/contrib/version.rb
@@ -4,7 +4,7 @@ def self.version
VERSION
end
- SIGNATURE = [1, 3, 1]
+ SIGNATURE = [1, 4, 0]
VERSION = SIGNATURE.join('.')
VERSION.extend Comparable
View
5 sinatra-contrib.gemspec
@@ -1,7 +1,8 @@
# Run `rake sinatra-contrib.gemspec` to update the gemspec.
+require File.expand_path('../lib/sinatra/contrib/version', __FILE__)
Gem::Specification.new do |s|
s.name = "sinatra-contrib"
- s.version = "1.4.0"
+ s.version = Sinatra::Contrib::VERSION
s.description = "Collection of useful Sinatra extensions"
s.homepage = "http://github.com/sinatra/sinatra-contrib"
s.summary = s.description
@@ -122,8 +123,8 @@ Gem::Specification.new do |s|
s.add_dependency "tilt", "~> 1.3"
s.add_dependency "rack-test"
s.add_dependency "rack-protection"
- s.add_dependency "eventmachine"
+ s.add_development_dependency "eventmachine"
s.add_development_dependency "rspec", "~> 2.3"
s.add_development_dependency "haml"
s.add_development_dependency "erubis"

0 comments on commit 04721ad

Please sign in to comment.