From a2a224c8075852b5c6b2c1057f4994a9723a441d Mon Sep 17 00:00:00 2001 From: hpneo Date: Sun, 28 Jun 2020 16:09:22 -0500 Subject: [PATCH] Version 0.1.2: - Fix bug for relative paths - Updated `activeresource` to `5.1.1` - Updated `activesupport` to `6.0.3.1` - Moved development dependencies as dependencies --- CHANGELOG.md | 13 ++++++++++ Gemfile.lock | 42 ++++++++++++++++----------------- active_worksheet.gemspec | 8 +++---- lib/active_worksheet/base.rb | 4 ++-- lib/active_worksheet/version.rb | 2 +- 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3233f07..50a9f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.1.2] 2020-06-28 + +### Changed/Added +- Fix bug for relative paths +- Updated `activeresource` to `5.1.1` +- Updated `activesupport` to `6.0.3.1` +- Moved development dependencies as dependencies + +## [0.1.1] 2020-05-18 + +### Changed/Added +- Updated `rake` to `13.0.1` + ## [0.1.0] 2020-02-08 ### Changed/Added diff --git a/Gemfile.lock b/Gemfile.lock index 91ebf13..9af6c93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,11 @@ PATH remote: . specs: - active_worksheet (0.1.0) + active_worksheet (0.1.2) + activeresource (= 5.1.0) + activesupport (= 6.0.2.1) + google_drive (= 3.0.4) + workbook (= 0.8.1) GEM remote: https://rubygems.org/ @@ -30,11 +34,11 @@ GEM nokogiri (~> 1.8, >= 1.8.2) rubyzip (~> 1.2, >= 1.2.1) builder (3.2.4) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) declarative (0.0.10) declarative-option (0.1.0) diff-lcs (1.3) - faraday (0.17.3) + faraday (1.0.1) multipart-post (>= 1.2, < 3) google-api-client (0.36.4) addressable (~> 2.5, >= 2.5.1) @@ -48,30 +52,30 @@ GEM google-api-client (>= 0.11.0, < 0.37.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.13.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) + signet (~> 0.14) htmlentities (4.3.4) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) json (2.3.0) jwt (2.2.1) memoist (0.16.2) - mimemagic (0.3.4) + mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) multi_json (1.14.1) multipart-post (2.1.1) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - os (1.0.1) - public_suffix (4.0.3) + os (1.1.0) + public_suffix (4.0.5) rake (13.0.1) rchardet (1.8.0) representable (3.0.4) @@ -94,15 +98,15 @@ GEM rspec-support (3.8.2) ruby-ole (1.2.12.2) rubyzip (1.3.0) - signet (0.12.0) + signet (0.14.0) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) spreadsheet (1.2.6) ruby-ole (>= 1.0) thread_safe (0.3.6) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) uber (0.1.0) workbook (0.8.1) @@ -111,20 +115,16 @@ GEM nokogiri (~> 1.8) rchardet (~> 1.3) spreadsheet (~> 1.1) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES active_worksheet! - activeresource (= 5.1.0) - activesupport (= 6.0.2.1) bundler (~> 2.0) - google_drive (= 3.0.4) rake (~> 13.0) rspec (~> 3.0) - workbook (= 0.8.1) BUNDLED WITH - 2.0.2 + 2.1.4 diff --git a/active_worksheet.gemspec b/active_worksheet.gemspec index d38b43b..c964d28 100644 --- a/active_worksheet.gemspec +++ b/active_worksheet.gemspec @@ -31,8 +31,8 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.0" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "activesupport", "6.0.2.1" - spec.add_development_dependency "activeresource", "5.1.0" - spec.add_development_dependency "workbook", "0.8.1" - spec.add_development_dependency "google_drive", "3.0.4" + spec.add_dependency "activesupport", "6.0.2.1" + spec.add_dependency "activeresource", "5.1.0" + spec.add_dependency "workbook", "0.8.1" + spec.add_dependency "google_drive", "3.0.4" end diff --git a/lib/active_worksheet/base.rb b/lib/active_worksheet/base.rb index 58a4f08..b874d26 100644 --- a/lib/active_worksheet/base.rb +++ b/lib/active_worksheet/base.rb @@ -34,7 +34,7 @@ def count def adapter if is_source_local? - ActiveWorksheet::Adapters::FileAdapter.new(source: source) + ActiveWorksheet::Adapters::FileAdapter.new(source: File.expand_path(source)) else ActiveWorksheet::Adapters::GoogleSheetsAdapter.new( source: source, @@ -44,7 +44,7 @@ def adapter end def is_source_local? - self.source.is_a?(File) || File.exists?(self.source) + self.source.is_a?(File) || File.exists?(File.expand_path(self.source)) end def is_source_remote? diff --git a/lib/active_worksheet/version.rb b/lib/active_worksheet/version.rb index cf2e983..8f2df93 100644 --- a/lib/active_worksheet/version.rb +++ b/lib/active_worksheet/version.rb @@ -1,3 +1,3 @@ module ActiveWorksheet - VERSION = "0.1.1" + VERSION = "0.1.2" end