Merge pull request #231 from taichi-ishitani/separated_version_file

Move declaration of VERSION to an individual file
zdavatz · Feb 28, 2019 · abb0a98 · abb0a98
2 parents 2a82287 + 99db364
commit abb0a98
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -49,6 +49,7 @@ lib/spreadsheet/link.rb
 lib/spreadsheet/note.rb
 lib/spreadsheet/noteObject.rb
 lib/spreadsheet/row.rb
+lib/spreadsheet/version.rb
 lib/spreadsheet/workbook.rb
 lib/spreadsheet/worksheet.rb
 lib/spreadsheet/writer.rb

diff --git a/lib/spreadsheet.rb b/lib/spreadsheet.rb
@@ -25,6 +25,7 @@
 #             8006 Zürich
 ###           Switzerland
 
+require 'spreadsheet/version'
 require 'spreadsheet/errors'
 
 require 'spreadsheet/excel/workbook'
@@ -44,10 +45,6 @@
 #  sheet.each do |row| puts row[0] end
 module Spreadsheet
 
-  ##
-  # The version of Spreadsheet you are using.
-  VERSION = '1.2.0'
-
   ##
   # Default client Encoding. Change this value if your application uses a
   # different Encoding:

diff --git a/lib/spreadsheet/version.rb b/lib/spreadsheet/version.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Spreadsheet
+  ##
+  # The version of Spreadsheet you are using.
+  VERSION = '1.2.0'
+end
diff --git a/spreadsheet.gemspec b/spreadsheet.gemspec
@@ -1,7 +1,7 @@
 # require File.join(File.dirname(__FILE__), 'lib', 'spreadsheet')
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'spreadsheet'
+require 'spreadsheet/version'
 
 Gem::Specification.new do |spec|
    spec.name        = "spreadsheet"

diff --git a/test/integration.rb b/test/integration.rb
@@ -36,7 +36,7 @@ def setup
     end
     def teardown
       Spreadsheet.client_encoding = 'UTF-8'
-      FileUtils.rm_r @var
+      FileUtils.rm_rf @var
     end
     def test_copy__identical__file_paths
       path = File.join @data, 'test_copy.xls'