jets 2.3.18 → 2.3.19
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: 67a692a8d7ee829132db3e1e89d656b5b7885c6f280185cfe7bd6c9a3b9ebc59
|
4
|
+
data.tar.gz: e2e410d872acf41f19284e610043c5b39159469eb7f576b395b27c2db0ab6dde
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9f05d1c81c5d69b3a2921301c69a5522a8b81e3be48515e7219f8ffdb76e90e441a1a5234c1465403545b3034a4073c82a478229f02fed1506b6bafca57bb1f6
|
7
|
+
data.tar.gz: 15ff2fdda4c2bc469f9cd08ebcbac4e393a29fdca7ac1980274d7ffcf9a4669b919af596e29088411a8896914a57acf7fe4f06ffcd9377fa72422eec764b36f0
|
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
|
+
## [2.3.19] - 2021-01-28
|
7
|
+
- #529 fix gem detection for some gems
|
8
|
+
|
6
9
|
## [2.3.18]
|
7
10
|
- #514 Allow to define route that contains dot
|
8
11
|
- #515 set content type on upload by using extension so cloudfront will compress when serving
|
data/jets.gemspec
CHANGED
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
|
|
48
48
|
spec.add_dependency "dotenv"
|
49
49
|
spec.add_dependency "gems" # jets-gems dependency
|
50
50
|
spec.add_dependency "hashie"
|
51
|
-
spec.add_dependency "jets-gems"
|
51
|
+
spec.add_dependency "jets-gems", "~> 0.2.3"
|
52
52
|
spec.add_dependency "jets-html-sanitizer"
|
53
53
|
spec.add_dependency "kramdown"
|
54
54
|
spec.add_dependency "memoist"
|
@@ -21,11 +21,23 @@ module Jets::Builders
|
|
21
21
|
options = @options.merge(source_url: source)
|
22
22
|
gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, options)
|
23
23
|
gem_extractor.run
|
24
|
+
rename_gem(gem_name)
|
24
25
|
end
|
25
26
|
|
26
27
|
tidy
|
27
28
|
end
|
28
29
|
|
30
|
+
def rename_gem(gem_name)
|
31
|
+
ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
|
32
|
+
gems_folder = "#{ruby_folder}/gems"
|
33
|
+
expr = "#{gems_folder}/#{gem_name}-x*-{darwin,linux}"
|
34
|
+
src = Dir.glob(expr).first
|
35
|
+
return unless src
|
36
|
+
|
37
|
+
dest = src.sub("-darwin", "-linux")
|
38
|
+
FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
|
39
|
+
end
|
40
|
+
|
29
41
|
def sh(command)
|
30
42
|
puts "=> #{command}".color(:green)
|
31
43
|
success = system(command)
|
@@ -66,7 +66,7 @@ module Jets::Builders
|
|
66
66
|
)
|
67
67
|
end
|
68
68
|
|
69
|
-
|
69
|
+
rewrite_gemfile_lock("#{cache_area}/Gemfile.lock")
|
70
70
|
|
71
71
|
# Copy the Gemfile.lock back to the project in case it was updated.
|
72
72
|
# For example we add the jets-rails to the Gemfile.
|
@@ -150,9 +150,10 @@ module Jets::Builders
|
|
150
150
|
|
151
151
|
# Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
|
152
152
|
# And this can cause issues with require 'bundler/setup'
|
153
|
-
def
|
153
|
+
def rewrite_gemfile_lock(gemfile_lock)
|
154
154
|
lines = IO.readlines(gemfile_lock)
|
155
155
|
|
156
|
+
# Remove BUNDLED WITH
|
156
157
|
# amount is the number of lines to remove
|
157
158
|
new_lines, capture, count, amount = [], true, 0, 2
|
158
159
|
lines.each do |l|
|
@@ -166,6 +167,27 @@ module Jets::Builders
|
|
166
167
|
end
|
167
168
|
end
|
168
169
|
|
170
|
+
# Replace things like nokogiri (1.11.1-x86_64-darwin) => nokogiri (1.11.1)
|
171
|
+
lines, new_lines = new_lines, []
|
172
|
+
lines.each do |l|
|
173
|
+
if l.include?("-x86_64-darwin")
|
174
|
+
l = l.sub('-x86_64-darwin','')
|
175
|
+
end
|
176
|
+
new_lines << l
|
177
|
+
end
|
178
|
+
|
179
|
+
# Make sure platform is ruby
|
180
|
+
lines, new_lines, marker = new_lines, [], false
|
181
|
+
lines.each do |l|
|
182
|
+
if marker # the next loop has the platform we want to replace
|
183
|
+
new_lines << " ruby\n"
|
184
|
+
marker = false
|
185
|
+
next
|
186
|
+
end
|
187
|
+
marker = l.include?('PLATFORMS')
|
188
|
+
new_lines << l
|
189
|
+
end
|
190
|
+
|
169
191
|
content = new_lines.join('')
|
170
192
|
IO.write(gemfile_lock, content)
|
171
193
|
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: 2.3.
|
4
|
+
version: 2.3.19
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tung Nguyen
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-01-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -308,16 +308,16 @@ dependencies:
|
|
308
308
|
name: jets-gems
|
309
309
|
requirement: !ruby/object:Gem::Requirement
|
310
310
|
requirements:
|
311
|
-
- - "
|
311
|
+
- - "~>"
|
312
312
|
- !ruby/object:Gem::Version
|
313
|
-
version:
|
313
|
+
version: 0.2.3
|
314
314
|
type: :runtime
|
315
315
|
prerelease: false
|
316
316
|
version_requirements: !ruby/object:Gem::Requirement
|
317
317
|
requirements:
|
318
|
-
- - "
|
318
|
+
- - "~>"
|
319
319
|
- !ruby/object:Gem::Version
|
320
|
-
version:
|
320
|
+
version: 0.2.3
|
321
321
|
- !ruby/object:Gem::Dependency
|
322
322
|
name: jets-html-sanitizer
|
323
323
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1103,7 +1103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1103
1103
|
- !ruby/object:Gem::Version
|
1104
1104
|
version: '0'
|
1105
1105
|
requirements: []
|
1106
|
-
rubygems_version: 3.
|
1106
|
+
rubygems_version: 3.2.5
|
1107
1107
|
signing_key:
|
1108
1108
|
specification_version: 4
|
1109
1109
|
summary: Ruby Serverless Framework
|