rake-compiler 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.3.1 / 2009-01-09
+
+* 2 Minor Enhancements:
+
+  * Download cross-ruby source code using HTTP instead of FTP.
+  * Disabled Tcl/Tk extension building on cross-ruby (helps with 1.9).
+
+* 3 Bug fixes:
+
+  * Workaround bug introduced by lack of Gem::Specification cloning. Fixes DM LH #757.
+  * Use proper binary extension on OSX (reported by Dirkjan Bussink).
+  * Ensure lib/binary task is defined prior clear of requisites.
+
 === 0.3.0 / 2008-12-07
 
 * 1 Major Enhancement:

data/Rakefile

@@ -20,4 +20,4 @@ rescue LoadError
 end
 
 # load rakefile extensions (tasks)
-Dir['tasks/*.rake'].each { |f| import f }
+Dir['tasks/*.rake'].sort.each { |f| load f }

data/features/step_definitions/cross_compilation.rb

@@ -6,13 +6,14 @@ Given %r{^I'm running a POSIX operating system$} do
 end
 
 Given %r{^I've installed cross compile toolchain$} do
-  compiler = 'i586-mingw32msvc-gcc'
-  found = false
-  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    next unless File.exist?(File.join(path, compiler))
-    found = true
+  compilers = %w(i586-mingw32msvc-gcc i386-mingw32-gcc)
+  paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+  compiler = compilers.find do |comp|
+    paths.find do |path|
+      File.exist? File.join(path, comp)
+    end
   end
-  raise "Cannot locate '#{compiler}' in the PATH." unless found
+  raise "Cannot locate '#{compiler}' in the PATH." unless compiler
 end
 
 Then /^binaries for platform '(.*)' get generated$/ do |platform|

data/features/step_definitions/gem.rb

@@ -24,6 +24,7 @@ end
 
 def gem_file_platform(folder, name, version, platform = nil)
   file = "#{folder}/#{name}-#{version}"
-  file << "-" << (platform || Gem::Platform.local.to_s)
+  file << "-" << (platform || Gem::Platform.new(RUBY_PLATFORM).to_s)
   file << ".gem"
+  file
 end

data/lib/rake/extensiontask.rb

@@ -76,7 +76,7 @@ module Rake
 
       # cleanup and clobbering
       CLEAN.include(tmp_path)
-      CLOBBER.include("#{@lib_dir}/#{binary}")
+      CLOBBER.include("#{@lib_dir}/#{binary(platf)}")
       CLOBBER.include("#{@tmp_dir}")
 
       # directories we need
@@ -85,13 +85,13 @@ module Rake
 
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
-      task "copy:#{@name}:#{platf}" => [lib_dir, "#{tmp_path}/#{binary}"] do
-        cp "#{tmp_path}/#{binary}", "#{@lib_dir}/#{binary}"
+      task "copy:#{@name}:#{platf}" => [lib_dir, "#{tmp_path}/#{binary(platf)}"] do
+        cp "#{tmp_path}/#{binary(platf)}", "#{@lib_dir}/#{binary(platf)}"
       end
 
       # binary in temporary folder depends on makefile and source files
       # tmp/extension_name/extension_name.{so,bundle}
-      file "#{tmp_path}/#{binary}" => ["#{tmp_path}/Makefile"] + source_files do
+      file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do
         chdir tmp_path do
           sh make
         end
@@ -136,7 +136,7 @@ module Rake
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
         # ensure file is always copied
-        file "#{@lib_dir}/#{binary}" => ["copy:#{name}:#{platf}"]
+        file "#{@lib_dir}/#{binary(platf)}" => ["copy:#{name}:#{platf}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
@@ -150,10 +150,12 @@ module Rake
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}"
 
       # create 'native:gem_name' and chain it to 'native' task
-      spec = @gem_spec.dup
-
       unless Rake::Task.task_defined?("native:#{@gem_spec.name}:#{platf}")
         task "native:#{@gem_spec.name}:#{platf}" do |t|
+          # FIXME: truly duplicate the Gem::Specification
+          # workaround the lack of #dup for Gem::Specification
+          spec = Gem::Specification.from_yaml(gem_spec.to_yaml)
+
           # adjust to specified platform
           spec.platform = platf
 
@@ -185,7 +187,7 @@ module Rake
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{tmp_path}/#{binary}"]
+      task "native:#{@gem_spec.name}:#{platf}" => ["#{tmp_path}/#{binary(platf)}"]
 
       # Allow segmented packaging by platfrom (open door for 'cross compile')
       task "native:#{platf}" => ["native:#{@gem_spec.name}:#{platf}"]
@@ -240,8 +242,11 @@ module Rake
         task 'compile' => ["compile:#{cross_platform}"]
 
         # clear lib/binary dependencies and trigger cross platform ones
-        Rake::Task["#{@lib_dir}/#{binary}"].prerequisites.clear
-        file "#{@lib_dir}/#{binary}" => ["copy:#{@name}:#{cross_platform}"]
+        # check if lib/binary is defined (damn bundle versus so versus dll)
+        if Rake::Task.task_defined?("#{@lib_dir}/#{binary(cross_platform)}") then
+          Rake::Task["#{@lib_dir}/#{binary(cross_platform)}"].prerequisites.clear
+        end
+        file "#{@lib_dir}/#{binary(cross_platform)}" => ["copy:#{@name}:#{cross_platform}"]
 
         # if everything for native task is in place
         if @gem_spec && @gem_spec.platform == 'ruby' then
@@ -259,8 +264,16 @@ module Rake
       RUBY_PLATFORM =~ /mswin/ ? 'nmake' : 'make'
     end
 
-    def binary
-      "#{@name}.#{RbConfig::CONFIG['DLEXT']}"
+    def binary(platform = nil)
+      ext = case platform
+        when /darwin/
+          'bundle'
+        when /mingw|mswin|linux/
+          'so'
+        else
+          RbConfig::CONFIG['DLEXT']
+      end
+      "#{@name}.#{ext}"
     end
 
     def source_files

data/tasks/bin/cross-ruby.rake

@@ -27,6 +27,18 @@ RUBY_CC_VERSION = "ruby-#{ENV['VERSION'] || '1.8.6-p287'}"
 # grab the major "1.8" or "1.9" part of the version number
 MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
 
+# Sorry!
+# On some systems (linux) you get i586 targets, on others i386 targets, at 
+# present, I only know to search for them.
+compilers = %w(i586-mingw32msvc-gcc i386-mingw32-gcc)
+paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+compiler = compilers.find do |comp|
+  paths.find do |path|
+    File.exist? File.join(path, comp)
+  end
+end
+MINGW_HOST = compiler[0..-5]
+
 # define a location where sources will be stored
 directory "#{USER_HOME}/sources/#{RUBY_CC_VERSION}"
 directory "#{USER_HOME}/builds/#{RUBY_CC_VERSION}"
@@ -45,7 +57,7 @@ CLOBBER.include("#{USER_HOME}/config.yml")
 file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.gz" => ["#{USER_HOME}/sources"] do |t|
   # download the source file using wget or curl
   chdir File.dirname(t.name) do
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
+    url = "http://ftp.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
     sh "wget #{url} || curl -O #{url}"
   end
 end
@@ -82,7 +94,7 @@ file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in" => ["#{USER_HOME}/sou
 end
 
 task :mingw32 do
-  unless File.exist?('/usr/bin/i586-mingw32msvc-gcc') then
+  unless MINGW_HOST then
     warn "You need to install mingw32 cross compile functionality to be able to continue."
     warn "Please refer to your distro documentation about installation."
     fail
@@ -103,10 +115,13 @@ file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/
 
   # set the configure options
   options = [
-    '--host=i586-mingw32msvc',
+    "--host=#{MINGW_HOST}",
     '--target=i386-mingw32',
     '--build=i686-linux',
-    '--enable-shared'
+    '--enable-shared',
+    '--disable-install-doc',
+    '--without-tk',
+    '--without-tcl'
   ]
 
   chdir File.dirname(t.name) do

data/tasks/common.rake

@@ -11,3 +11,6 @@ task :package => [:spec, :features]
 
 # make the release re-generate the gemspec if required
 task :release => [:gemspec]
+
+# publish documentation when doing a release
+task :release => [:publish]

data/tasks/gem.rake

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

data/tasks/news.rake

@@ -0,0 +1,80 @@
+begin
+  gem 'rubyforge', '~> 1.0.1'
+  require 'rubyforge'
+rescue Exception
+  nil
+end
+
+if defined?(RubyForge) then
+  if defined?(GEM_SPEC) then
+    desc 'Create news email file and post to RubyForge.'
+    task :announce do |t|
+      ver = ENV['VERSION'] or fail "Must supply VERSION (rake announce VERSION=x.y.z)."
+
+      # compare versions to avoid mistakes
+      unless ver == GEM_SPEC.version.to_s then
+        fail "Version mismatch (supplied and specification versions differ)."
+      end
+
+      # no homepage? why announce it then?!
+      if GEM_SPEC.homepage == 'TODO' or GEM_SPEC.homepage.nil? then
+        fail "Must define homepage in your gem specification."
+      end
+
+      # no rubyforge project? no release for you!
+      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
+        fail "Must define rubyforge_project in your gem specification."
+      end
+
+      # instantiate a RubyForge object
+      rf = RubyForge.new.configure
+
+      # read project info and overview
+      notes = begin
+                r = File.read("README.rdoc")
+                r.split(/^(=+ .*)/)[1..4].join.strip
+              rescue
+                warn "Missing README.rdoc"
+                ''
+              end
+
+      # read changes
+      changes = begin
+                  h = File.read("History.txt")
+                  h.split(/^(==.*)/)[1..2].join.strip
+                rescue
+                  warn "Missing History.txt"
+                  ''
+                end
+
+      # standard fields
+      subject = "#{GEM_SPEC.name} #{GEM_SPEC.version} Released"
+      title   = "#{GEM_SPEC.name} version #{GEM_SPEC.version} has been released!"
+      body    = "#{notes}\n\nChanges:\n\n#{changes}"
+      urls    = [GEM_SPEC.homepage, "http://rubyforge.org/projects/#{GEM_SPEC.rubyforge_project}"].map { |u| "* <#{u.strip}>" }.join("\n")
+
+      puts "Logging in RubyForge..."
+      rf.login
+
+      puts "Generating email.txt..."
+      File.open("email.txt", "w") do |mail|
+        mail.puts "Subject: [ANN] #{subject}"
+        mail.puts
+        mail.puts title
+        mail.puts 
+        mail.puts urls
+        mail.puts
+        mail.puts body
+      end
+      puts "Created email.txt"
+
+      puts "Posting news for #{GEM_SPEC.name} version #{GEM_SPEC.version}..."
+      rf.post_news GEM_SPEC.rubyforge_project, subject, "#{title}\n\n#{body}"
+      puts "Done."
+    end
+  else
+    warn "no GEM_SPEC is found or defined. 'announce' task cannot work without it."
+  end
+else
+  warn "rubyforge gem is required to generate announces, please install it (gem install rubyforge)."
+end

data/tasks/rdoc.rake

@@ -1,6 +1,6 @@
 require 'rake/rdoctask'
 
-Rake::RDocTask.new(:rdoc) do |rd|
+DOC = Rake::RDocTask.new(:rdoc) do |rd|
   rd.title    = 'rake-compiler -- Documentation'
   rd.main     = 'README.rdoc'
   rd.rdoc_dir = 'doc/api'

data/tasks/rdoc_publish.rake

@@ -0,0 +1,44 @@
+begin
+  gem 'rubyforge', '~> 1.0.1'
+  require 'rubyforge'
+rescue Exception
+  nil
+end
+
+if defined?(RubyForge) then
+  if defined?(DOC) && defined?(GEM_SPEC) then
+    desc "Publish RDoc to RubyForge"
+    task :publish => [:clobber_rdoc, :rdoc] do
+      config_file = File.expand_path('~/.rubyforge/user-config.yml')
+      fail "You need rubyforge properly configured." unless File.exist?(config_file)
+
+      # no rubyforge project? no release for you!
+      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
+        fail "Must define rubyforge_project in your gem specification."
+      end
+
+      # use YAML to load configuration file
+      config = YAML.load_file(config_file)
+
+      host = "#{config['username']}@rubyforge.org"
+      remote_dir = "/var/www/gforge-projects/#{GEM_SPEC.rubyforge_project}/"
+      local_dir = DOC.rdoc_dir
+
+      # use PuTTY pscp or scp on other platforms
+      ssh_exe = RUBY_PLATFORM =~ /mswin|mingw/ ? 'pscp' : 'scp'
+
+      # construct the command
+      cmd = [ssh_exe]
+      cmd << '-r' << '-q'  # recursive and quiet options
+      cmd << "#{local_dir}/*"
+      cmd << "#{host}:#{remote_dir}"
+
+      puts "Publishing RDocs to RubyForge..."
+      sh cmd.join(' ')
+    end
+  else
+    warn "You need a GEM_SPEC and DOC rdoc definitions present. task publish not defined."
+  end
+else
+  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
+end

data/tasks/release.rake

@@ -7,6 +7,7 @@ end
 
 if defined?(RubyForge) then
   if defined?(GEM_SPEC) then
+    desc 'Package and upload to RubyForge'
     task :release => [:clobber, :package] do |t|
       ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
 
@@ -50,12 +51,6 @@ if defined?(RubyForge) then
       # prepare configuration
       rf.configure config
 
-      # ensure this was not released before
-      releases = rf.autoconfig['release_ids']
-      if releases.has_key?(GEM_SPEC.name) and releases[GEM_SPEC.name][GEM_SPEC.version] then
-        fail "Release #{GEM_SPEC.version} already exist. Unable to release."
-      end
-
       files = FileList["pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version}*.*"].to_a
       fail "No files found for the release." if files.empty?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -05:00
+date: 2009-01-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,9 @@ files:
 - tasks/common.rake
 - tasks/cucumber.rake
 - tasks/gem.rake
+- tasks/news.rake
 - tasks/rdoc.rake
+- tasks/rdoc_publish.rake
 - tasks/release.rake
 - tasks/rspec.rake
 - Rakefile