Permalink
Browse files

Refresh Bundler dependencies & setup

  • Loading branch information...
jeremy committed Jan 27, 2013
1 parent 766f73c commit eeb7c588cf7b510bf0fce854e5d51ae4e57d8194
Showing with 15 additions and 38 deletions.
  1. +1 −0 CHANGELOG.rdoc
  2. +7 −18 Gemfile
  3. +3 −20 Rakefile
  4. +4 −0 mail.gemspec
View
@@ -23,6 +23,7 @@ Coping with third-party bugs:
* Parse multipart boundary from Content-Type headers containing extra semicolons (jeremy)
Housekeeping:
+* Refresh Bundler dependencies & setup (jeremy)
* Remove i18n dependency and last vestiges of activesupport dependency in specs (jeremy)
* Clarify that Sender is a single address, not an address list (jeremy)
* Add an MIT-LICENSE file to make licensing clear & obvious; update to 2013 (jeremy)
View
25 Gemfile
@@ -1,24 +1,13 @@
-source :rubygems
+source 'https://rubygems.org'
+
+gemspec
-gem "tlsmail" if RUBY_VERSION <= '1.8.6'
-gem "mime-types", "~> 1.16"
gem "treetop", "~> 1.4.10"
+gem "mime-types", "~> 1.16"
+gem "tlsmail" if RUBY_VERSION <= '1.8.6'
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
- gem 'jruby-openssl'
-end
+gem 'jruby-openssl', :platform => :jruby
group :test do
- gem "rake", "> 0.8.7"
- gem "rspec", "~> 2.12.0"
- case
- when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
- # Skip it
- when RUBY_PLATFORM == 'java'
- # Skip it
- when RUBY_VERSION < '1.9'
- gem "ruby-debug"
- else
- # Skip it
- end
+ gem "ruby-debug", :platform => :mri_18
end
View
@@ -1,23 +1,6 @@
-begin
- require "rubygems"
- require "bundler"
-rescue LoadError
- raise "Could not load the bundler gem. Install it with `gem install bundler`."
-end
-
-if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("1.0.0")
- raise RuntimeError, "Your bundler version is too old for Mail" +
- "Run `gem install bundler` to upgrade."
-end
-
-begin
- # Set up load paths for all bundled gems
- ENV["BUNDLE_GEMFILE"] = File.expand_path("../Gemfile", __FILE__)
- Bundler.setup
-rescue Bundler::GemNotFound
- raise RuntimeError, "Bundler couldn't find some gems." +
- "Did you run `bundle install`?"
-end
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __FILE__)
+require 'rubygems'
+require 'bundler/setup'
require 'rake/testtask'
require 'rspec/core/rake_task'
View
@@ -20,6 +20,10 @@ Gem::Specification.new do |s|
s.add_dependency('jruby-openssl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
s.add_dependency('tlsmail', '~> 0.0.1') if RUBY_VERSION == '1.8.6'
+ s.add_development_dependency('bundler', '>= 1.0.3')
+ s.add_development_dependency('rake', '> 0.8.7')
+ s.add_development_dependency('rspec', '~> 2.12.0')
+
s.require_path = 'lib'
s.files = %w(README.md MIT-LICENSE CONTRIBUTING.md CHANGELOG.rdoc Dependencies.txt Gemfile Rakefile TODO.rdoc) + Dir.glob("lib/**/*")
end

0 comments on commit eeb7c58

Please sign in to comment.