Skip to content
This repository has been archived by the owner on Apr 5, 2021. It is now read-only.

Upgrading ruby to v.2.6.3 #74

Merged
merged 3 commits into from
Sep 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
test-odm:
<<: *shared
docker:
- image: circleci/ruby:2.3.8
- image: circleci/ruby:2.6.3
environment:
BUNDLE_JOBS: 3
BUNDLE_RETRY: 3
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.8
2.6.3
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.3.8'
ruby '2.6.3'

# Distribute your app as a gem
# gemspec
Expand Down
156 changes: 82 additions & 74 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,78 +1,80 @@
GEM
remote: https://rubygems.org/
specs:
actionview (5.2.3)
activesupport (= 5.2.3)
actionview (6.0.0)
activesupport (= 6.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (5.2.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
aws-sdk (2.1.11)
aws-sdk-resources (= 2.1.11)
aws-sdk-core (2.1.11)
zeitwerk (~> 2.1, >= 2.1.8)
aws-eventstream (1.0.3)
aws-sdk (2.11.349)
aws-sdk-resources (= 2.11.349)
aws-sdk-core (2.11.349)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.1.11)
aws-sdk-core (= 2.1.11)
blankslate (2.1.2.4)
aws-sdk-resources (2.11.349)
aws-sdk-core (= 2.11.349)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
builder (3.2.3)
byebug (5.0.0)
columnize (= 0.9.0)
cf-app-utils (0.4)
coderay (1.1.0)
columnize (0.9.0)
byebug (11.0.1)
cf-app-utils (0.6)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
diff-lcs (1.2.5)
dotenv (2.0.2)
elasticsearch (1.1.2)
elasticsearch-api (= 1.1.2)
elasticsearch-transport (= 1.1.2)
elasticsearch-api (1.1.2)
diff-lcs (1.3)
dotenv (2.7.5)
elasticsearch (5.0.5)
elasticsearch-api (= 5.0.5)
elasticsearch-transport (= 5.0.5)
elasticsearch-api (5.0.5)
multi_json
elasticsearch-transport (1.1.2)
elasticsearch-transport (5.0.5)
faraday
multi_json
enumerable-lazy (0.0.2)
erubi (1.8.0)
erubis (2.7.0)
ethon (0.10.1)
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.55.0)
faraday (0.9.2)
excon (0.66.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.9.17)
hashie (3.4.2)
ffi (1.11.1)
hashie (3.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.0.2)
multi_json (~> 1.0)
jmespath (1.4.0)
liquid (3.0.3)
liquify (0.2.7)
liquid (>= 2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.8.2)
method_source (0.9.2)
mime-types (2.99.3)
mini_mime (1.0.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
moneta (0.8.1)
multi_json (1.12.1)
multipart-post (2.0.0)
multi_json (1.13.1)
multipart-post (2.1.1)
mustermann19 (0.4.4)
enumerable-lazy
newrelic_rpm (3.18.1.330)
nokogiri (1.10.3)
newrelic_rpm (6.6.0.358)
nio4r (2.5.1)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
oj (2.12.13)
oj (3.9.1)
padrino (0.13.3.4)
padrino-admin (= 0.13.3.4)
padrino-cache (= 0.13.3.4)
Expand Down Expand Up @@ -108,61 +110,67 @@ GEM
padrino-core (= 0.13.3.4)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.6.1)
parslet (1.7.1)
blankslate (>= 2.0, <= 4.0)
pry (0.10.1)
parallel (1.17.0)
parslet (1.8.2)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.2.0)
byebug (~> 5.0)
method_source (~> 0.9.0)
pry-byebug (3.7.0)
byebug (~> 11.0)
pry (~> 0.10)
puma (3.10.0)
puma (4.1.0)
nio4r (~> 2.0)
rack (1.6.11)
rack-protection (1.5.4)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rake (10.4.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec_junit_formatter (0.3.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
ruby-prof (0.15.9)
safe_yaml (1.0.4)
sass (3.4.16)
ruby-prof (1.0.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slop (3.6.0)
stretchy (0.6.0)
elasticsearch (~> 1.0)
stretchy (0.7.0)
elasticsearch (~> 5.0)
excon (~> 0.45)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
typhoeus (1.1.2)
tilt (2.0.9)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
zeitwerk (2.1.10)

PLATFORMS
ruby
Expand Down Expand Up @@ -197,7 +205,7 @@ DEPENDENCIES
typhoeus

RUBY VERSION
ruby 2.3.8p459
ruby 2.6.3p62

BUNDLED WITH
1.17.1
1.17.2
2 changes: 1 addition & 1 deletion lib/data_magic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def self.init(options = {})
# logger.info "options: #{options.inspect}"
# logger.info "self.config: #{self.config.inspect}"
if self.config.nil? # only init once
::Aws.eager_autoload! # see https://github.com/aws/aws-sdk-ruby/issues/833
#::Aws.eager_autoload! # see https://github.com/aws/aws-sdk-ruby/issues/833
self.config = Config.new(s3: self.s3) # loads data.yaml
self.client # make sure we can set up the Elasticsearch client
self.index_data_if_needed unless options[:load_now] == false
Expand Down