slim_scrooge 1.0.4 → 1.0.5

data/README.textile

@@ -20,7 +20,7 @@ In future releases I expect further gains.
 
 h2. Installation
 
-Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.  (Ruby 1.9 to be tested)
+Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.
 
 <pre>
   # if you haven't already, add gemcutter to your gem sources
@@ -30,7 +30,7 @@ Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.  (Ruby 1.9 to be tested)
   sudo gem install slim_scrooge
 </pre>
 
-If the C extension does not build (perhaps you are on windows and do not have a C compiler), then do not worry - SlimScrooge has a second way of generating callsite information.  Ignore the error and carry on with the next step.
+Note that the C extension will only build in MRI Ruby 1.8 on non-windows at present, but do not worry, for other platforms the backup callsite mechanism is used.
 
 Next add this to your Rails::Initializer section in environment.rb:
 

data/Rakefile

@@ -20,7 +20,7 @@ begin
     s.description = "Slim scrooge boosts speed in Rails ActiveRecord Models by only querying the database for what is needed."
     s.authors = ["Stephen Sykes"]
     s.files = FileList["[A-Z]*", "{ext,lib,test}/**/*"]
-    s.extensions = "ext/extconf.rb"
+    s.extensions = "ext/Rakefile"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 1
 :build: 
 :minor: 0

data/ext/Rakefile

@@ -0,0 +1,42 @@
+task :default=>[:build]
+
+task :build do
+  # only try to install extension on non windows / MRI 1.8
+  unless /mswin/ =~ RUBY_PLATFORM || RUBY_VERSION >= "1.9" || defined?(RUBY_ENGINE) && RUBY_ENGINE != "ruby"
+    require 'rbconfig'
+
+    ruby = File.join(Config::CONFIG["bindir"],
+    Config::CONFIG["RUBY_INSTALL_NAME"])
+    ruby << Config::CONFIG["EXEEXT"]
+
+    # escape string in case path to ruby executable contain spaces.
+    ruby.sub!(/.*\s.*/m, '"\&"')
+
+    results = `#{ruby} extconf.rb`
+
+    unless File.exist? 'Makefile'
+      raise "Makefile not found:\n\n#{results.join "\n"}" 
+    end
+
+    dest_path = ENV["RUBYARCHDIR"]
+
+    mf = File.read('Makefile')
+    mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
+    mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
+
+    File.open('Makefile', 'wb') {|f| f.print mf}
+
+    make_program = ENV['make']
+    unless make_program
+      make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+    end
+
+    ['', ' install'].each do |target|
+      cmd = "#{make_program}#{target}"
+      results << cmd + "\n"
+      results << `#{cmd}`
+
+      raise "make#{target} failed:\n\n#{results}" unless $?.success?
+    end
+  end
+end

data/ext/extconf.rb

@@ -3,5 +3,3 @@ require 'mkmf'
 dir_config('callsite_hash')
 
 create_makefile('callsite_hash')
-
-$defs.push("-DRUBY18") if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slim_scrooge
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 +02:00
+date: 2010-02-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -18,13 +18,14 @@ email: sdsykes@gmail.com
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/Rakefile
 extra_rdoc_files: 
 - README.textile
 files: 
 - README.textile
 - Rakefile
 - VERSION.yml
+- ext/Rakefile
 - ext/callsite_hash.c
 - ext/extconf.rb
 - lib/slim_scrooge.rb