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

Commit c1e8d4e

Browse files
authored
Merge pull request #74 from RTICWDT/dev-upgrade-ruby
Upgrading ruby to v.2.6.3
2 parents 0f48352 + 47f80d1 commit c1e8d4e

File tree

5 files changed

+86
-78
lines changed

5 files changed

+86
-78
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
test-odm:
4545
<<: *shared
4646
docker:
47-
- image: circleci/ruby:2.3.8
47+
- image: circleci/ruby:2.6.3
4848
environment:
4949
BUNDLE_JOBS: 3
5050
BUNDLE_RETRY: 3

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.8
1+
2.6.3

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '2.3.8'
2+
ruby '2.6.3'
33

44
# Distribute your app as a gem
55
# gemspec

Gemfile.lock

Lines changed: 82 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,80 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionview (5.2.3)
5-
activesupport (= 5.2.3)
4+
actionview (6.0.0)
5+
activesupport (= 6.0.0)
66
builder (~> 3.1)
77
erubi (~> 1.4)
88
rails-dom-testing (~> 2.0)
9-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
10-
activesupport (5.2.3)
9+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
10+
activesupport (6.0.0)
1111
concurrent-ruby (~> 1.0, >= 1.0.2)
1212
i18n (>= 0.7, < 2)
1313
minitest (~> 5.1)
1414
tzinfo (~> 1.1)
15-
aws-sdk (2.1.11)
16-
aws-sdk-resources (= 2.1.11)
17-
aws-sdk-core (2.1.11)
15+
zeitwerk (~> 2.1, >= 2.1.8)
16+
aws-eventstream (1.0.3)
17+
aws-sdk (2.11.349)
18+
aws-sdk-resources (= 2.11.349)
19+
aws-sdk-core (2.11.349)
20+
aws-sigv4 (~> 1.0)
1821
jmespath (~> 1.0)
19-
aws-sdk-resources (2.1.11)
20-
aws-sdk-core (= 2.1.11)
21-
blankslate (2.1.2.4)
22+
aws-sdk-resources (2.11.349)
23+
aws-sdk-core (= 2.11.349)
24+
aws-sigv4 (1.1.0)
25+
aws-eventstream (~> 1.0, >= 1.0.2)
2226
builder (3.2.3)
23-
byebug (5.0.0)
24-
columnize (= 0.9.0)
25-
cf-app-utils (0.4)
26-
coderay (1.1.0)
27-
columnize (0.9.0)
27+
byebug (11.0.1)
28+
cf-app-utils (0.6)
29+
coderay (1.1.2)
2830
concurrent-ruby (1.1.5)
2931
crass (1.0.4)
30-
diff-lcs (1.2.5)
31-
dotenv (2.0.2)
32-
elasticsearch (1.1.2)
33-
elasticsearch-api (= 1.1.2)
34-
elasticsearch-transport (= 1.1.2)
35-
elasticsearch-api (1.1.2)
32+
diff-lcs (1.3)
33+
dotenv (2.7.5)
34+
elasticsearch (5.0.5)
35+
elasticsearch-api (= 5.0.5)
36+
elasticsearch-transport (= 5.0.5)
37+
elasticsearch-api (5.0.5)
3638
multi_json
37-
elasticsearch-transport (1.1.2)
39+
elasticsearch-transport (5.0.5)
3840
faraday
3941
multi_json
4042
enumerable-lazy (0.0.2)
4143
erubi (1.8.0)
4244
erubis (2.7.0)
43-
ethon (0.10.1)
45+
ethon (0.12.0)
4446
ffi (>= 1.3.0)
45-
excon (0.55.0)
46-
faraday (0.9.2)
47+
excon (0.66.0)
48+
faraday (0.15.4)
4749
multipart-post (>= 1.2, < 3)
48-
ffi (1.9.17)
49-
hashie (3.4.2)
50+
ffi (1.11.1)
51+
hashie (3.6.0)
5052
i18n (0.9.5)
5153
concurrent-ruby (~> 1.0)
52-
jmespath (1.0.2)
53-
multi_json (~> 1.0)
54+
jmespath (1.4.0)
5455
liquid (3.0.3)
5556
liquify (0.2.7)
5657
liquid (>= 2.2.2)
5758
loofah (2.2.3)
5859
crass (~> 1.0.2)
5960
nokogiri (>= 1.5.9)
60-
mail (2.7.0)
61+
mail (2.7.1)
6162
mini_mime (>= 0.1.1)
62-
method_source (0.8.2)
63+
method_source (0.9.2)
6364
mime-types (2.99.3)
64-
mini_mime (1.0.0)
65+
mini_mime (1.0.2)
6566
mini_portile2 (2.4.0)
6667
minitest (5.11.3)
6768
moneta (0.8.1)
68-
multi_json (1.12.1)
69-
multipart-post (2.0.0)
69+
multi_json (1.13.1)
70+
multipart-post (2.1.1)
7071
mustermann19 (0.4.4)
7172
enumerable-lazy
72-
newrelic_rpm (3.18.1.330)
73-
nokogiri (1.10.3)
73+
newrelic_rpm (6.6.0.358)
74+
nio4r (2.5.1)
75+
nokogiri (1.10.4)
7476
mini_portile2 (~> 2.4.0)
75-
oj (2.12.13)
77+
oj (3.9.1)
7678
padrino (0.13.3.4)
7779
padrino-admin (= 0.13.3.4)
7880
padrino-cache (= 0.13.3.4)
@@ -108,61 +110,67 @@ GEM
108110
padrino-core (= 0.13.3.4)
109111
padrino-support (0.13.3.4)
110112
activesupport (>= 3.1)
111-
parallel (1.6.1)
112-
parslet (1.7.1)
113-
blankslate (>= 2.0, <= 4.0)
114-
pry (0.10.1)
113+
parallel (1.17.0)
114+
parslet (1.8.2)
115+
pry (0.12.2)
115116
coderay (~> 1.1.0)
116-
method_source (~> 0.8.1)
117-
slop (~> 3.4)
118-
pry-byebug (3.2.0)
119-
byebug (~> 5.0)
117+
method_source (~> 0.9.0)
118+
pry-byebug (3.7.0)
119+
byebug (~> 11.0)
120120
pry (~> 0.10)
121-
puma (3.10.0)
121+
puma (4.1.0)
122+
nio4r (~> 2.0)
122123
rack (1.6.11)
123-
rack-protection (1.5.4)
124+
rack-protection (1.5.5)
124125
rack
125-
rack-test (0.6.3)
126-
rack (>= 1.0)
126+
rack-test (1.1.0)
127+
rack (>= 1.0, < 3)
127128
rails-dom-testing (2.0.3)
128129
activesupport (>= 4.2.0)
129130
nokogiri (>= 1.6)
130-
rails-html-sanitizer (1.0.4)
131+
rails-html-sanitizer (1.2.0)
131132
loofah (~> 2.2, >= 2.2.2)
132-
rake (10.4.2)
133-
rspec (3.3.0)
134-
rspec-core (~> 3.3.0)
135-
rspec-expectations (~> 3.3.0)
136-
rspec-mocks (~> 3.3.0)
137-
rspec-core (3.3.2)
138-
rspec-support (~> 3.3.0)
139-
rspec-expectations (3.3.1)
133+
rake (12.3.3)
134+
rb-fsevent (0.10.3)
135+
rb-inotify (0.10.0)
136+
ffi (~> 1.0)
137+
rspec (3.8.0)
138+
rspec-core (~> 3.8.0)
139+
rspec-expectations (~> 3.8.0)
140+
rspec-mocks (~> 3.8.0)
141+
rspec-core (3.8.2)
142+
rspec-support (~> 3.8.0)
143+
rspec-expectations (3.8.4)
140144
diff-lcs (>= 1.2.0, < 2.0)
141-
rspec-support (~> 3.3.0)
142-
rspec-mocks (3.3.2)
145+
rspec-support (~> 3.8.0)
146+
rspec-mocks (3.8.1)
143147
diff-lcs (>= 1.2.0, < 2.0)
144-
rspec-support (~> 3.3.0)
145-
rspec-support (3.3.0)
146-
rspec_junit_formatter (0.3.0)
148+
rspec-support (~> 3.8.0)
149+
rspec-support (3.8.2)
150+
rspec_junit_formatter (0.4.1)
147151
rspec-core (>= 2, < 4, != 2.12.0)
148-
ruby-prof (0.15.9)
149-
safe_yaml (1.0.4)
150-
sass (3.4.16)
152+
ruby-prof (1.0.0)
153+
safe_yaml (1.0.5)
154+
sass (3.7.4)
155+
sass-listen (~> 4.0.0)
156+
sass-listen (4.0.0)
157+
rb-fsevent (~> 0.9, >= 0.9.4)
158+
rb-inotify (~> 0.9, >= 0.9.7)
151159
sinatra (1.4.8)
152160
rack (~> 1.5)
153161
rack-protection (~> 1.4)
154162
tilt (>= 1.3, < 3)
155-
slop (3.6.0)
156-
stretchy (0.6.0)
157-
elasticsearch (~> 1.0)
163+
stretchy (0.7.0)
164+
elasticsearch (~> 5.0)
158165
excon (~> 0.45)
159-
thor (0.20.0)
166+
thor (0.20.3)
160167
thread_safe (0.3.6)
161-
tilt (2.0.8)
162-
typhoeus (1.1.2)
168+
tilt (2.0.9)
169+
typhoeus (1.3.1)
163170
ethon (>= 0.9.0)
164171
tzinfo (1.2.5)
165172
thread_safe (~> 0.1)
173+
zeitwerk (2.1.10)
166174

167175
PLATFORMS
168176
ruby
@@ -197,7 +205,7 @@ DEPENDENCIES
197205
typhoeus
198206

199207
RUBY VERSION
200-
ruby 2.3.8p459
208+
ruby 2.6.3p62
201209

202210
BUNDLED WITH
203-
1.17.1
211+
1.17.2

lib/data_magic.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def self.init(options = {})
363363
# logger.info "options: #{options.inspect}"
364364
# logger.info "self.config: #{self.config.inspect}"
365365
if self.config.nil? # only init once
366-
::Aws.eager_autoload! # see https://github.com/aws/aws-sdk-ruby/issues/833
366+
#::Aws.eager_autoload! # see https://github.com/aws/aws-sdk-ruby/issues/833
367367
self.config = Config.new(s3: self.s3) # loads data.yaml
368368
self.client # make sure we can set up the Elasticsearch client
369369
self.index_data_if_needed unless options[:load_now] == false

0 commit comments

Comments
 (0)