add_source reworked to extract patchlevel from sources

patchlevel defined in version.h so let's extract it from there.
Also added ability to use already downloaded .tgz

Author: os97673

Rakefile

@@ -6,33 +6,56 @@ require 'fileutils'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-desc 'Add ruby headers under lib for a given VERSION and PATCHLEVEL'
-task :add_source do
-  version = ENV['VERSION'] or abort "Need a $VERSION"
-  ruby_dir = "ruby-#{version}"
-  minor_version = version.split('.')[0..1].join('.')
-  uri_path = "http://ftp.ruby-lang.org/pub/ruby/#{minor_version}/#{ruby_dir}.tar.gz"
+def get_dest_dir(ruby_dir, version, tempdir)
   dest_dir = File.dirname(__FILE__) + "/lib/debase/ruby_core_source/#{ruby_dir}"
+  return dest_dir if version.include?('-p')
 
   patchlevel = ENV['PATCHLEVEL']
-  if patchlevel
-    dest_dir = dest_dir + "-p" + patchlevel
-  elsif !version.include?('-p')
-    abort "Need a $PATCHLEVEL"
+  if !patchlevel
+    puts "extracting patchlevel from version.h"
+    patchlevel = File.new("#{tempdir}/#{ruby_dir}/version.h").each_line do |li|
+      if /#define RUBY_PATCHLEVEL (\d+)/ =~ li
+        break $1
+      end
+    end
+    puts "extracted patchlevel '#{patchlevel}'"
+  end
+  if !patchlevel
+    abort "Unable to extract patchlevel from verion.h please use a $PATCHLEVEL"
   end
+  dest_dir = dest_dir + "-p" + patchlevel
+end
 
+desc <<DESCR
+Add ruby headers under lib for a given VERSION and (optional) PATCHLEVEL,
+\t\t\tif patchlevel is not provided it will be extracted from version.h.
+\t\t\tTGZ_FILE_NAME can be used to provide pre-downloaded tgz file
+DESCR
+task :add_source do
+  version = ENV['VERSION'] or abort "Need a $VERSION"
+  ruby_dir = "ruby-#{version}"
 
-  puts "Downloading #{uri_path}..."
-  temp = open(uri_path)
+  if ENV['TGZ_FILE_NAME']
+    temp = ENV['TGZ_FILE_NAME']
+    puts "Using pre-downloaded bundle #{temp}"
+  else
+    minor_version = version.split('.')[0..1].join('.')
+    uri_path = "http://ftp.ruby-lang.org/pub/ruby/#{minor_version}/#{ruby_dir}.tar.gz"
+    puts "Downloading #{uri_path}..."
+    temp = open(uri_path)
+  end
   puts "Unpacking #{uri_path}..."
   tgz = Zlib::GzipReader.new(File.open(temp, "rb"))
 
-  FileUtils.mkdir_p(dest_dir)
   Dir.mktmpdir do |dir|
     inc_dir = dir + "/" + ruby_dir + "/*.inc"
     hdr_dir = dir + "/" + ruby_dir + "/*.h"
     more_hdr_dir = dir + "/" + ruby_dir + "/ccan/**/*.h"
     Archive::Tar::Minitar.unpack(tgz, dir)
+
+    dest_dir = get_dest_dir(ruby_dir, version, dir)
+    puts dest_dir
+    FileUtils.mkdir_p(dest_dir)
     Dir.glob([ inc_dir, hdr_dir, more_hdr_dir ]).each do |file|
       target = file.sub(dir + '/' + ruby_dir, dest_dir)
       FileUtils.mkdir_p(File.dirname(target))