rake-compiler 0.7.8 → 0.7.9

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.7.9 / 2011-06-08
+
+* Enhancements:
+  * Consistently use RubyGems features available since version 1.3.2 and avoid
+    deprecation warnings with Rake > 0.8.7.
+
+* Bugfixes:
+  * Use correct platform in fake.rb. Pull #39 [kou]
+  * Workaround Gem::Specification and Gem::PackageTask limitations. Closes #43
+
 === 0.7.8 / 2011-04-26
 
 * Enhancements:

data/Isolate

@@ -1,6 +1,6 @@
 gem 'rake'
-gem 'rspec', '~> 1.3.1'
-gem 'cucumber', '~> 0.9.4'
+gem 'rspec', '~> 2.6.0'
+gem 'cucumber', '~> 0.10.6'
 
 unless RUBY_PLATFORM =~ /java/
   gem 'rcov', '~> 0.9.9'

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'cucumber'
-require 'spec'
+require 'rspec'
 require 'fileutils'
 require 'rbconfig'
 

data/features/support/file_template_helpers.rb

@@ -14,18 +14,17 @@ EOF
 
   def template_rake_gemspec(gem_name)
     <<-EOF
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 SPEC = Gem::Specification.new do |s|
   s.name = "#{gem_name}"
   s.version = "0.1.0"
   s.summary = "#{gem_name} test gem for rake-compiler"
+  s.description = "#{gem_name} is a fake gem for testing under rake-compiler"
 
   s.files = FileList["ext/**/*.{rb,c,h}", "Rakefile", "tasks/*.rake", "lib/**/*.rb"]
 
   s.extensions = FileList["ext/**/extconf.rb"]
 
-  s.has_rdoc = true
-
   s.homepage = 'http://github.com/luislavena/rake-compiler'
   s.rubyforge_project = 'TODO'
 
@@ -33,7 +32,7 @@ SPEC = Gem::Specification.new do |s|
   s.email = ["luislavena@gmail.com"]
 end
 
-gem_package = Rake::GemPackageTask.new(SPEC) do |pkg|
+Gem::PackageTask.new(SPEC) do |pkg|
   pkg.need_zip = false
   pkg.need_tar = false
 end

data/lib/rake/baseextensiontask.rb

@@ -14,8 +14,6 @@ require 'yaml'
 require 'pathname'
 
 module Rake
-  autoload :GemPackageTask, 'rake/gempackagetask'
-
   class BaseExtensionTask < TaskLib
 
     attr_accessor :name

data/lib/rake/extensiontask.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rake/baseextensiontask'
+require "rubygems/package_task"
 
 # Define a series of tasks to aid in the compilation of C extensions for
 # gem developer/creators.
@@ -186,9 +187,10 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       # create 'native:gem_name' and chain it to 'native' task
       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
+          # FIXME: workaround Gem::Specification limitation around cache_file:
+          # http://github.com/rubygems/rubygems/issues/78
           spec = gem_spec.dup
+          spec.instance_variable_set(:"@cache_file", nil) if spec.respond_to?(:cache_file)
 
           # adjust to specified platform
           spec.platform = Gem::Platform.new(platf)
@@ -213,7 +215,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
           end
 
           # Generate a package for this gem
-          gem_package = Rake::GemPackageTask.new(spec) do |pkg|
+          Gem::PackageTask.new(spec) do |pkg|
             pkg.need_zip = false
             pkg.need_tar = false
           end
@@ -311,7 +313,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       # genearte fake.rb for different ruby versions
       file "#{tmp_path}/fake.rb" do |t|
         File.open(t.name, 'w') do |f|
-          f.write fake_rb(ruby_ver)
+          f.write fake_rb(for_platform, ruby_ver)
         end
       end
 
@@ -381,13 +383,13 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       [*@cross_platform].map { |p| "native:#{p}" }
     end
 
-    def fake_rb(version)
+    def fake_rb(platform, version)
       <<-FAKE_RB
         class Object
           remove_const :RUBY_PLATFORM
           remove_const :RUBY_VERSION
           remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
-          RUBY_PLATFORM = "i386-mingw32"
+          RUBY_PLATFORM = "#{platform}"
           RUBY_VERSION = "#{version}"
           RUBY_DESCRIPTION = "ruby \#{RUBY_VERSION} (\#{RUBY_RELEASE_DATE}) [\#{RUBY_PLATFORM}]"
         end

