diff --git a/Gemfile b/Gemfile index 8aeafba8bc316..34c8f5b82ba5c 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,6 @@ gem 'compass', '0.11.5' gem 'daemons', '1.1.0' gem 'diff-lcs', '1.1.2', :require => 'diff/lcs' gem 'erubis', '2.7.0' -gem 'fastercsv', '1.5.3' gem 'hairtrigger', '0.1.11' gem 'haml', '3.1.2' gem 'hashery', '1.3.0', :require => 'hashery/dictionary' @@ -105,6 +104,10 @@ if WINDOWS end end +if !ONE_NINE + gem 'fastercsv', '1.5.3' +end + # Non-standard Canvas extension to Bundler behavior -- load the Gemfiles from # plugins. Dir[File.join(File.dirname(__FILE__),'vendor/plugins/*/Gemfile')].each do |g| diff --git a/config/initializers/ruby_version_compat.rb b/config/initializers/ruby_version_compat.rb new file mode 100644 index 0000000000000..7a1d5c83751b2 --- /dev/null +++ b/config/initializers/ruby_version_compat.rb @@ -0,0 +1,7 @@ +# 1.9 has a built-in equivalent to fastercsv +if RUBY_VERSION > "1.9." + require 'csv' + FasterCSV = CSV +else + require 'fastercsv' +end diff --git a/lib/ext/array.rb b/lib/ext/array.rb index bf2a1842edfa9..01639a74357c3 100644 --- a/lib/ext/array.rb +++ b/lib/ext/array.rb @@ -17,7 +17,6 @@ # class Array - require "fastercsv" def to_csv(options = {}) if all? { |e| e.respond_to?(:to_row) } header_row = first.export_columns(options[:format]).to_csv diff --git a/lib/gradebook_csv_parser.rb b/lib/gradebook_csv_parser.rb index 1500c5e90f97f..5a4cb0d855263 100644 --- a/lib/gradebook_csv_parser.rb +++ b/lib/gradebook_csv_parser.rb @@ -17,7 +17,6 @@ # # This is used for the GradebookImporter -require 'fastercsv' require 'ostruct' class CSVParser diff --git a/lib/sis/csv/import.rb b/lib/sis/csv/import.rb index f9a80b8a99f0e..41d9fd15c03ba 100644 --- a/lib/sis/csv/import.rb +++ b/lib/sis/csv/import.rb @@ -16,7 +16,6 @@ # with this program. If not, see . # -require 'faster_csv' require 'zip/zip' module SIS diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake index 457a5799ff2c5..443dbf96de34b 100644 --- a/lib/tasks/rspec.rake +++ b/lib/tasks/rspec.rake @@ -1,5 +1,3 @@ -gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 - # Don't load rspec if running "rake gems:*" unless ARGV.any? {|a| a =~ /\Agems/}