jets 3.0.0 → 3.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/jets.gemspec +1 -1
- data/lib/jets/builders/gem_replacer.rb +12 -0
- data/lib/jets/builders/ruby_packager.rb +24 -2
- data/lib/jets/version.rb +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5c54df907c0208fb0c84d1e3de9bea907883cb3dc83f05cd4bcd7da0c1930f2e
|
4
|
+
data.tar.gz: 8b48dc566bff707edf6c53926c21e829ab95c73b0ac38b3116684994f08d7f0e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a5e74762613c04d90525319ef7f5cefad99f05a4ab96d9e98ff067cb872b11742d5e4e1385477f9a93376dba1f9661753db4195fc578d92b169e3b1bd42c394d
|
7
|
+
data.tar.gz: 5894585a9597b5f2aa15fd607102867da0015122df44395a0854a801a5a8839427619a5edea0621592943e97865ed590cfcd36ac040389445d9675ed090e095d
|
data/CHANGELOG.md
CHANGED
@@ -3,6 +3,9 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
|
5
5
|
|
6
|
+
## [3.0.1] - 2021-01-12
|
7
|
+
- [#524](https://github.com/boltops-tools/jets/pull/524) fix native gem detection
|
8
|
+
|
6
9
|
## [3.0.0]
|
7
10
|
* #328 i18n docs
|
8
11
|
* #391 Deploy Option: Auto Replace API Gateway
|
data/jets.gemspec
CHANGED
@@ -57,7 +57,7 @@ Gem::Specification.new do |spec|
|
|
57
57
|
spec.add_dependency "railties", "~> 6.1.0" # for ActiveRecord database_tasks.rb
|
58
58
|
spec.add_dependency "rainbow"
|
59
59
|
spec.add_dependency "recursive-open-struct"
|
60
|
-
spec.add_dependency "serverlessgems"
|
60
|
+
spec.add_dependency "serverlessgems", "~> 0.1.1"
|
61
61
|
spec.add_dependency "shotgun"
|
62
62
|
spec.add_dependency "text-table"
|
63
63
|
spec.add_dependency "thor"
|
@@ -20,11 +20,23 @@ module Jets::Builders
|
|
20
20
|
found_gems.each do |gem_name|
|
21
21
|
gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, @options)
|
22
22
|
gem_extractor.run
|
23
|
+
rename_gem(gem_name)
|
23
24
|
end
|
24
25
|
|
25
26
|
tidy
|
26
27
|
end
|
27
28
|
|
29
|
+
def rename_gem(gem_name)
|
30
|
+
ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
|
31
|
+
gems_folder = "#{ruby_folder}/gems"
|
32
|
+
expr = "#{gems_folder}/#{gem_name}-x*-{darwin,linux}"
|
33
|
+
src = Dir.glob(expr).first
|
34
|
+
return unless src
|
35
|
+
|
36
|
+
dest = src.sub("-darwin", "-linux")
|
37
|
+
FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
|
38
|
+
end
|
39
|
+
|
28
40
|
def sh(command)
|
29
41
|
puts "=> #{command}".color(:green)
|
30
42
|
success = system(command)
|
@@ -67,7 +67,7 @@ module Jets::Builders
|
|
67
67
|
end
|
68
68
|
create_bundle_config(frozen: true)
|
69
69
|
|
70
|
-
|
70
|
+
rewrite_gemfile_lock("#{cache_area}/Gemfile.lock")
|
71
71
|
|
72
72
|
# Copy the Gemfile.lock back to the project in case it was updated.
|
73
73
|
# For example we add the jets-rails to the Gemfile.
|
@@ -149,9 +149,10 @@ module Jets::Builders
|
|
149
149
|
|
150
150
|
# Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
|
151
151
|
# And this can cause issues with require 'bundler/setup'
|
152
|
-
def
|
152
|
+
def rewrite_gemfile_lock(gemfile_lock)
|
153
153
|
lines = IO.readlines(gemfile_lock)
|
154
154
|
|
155
|
+
# Remove BUNDLED WITH
|
155
156
|
# amount is the number of lines to remove
|
156
157
|
new_lines, capture, count, amount = [], true, 0, 2
|
157
158
|
lines.each do |l|
|
@@ -165,6 +166,27 @@ module Jets::Builders
|
|
165
166
|
end
|
166
167
|
end
|
167
168
|
|
169
|
+
# Replace things like nokogiri (1.11.1-x86_64-darwin) => nokogiri (1.11.1)
|
170
|
+
lines, new_lines = new_lines, []
|
171
|
+
lines.each do |l|
|
172
|
+
if l.include?("-x86_64-darwin")
|
173
|
+
l = l.sub('-x86_64-darwin','')
|
174
|
+
end
|
175
|
+
new_lines << l
|
176
|
+
end
|
177
|
+
|
178
|
+
# Make sure platform is ruby
|
179
|
+
lines, new_lines, marker = new_lines, [], false
|
180
|
+
lines.each do |l|
|
181
|
+
if marker # the next loop has the platform we want to replace
|
182
|
+
new_lines << " ruby\n"
|
183
|
+
marker = false
|
184
|
+
next
|
185
|
+
end
|
186
|
+
marker = l.include?('PLATFORMS')
|
187
|
+
new_lines << l
|
188
|
+
end
|
189
|
+
|
168
190
|
content = new_lines.join('')
|
169
191
|
IO.write(gemfile_lock, content)
|
170
192
|
end
|
data/lib/jets/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tung Nguyen
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-01-
|
11
|
+
date: 2021-01-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -434,16 +434,16 @@ dependencies:
|
|
434
434
|
name: serverlessgems
|
435
435
|
requirement: !ruby/object:Gem::Requirement
|
436
436
|
requirements:
|
437
|
-
- - "
|
437
|
+
- - "~>"
|
438
438
|
- !ruby/object:Gem::Version
|
439
|
-
version:
|
439
|
+
version: 0.1.1
|
440
440
|
type: :runtime
|
441
441
|
prerelease: false
|
442
442
|
version_requirements: !ruby/object:Gem::Requirement
|
443
443
|
requirements:
|
444
|
-
- - "
|
444
|
+
- - "~>"
|
445
445
|
- !ruby/object:Gem::Version
|
446
|
-
version:
|
446
|
+
version: 0.1.1
|
447
447
|
- !ruby/object:Gem::Dependency
|
448
448
|
name: shotgun
|
449
449
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1096,7 +1096,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1096
1096
|
- !ruby/object:Gem::Version
|
1097
1097
|
version: '0'
|
1098
1098
|
requirements: []
|
1099
|
-
rubygems_version: 3.
|
1099
|
+
rubygems_version: 3.2.5
|
1100
1100
|
signing_key:
|
1101
1101
|
specification_version: 4
|
1102
1102
|
summary: Ruby Serverless Framework
|