From 489b92790747184b117922973923cf1c1e980532 Mon Sep 17 00:00:00 2001 From: Dan McClain Date: Tue, 4 Sep 2012 11:07:22 -0400 Subject: [PATCH] Trying to fix travis build --- .gitignore | 1 + .travis.yml | 5 ++--- Rakefile | 8 ++++++-- lib/pg_array_parser.rb | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 98a45ab..b46c52b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ tmp benchmark.rb bin/* .rbenv-version +lib/pg_array_parser.bundle diff --git a/.travis.yml b/.travis.yml index b5f65ab..6554da1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ rvm: - 1.9.3 - jruby-18mode - jruby-19mode -before_script: - - rake install notifications: - email: false + email: + - travis@danmcclain.net diff --git a/Rakefile b/Rakefile index 053a2b4..f05d643 100644 --- a/Rakefile +++ b/Rakefile @@ -6,10 +6,14 @@ require 'rspec/core/rake_task' spec = Gem::Specification.load('pg_array_parser.gemspec') if RUBY_PLATFORM =~ /java/ - require 'rake/javaextensiontask' - Rake::JavaExtensionTask.new('pg_array_parser', spec) + require 'rake/javaextensiontask' + Rake::JavaExtensionTask.new('pg_array_parser', spec) +else + require 'rake/extensiontask' + Rake::ExtensionTask.new('pg_array_parser', spec) end +task :install => :compile task :spec => :install RSpec::Core::RakeTask.new(:spec) diff --git a/lib/pg_array_parser.rb b/lib/pg_array_parser.rb index 2ebad7e..ca42a20 100644 --- a/lib/pg_array_parser.rb +++ b/lib/pg_array_parser.rb @@ -1,5 +1,4 @@ require File.expand_path('../pg_array_parser/version', __FILE__) -require File.expand_path('../pg_array_parser', __FILE__) if RUBY_PLATFORM =~ /java/ module PgArrayParser