From 5d9ffe10b0b4e0c15a10c1aa0954e53292a55041 Mon Sep 17 00:00:00 2001 From: Jarod Reid Date: Tue, 24 Sep 2013 09:59:37 -0600 Subject: [PATCH 1/3] add ruby 2.0 download support --- lib/core-source.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/core-source.rb b/lib/core-source.rb index 6581ab5..ea68af5 100644 --- a/lib/core-source.rb +++ b/lib/core-source.rb @@ -32,10 +32,13 @@ def ensure_core_headers( headers ) ruby_dir = "ruby-" + RUBY_VERSION.to_s + "-p" + RUBY_PATCHLEVEL.to_s end + version_path = RUBY_VERSION.to_f == 2.0 ? '2.0' : '1.9' + + # # Download the headers # - uri_path = "http://ftp.ruby-lang.org/pub/ruby/1.9/" + ruby_dir + ".tar.gz" + uri_path = "http://ftp.ruby-lang.org/pub/ruby/#{version_path}/" + ruby_dir + ".tar.gz" Tempfile.open("ruby-src") { |temp| temp.binmode From 26a7c6d6677bb20e26244eb43933826315ecb4e3 Mon Sep 17 00:00:00 2001 From: Jarod Reid Date: Fri, 27 Sep 2013 07:45:04 -0600 Subject: [PATCH 2/3] change name so that we can push this gem --- README.rdoc | 4 ++-- core-source-0.2.6.gem | Bin 10240 -> 0 bytes core-source.gemspec => core_source.gemspec | 11 +++++------ lib/{core-source.rb => core_source.rb} | 0 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 core-source-0.2.6.gem rename core-source.gemspec => core_source.gemspec (77%) rename lib/{core-source.rb => core_source.rb} (100%) diff --git a/README.rdoc b/README.rdoc index c8d06f4..8334452 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,6 +1,6 @@ == Sender -http://rubygems.org/gems/core-source +http://rubygems.org/gems/core_source == DESCRIPTION: @@ -10,7 +10,7 @@ core source. This fork was created because the existing ruby_core_source takes over the build definition, preventing definition of CFLAGS and other settings -that mkmf requires be defined by an enclosing block. +that mkmf requires be defined by an enclosing block. == INSTALL: diff --git a/core-source-0.2.6.gem b/core-source-0.2.6.gem deleted file mode 100644 index 5155a70b27d1be2843d96e9f9adfd573e07a5316..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10240 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 n*P9WrABg_#gML Date: Tue, 10 Dec 2013 11:20:54 -0700 Subject: [PATCH 3/3] update support for mutiple versions of ruby --- core_source.gemspec | 2 +- lib/core_source.rb | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core_source.gemspec b/core_source.gemspec index 74a66e8..75444f1 100644 --- a/core_source.gemspec +++ b/core_source.gemspec @@ -3,7 +3,7 @@ require 'date' Gem::Specification.new do |spec| spec.name = 'core_source' - spec.version = '0.2.8' + spec.version = '0.2.9' spec.summary = "Fork of ruby_core_source modified to support CFLAGS and permit use of whichever build system (mkmf, rpmkmf, or other modules) while utilizing core source." spec.description = "Fork of ruby_core_source modified to support CFLAGS and permit use of whichever build system (mkmf, rpmkmf, or other modules) while utilizing core source. This fork was created because the existing ruby_core_source takes over the build definition, preventing definition of CFLAGS and other settings that mkmf requires be defined by an enclosing block." diff --git a/lib/core_source.rb b/lib/core_source.rb index ea68af5..7823b9a 100644 --- a/lib/core_source.rb +++ b/lib/core_source.rb @@ -1,3 +1,9 @@ +if RUBY_VERSION.to_f < 1.9 + def require_relative(file) + require File.expand_path('../' + file, __FILE__) + end +end + require_relative 'contrib/uri_ext.rb' require_relative 'contrib/progressbar.rb' @@ -32,7 +38,9 @@ def ensure_core_headers( headers ) ruby_dir = "ruby-" + RUBY_VERSION.to_s + "-p" + RUBY_PATCHLEVEL.to_s end - version_path = RUBY_VERSION.to_f == 2.0 ? '2.0' : '1.9' + version_path = '1.8' if RUBY_VERSION.to_f >= 1.8 + version_path = '1.9' if RUBY_VERSION.to_f >= 1.9 + version_path = '2.0' if RUBY_VERSION.to_f >= 2.0 #