data/lib/rake/javaextensiontask.rb

@@ -134,9 +134,10 @@ execute the Rake compilation task using the JRuby interpreter.
 
       if @gem_spec && !Rake::Task.task_defined?("java:#{@gem_spec.name}")
         task "java:#{@gem_spec.name}" do |t|
-
-          # FIXME: truly duplicate the Gem::Specification
+          # FIXME: workaround Gem::Specification limitation around cache_file:
+          # http://github.com/rubygems/rubygems/issues/78
           spec = gem_spec.dup
+          spec.instance_variable_set(:"@cache_file", nil) if spec.respond_to?(:cache_file)
 
           # adjust to specified platform
           spec.platform = Gem::Platform.new('java')
@@ -161,7 +162,7 @@ execute the Rake compilation task using the JRuby interpreter.
           end
 
           # Generate a package for this gem
-          gem_package = Rake::GemPackageTask.new(spec) do |pkg|
+          Gem::PackageTask.new(spec) do |pkg|
             pkg.need_zip = false
             pkg.need_tar = false
           end

data/spec/spec_helper.rb

@@ -1,19 +1,14 @@
-# add lib directory to the search path
-libdir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 
 # Console redirection helper
-require File.expand_path(File.join(File.dirname(__FILE__), 'support/capture_output_helper'))
+require File.expand_path('../support/capture_output_helper', __FILE__)
 
-Spec::Runner.configure do |config|
-  include CaptureOutputHelper
+RSpec.configure do |config|
+  config.include CaptureOutputHelper
 end
 
 # Rake::Task matcher helper
-Spec::Matchers.define :have_defined do |task|
+RSpec::Matchers.define :have_defined do |task|
   match do |tasks|
     tasks.task_defined?(task)
   end

data/tasks/common.rake

@@ -1,7 +1,7 @@
 require 'rake/clean'
 
 # common pattern cleanup
-CLEAN.include('tmp')
+CLOBBER.include('tmp')
 
 # set default task
 task :default => [:spec, :features]

data/tasks/gem.rake

@@ -3,7 +3,7 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.7.8"
+  s.version     = "0.7.9"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -18,8 +18,8 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.add_dependency  'rake'
 
   # development dependencies
-  s.add_development_dependency 'rspec', '~> 1.3.1'
-  s.add_development_dependency 'cucumber', '~> 0.9.4'
+  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'cucumber', '~> 0.10.6'
   #s.add_development_dependency 'rcov', '~> 0.9.9'
 
   # components, files and paths

data/tasks/release.rake

@@ -1,5 +1,5 @@
 desc 'Package gems and upload to RubyGems'
-task :release, :version, :needs => [:package] do |t, args|
+task :release, [:version] => [:package] do |t, args|
   args.with_defaults(:version => "")
   ver = args.version
 

data/tasks/rspec.rake

@@ -1,5 +1,5 @@
 begin
-  require 'spec/rake/spectask'
+  require "rspec/core/rake_task"
 
   begin
     require 'rcov'
@@ -11,21 +11,16 @@ rescue LoadError
   warn "RSpec gem is required, please install it (gem install rspec)."
 end
 
-if defined?(Spec)
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts   = ["--options", "spec/spec.opts"]
-    t.spec_files  = FileList["spec/**/*_spec.rb"]
-  end
+if defined?(RSpec::Core::RakeTask)
+  RSpec::Core::RakeTask.new(:spec)
 
   if defined?(Rcov)
     CLOBBER.include('coverage')
 
     namespace :spec do
       desc "Run all specs in spec directory with RCov"
-      Spec::Rake::SpecTask.new(:rcov) do |t|
-        t.spec_opts   = ["--options", "spec/spec.opts"]
-        t.spec_files  = FileList["spec/**/*_spec.rb"]
-        t.rcov        = true
+      RSpec::Core::RakeTask.new(:rcov) do |t|
+        t.rcov = true
         t.rcov_opts   = ["--exclude", "spec/*,features/*,gems/*"]
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Luis Lavena
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -39,12 +39,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 59
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 10
+        - 6
+        version: 0.10.6
   type: :development
   version_requirements: *id003
 description: |-
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake-compiler
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby Extension (C, Java) task generator.