spreadsheet 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4a92af840a7af1a6640edef4e4e2a290bf8632
-  data.tar.gz: ea4959a7697ef5b0d8be64d2767ea5bd612b3a48
+  metadata.gz: 791f3a7c891c29fee7506b00457311bc4fcc1fe6
+  data.tar.gz: bbf63401258ae34e9bcc81fc9bfe479d89d48356
 SHA512:
-  metadata.gz: 9ccf4a07cc9c9a246b87558112c76fc6164b63ed19ea2f56b91fad362eaca4cc8364f69379044e599320520953ac423ebb42afcd707489061834d9f0e756b1bb
-  data.tar.gz: 7515a6058723bf813700c5ec22dc71adba0fb3d3bfcd9e1d0ee7d52d0acb704e7f500276ceb07510d07ff6e39cb5023ad346ea9159e1c2a96879786054beef49
+  metadata.gz: bc5be7f5f24bc8f63388765f5eba89166db17406cad72c72c095537e1f7de9e32c8d22c365017eaba1725661c583eb4369bb2500f77046b35996fdfe372e296e
+  data.tar.gz: 9d254c82d041143d28f5e2447d230439d040836a7bc6e1014934290c93cfda6921de11b030d5e695784c48b1ef4e6c506737214639695962a6bff98d7ce0c0a2

data/.travis.yml

@@ -2,12 +2,17 @@ language: ruby
 sudo: false
 cache: bundler
 before_install:
-  - gem install bundler -v 1.17.3 --no-document
+  - "if $(ruby -e 'exit(RUBY_VERSION >= \"2.3.0\")'); then env -u RUBYOPT gem update --system; fi"
+  - "if $(ruby -e 'exit(RUBY_VERSION >= \"2.3.0\")'); then env -u RUBYOPT gem install bundler --no-document; fi"
+  - "if $(ruby -e 'exit(RUBY_VERSION <  \"2.3.0\")'); then gem install bundler -v 1.17.3 --no-document; fi"
 bundler_args: --binstubs
 script: "bundle exec ruby test/suite.rb"
 rvm:
   - ruby-head
-  - 2.3.3
+  - 2.6.1
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
   - 2.2.6
   - 2.1.10
   - 2.0.0
@@ -21,6 +26,13 @@ rvm:
   - jruby-18mode
   - ree
 matrix:
+  include:
+    - rvm: 2.4.5
+      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
+    - rvm: 2.5.3
+      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
+    - rvm: 2.6.1
+      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
   allow_failures:
     - rvm: ruby-head
     - rvm: rbx-19mode
@@ -29,8 +41,11 @@ matrix:
     - rvm: jruby-19mode
     - rvm: jruby-18mode
     - rvm: ree
-notifications:
-  email:
-    recipients:
-      - yasaka@ywesee.com
-      - zdavatz@ywesee.com
+#notifications:
+#  email:
+#    recipients:
+#      - yasaka@ywesee.com
+#      - zdavatz@ywesee.com
+
+email:
+  false # temp

data/Gemfile

@@ -1,5 +1,16 @@
 source "https://rubygems.org"
-gem 'ruby-ole'
+
+if ENV['USE_LATEST_RUBY_OLE']
+  if Dir.exist?('../ruby-ole')
+    gem 'ruby-ole', :path => '../ruby-ole'
+  else
+    gem 'ruby-ole',
+      :git => 'https://github.com/taichi-ishitani/ruby-ole.git',
+      :branch => 'support_frozen_string_literal'
+  end
+else
+  gem 'ruby-ole'
+end
 
 if RUBY_VERSION.to_f > 2.0
   gem 'test-unit'

data/Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     hoe (3.17.1)
       rake (>= 0.8, < 13.0)
-    minitest (5.8.2)
-    power_assert (0.2.4)
-    rake (10.5.0)
+    minitest (5.10.1)
+    power_assert (1.0.1)
+    rake (12.3.0)
     ruby-ole (1.2.12.1)
-    test-unit (3.1.5)
+    test-unit (3.2.3)
       power_assert
 
 PLATFORMS
@@ -20,4 +20,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.17.2
+   1.14.6

data/History.md

@@ -1,4 +1,14 @@
-### 1.2.1 28.2.2019
+### 1.2.2 01.03.2019
+Author: taichi <taichi730@gmail.com>
+Date:   Fri Mar 1 13:00:28 2019 +0900
+
+* fixed unit test errors caused by frozen-string-literal
+* removed ruby 2.3.8 with frozen-string-literal from CI regression
+  (It seems that standard libraries for this version does not support the
+  feature enough.)
+* enable '--enable-frozen-string-literal' option on CI test
+
+### 1.2.1 28.02.2019
 Author: taichi <taichi730@gmail.com>
 Date:   Thu Feb 28 10:30:46 2019 +0900
 

data/lib/spreadsheet/excel/reader.rb

