diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-12 08:38:06 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-12 08:38:06 +0000 |
commit | 0593c6a510918ce0b6610d3f0d25748041658a55 (patch) | |
tree | 04bc4e3be7bb1366df6cec1d3e96a94787b763a6 | |
parent | c08f7b80889b531865e74bc5f573df8fa27f2088 (diff) | |
download | ruby-0593c6a510918ce0b6610d3f0d25748041658a55.tar.gz |
Merge csv-0.1.0 from upstream.
* csv.gemspec: Update release version.
* lib/csv.rb: Remove superfluous private clause.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/csv.gemspec | 30 | ||||
-rw-r--r-- | lib/csv.rb | 2 |
2 files changed, 17 insertions, 15 deletions
diff --git a/lib/csv.gemspec b/lib/csv.gemspec index 0800dfc3e8..9803af69dc 100644 --- a/lib/csv.gemspec +++ b/lib/csv.gemspec @@ -1,17 +1,21 @@ # frozen_string_literal: true -Gem::Specification.new do |s| - s.name = "csv" - s.version = '0.0.1' - s.date = '2017-01-30' - s.summary = "CSV Reading and Writing" - s.description = "the CSV library began its life as FasterCSV." - s.require_path = %w{lib} - s.files = %w{csv.rb} - s.required_ruby_version = ">= 2.5.0dev" +Gem::Specification.new do |spec| + spec.name = "csv" + spec.version = "0.1.0" + spec.date = "2017-09-12" + spec.authors = ["James Edward Gray II"] + spec.email = [nil] - s.authors = ["James Edward Gray II"] - s.email = [nil] - s.homepage = "https://www.ruby-lang.org" - s.license = "BSD-2-Clause" + spec.summary = "CSV Reading and Writing" + spec.description = "the CSV library began its life as FasterCSV." + spec.homepage = "https://github.com/ruby/csv" + spec.license = "BSD-2-Clause" + + spec.files = ["lib/csv.rb"] + spec.require_paths = ["lib"] + spec.required_ruby_version = ">= 2.5.0dev" + + spec.add_development_dependency "bundler", "~> 1.14" + spec.add_development_dependency "rake", "~> 12" end diff --git a/lib/csv.rb b/lib/csv.rb index f2e23875f5..1f616803aa 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -2297,8 +2297,6 @@ class CSV chunks.map { |chunk| chunk.encode(@encoding.name) }.join('') end - private - # # Returns the encoding of the internal IO object or the +default+ if the # encoding cannot be determined. |