@@ -56,7 +56,7 @@ class Reader
       ## remove two bits
       integer, = work.unpack 'V'
       integer &= 0xfffffffc
-      value, = ("\0\0\0\0" << [integer].pack('V')).unpack EIGHT_BYTE_DOUBLE
+      value, = ("\0\0\0\0" +  [integer].pack('V')).unpack EIGHT_BYTE_DOUBLE
     else
       ## I can't find a format for unpacking a little endian signed integer.
       #  'V' works for packing, but not for unpacking. But the following works

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -209,7 +209,7 @@ class Workbook < Spreadsheet::Writer
             oldoffset = positions.min - len
             lastpos = pos + len
             bytechange = 0
-            buffer = StringIO.new ''
+            buffer = StringIO.new ''.dup
             if tuple = workbook.offsets[:sst]
               write_sst_changes workbook, buffer, writer.pos,
                                 sst_total, sst_strings
@@ -396,7 +396,7 @@ class Workbook < Spreadsheet::Writer
     sanitize_worksheets workbook.worksheets
     collect_formats workbook
     sheets = worksheets workbook
-    buffer1 = StringIO.new ''
+    buffer1 = StringIO.new ''.dup
     # ●  BOF Type = workbook globals (➜ 6.8)
     write_bof workbook, buffer1, :globals
     # ○  File Protection Block ➜ 4.19
@@ -441,7 +441,7 @@ class Workbook < Spreadsheet::Writer
     # ○  USESELFS ➜ 5.106
     buffer1.rewind
     # ●● BOUNDSHEET ➜ 5.95
-    buffer2 = StringIO.new ''
+    buffer2 = StringIO.new ''.dup
     # ○  COUNTRY ➜ 5.22
     # ○  Link Table ➜ 4.10.3
     # ○○ NAME ➜ 6.66

data/lib/spreadsheet/excel/writer/worksheet.rb

@@ -20,7 +20,7 @@ class Worksheet
   def initialize workbook, worksheet
     @workbook = workbook
     @worksheet = worksheet
-    @io = StringIO.new ''
+    @io = StringIO.new ''.dup
     @biff_version = 0x0600
     @bof = 0x0809
     @build_id = 3515
@@ -642,7 +642,7 @@ and minimal code that generates this warning. Thanks!
   ##
   # Write multiple consecutive cells with RK values (see #write_rk)
   def write_mulrk row, idx, multiples
-    fmt = 'v2'
+    fmt = ['v2']
     data = [
       row.idx, # Index to row
       idx, # Index to first column (fc)
@@ -655,7 +655,7 @@ and minimal code that generates this warning. Thanks!
     end
     # Index to last column (lc)
     data.push idx + multiples.size - 1
-    write_op opcode(:mulrk), data.pack(fmt << 'v')
+    write_op opcode(:mulrk), data.pack((fmt << 'v').join)
   end
   def write_multiples row, idx, multiples
     case multiples.last

data/lib/spreadsheet/version.rb

@@ -3,5 +3,5 @@
 module Spreadsheet
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/test/integration.rb

@@ -506,7 +506,7 @@ module Spreadsheet
       assert_equal 3, sheets.size
       sheet = book.worksheet 0
       assert_instance_of Excel::Worksheet, sheet
-      str = "S\000h\000e\000e\000t\0001\000"
+      str = "S\000h\000e\000e\000t\0001\000".dup
       if RUBY_VERSION >= '1.9'
         str.force_encoding 'UTF-16LE' if str.respond_to?(:force_encoding)
       end
@@ -730,7 +730,7 @@ module Spreadsheet
       book = Spreadsheet::Excel::Workbook.new
       sheet = book.create_worksheet :name => 'My Worksheet'
       sheet[0,0] = 'my cell'
-      data = StringIO.new ''
+      data = StringIO.new ''.dup
       assert_nothing_raised do
         book.write data
       end
@@ -829,7 +829,7 @@ module Spreadsheet
       assert_equal 2, book.worksheets.size
       sheet = book.worksheets.first
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
-      name = "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000"
+      name = "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000".dup
       name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
       assert_equal name, sheet.name
       assert_not_nil sheet.offset
@@ -926,7 +926,7 @@ module Spreadsheet
       assert_equal 40, sheet1.row(11).height
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
       sheet = book.worksheets.last
-      name = "m\000y\000 \000n\000a\000m\000e\000"
+      name = "m\000y\000 \000n\000a\000m\000e\000".dup
       name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
       assert_equal name, sheet.name
       assert_not_nil sheet.offset
@@ -1212,7 +1212,7 @@ module Spreadsheet
       sheet = book.create_worksheet
       (0..200).each { |i| sheet.row(i).push "ëçáéíóú" }
       assert_nothing_raised do
-        book.write StringIO.new("", "w+")
+        book.write StringIO.new("".dup, "w+")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole