serverlessgems 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169f172e979f4c558c87169677b011437ebdcacf5b650f0ea6a4e66f0612d704
-  data.tar.gz: 9e65dba325d5392404a9997cae87a5ba850697c06475a7beafa47da3a949744b
+  metadata.gz: 74e84f29a566951ffcc259be3bdf1e10421a5eb86528089fc0ff4f5805f52e8d
+  data.tar.gz: c3497fbf6fd4a7169bf29b7319599a43c59b3e6cc69d2b4a9ddd98e1bba395b1
 SHA512:
-  metadata.gz: 7750adc6ef3c215e37d705b71aa164fdd13ba10bec5045b29f49b9ab0ddcb85113c62c412cd69071d95278f8ae419c075f22c543a297aa18a8d13129ab7a9dd9
-  data.tar.gz: 522378c0c6d91eb8b74cad83f126ad3fb20dd8b7e73c4220604eb11fa77133ee0f0a4b7a8499a1b91014b266ce6a5b9b5d86b7691c5ebcacfbe7dae58261bc09
+  metadata.gz: cf4a3db72832ca353ea6fbe74d7e819e7631e88121d209efb1b1c645f56e520538323d480d289de5df861ddc22dd0bcc583214df6a261c6e5bf82664cbbaac13
+  data.tar.gz: 9d6d8d4669d7e7659a3b2ea6add218b963cd3160361ff6c5cf1b58699d0b5a069073364f9b959c1b4f9c23b7634c7178f85ea2ca4f05816651d59dbb6cda0e11

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.1.6] - 2021-11-11
+- [#5](https://github.com/boltops-tools/serverlessgems/pull/5) fix gem regexp detection for 2021 macbook m1 chip
+
+## [0.1.5] - 2021-08-31
+- [#4](https://github.com/boltops-tools/serverlessgems/pull/4) Don't create a file if the download fails
+
+## [0.1.4] - 2021-07-15
+- [#3](https://github.com/boltops-tools/serverlessgems/pull/3) gems/registered api
+
+## [0.1.3] - 2021-04-13
+- update jets agree messaging
+
 ## [0.1.2] - 2021-01-12
 - [#2](https://github.com/boltops-tools/serverlessgems/pull/2) fix other_compiled_gems Jets.build_root
 

data/lib/jets/gems/agree.rb

@@ -7,19 +7,32 @@ module Jets::Gems
     # Only prompts if hasnt prompted before and saved a ~/.jets/agree file
     def prompt
       return if bypass_prompt
-      return if File.exist?(@agree_file)
+      return if File.exist?(@agree_file) && File.mtime(@agree_file) > Time.parse("2021-04-12")
 
       puts <<~EOL
-        Jets sends data about your gems to serverlessgems.com so that it can build the necessary Lambda layer.
+        Jets uses pre-built binary gems from the serverlessgems.com service to
+        provide a user-friendly developer experience. The Serverless Gems Service
+        rate limits free gem download requests daily. You can upgrade to a paid plan
+        for unlimited gem download requests. Open Source projects may also qualify
+        for a free unlimited plan. More info:
 
-        Reporting gems generally allows Serverless Gems to build new gems within a few minutes.
-        So if you run into missing gems, you can try deploying again after a few minutes.
-        Non-reported gems may take several days or longer.
+          https://www.serverlessgems.com/rate-limits
 
-        Serverless Gems only collects the info it needs to run the service. More info: https://www.serverlessgems.com/privacy
+        If you do not want to use Serverless Gems, you can disable the Serverless
+        Gems service and provide your own custom Lambda Layer. More info:
 
+          https://rubyonjets.com/docs/serverlessgems/
+          https://rubyonjets.com/docs/extras/custom-lambda-layers/
+
+        Also, reporting gems to Serverless Gems allows it to build new gems typically
+        within a few minutes. So if you run into missing gems, you can try deploying
+        again after a few minutes. Non-reported gems may take several days or longer.
+        Serverless Gems only collects the info it needs to run the service.
+        More info: https://www.serverlessgems.com/privacy
         This message will only appear once on this machine.
-        You can also automatically skip this message by setting JETS_AGREE=yes or JETS_AGREE=no
+
+        You can also automatically skip this message by setting:
+        JETS_AGREE=yes or JETS_AGREE=no
 
         Is it okay to send your gem data to Serverless Gems? (Y/n)?
       EOL

data/lib/jets/gems/api/concern.rb

@@ -1,3 +1,7 @@
+# Need 'open-uri' for exist.rb and regsitered.rb which uses
+# rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
+require 'open-uri'
+
 class Jets::Gems::Api
   module Concern
     def api

data/lib/jets/gems/api.rb

@@ -18,6 +18,10 @@ module Jets::Gems
       get("report/missing?gem_name=#{gem_name}&ruby_folder=#{ruby_folder}")
     end
 
+    def registered_gems
+      get("gems/registered")
+    end
+
     def ruby_folder
       Jets::Gems.ruby_folder
     end

data/lib/jets/gems/check.rb

@@ -12,7 +12,7 @@ module Jets::Gems
     end
 
     def run!
-      puts "Gems source: #{gems_source}" if @options[:show_source]
+      puts "Gems source: #{gems_source}" if @options[:verbose]
       run(exit_early: true)
     end
 
@@ -24,7 +24,7 @@ module Jets::Gems
     def run(exit_early: false)
       puts "Checking projects gems for binary serverlessgems..."
       compiled_gems.each do |gem_name|
-        puts "Checking #{gem_name}..." if @options[:cli]
+        puts "Checking #{gem_name}..." if @options[:verbose]
         exist = Jets::Gems::Exist.new
         @missing_gems << gem_name unless exist.check(gem_name)
       end
@@ -133,6 +133,7 @@ EOL
         #
         gems = gemspec_compiled_gems
         gems += other_compiled_gems
+        gems += registered_compiled_gems
         gems.uniq
       end
     end
@@ -147,9 +148,25 @@ EOL
     #   /tmp/jets/demo/stage/opt/ruby/gems/2.7.0/gems/nokogiri-1.11.1-x86_64-darwin
     #   /tmp/jets/demo/stage/opt/ruby/gems/2.7.0/gems/nokogiri-1.11.1-x86_64-linux
     #
+    # On new 2021 macbook with m1 chip: the gems are being saved in a folder like so:
+    #   nokogiri-1.12.5-arm64-darwin
+    # The GEM_REGEXP accounts for this case.
+    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/
     def other_compiled_gems
       paths = Dir.glob("#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/gems/*{-darwin,-linux}")
-      paths.map { |p| File.basename(p).sub(/-x\d+.*-(darwin|linux)/,'') }
+      paths.map { |p| File.basename(p).sub(GEM_REGEXP,'') }
+    end
+
+    def registered_compiled_gems
+      registered = Jets::Gems::Registered.new
+      registered_gems = registered.all # no version numbers in this list
+
+      paths = Dir.glob("#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/gems/*")
+      project_gems = paths.map { |p| File.basename(p).sub(GEM_REGEXP,'') }
+      project_gems.select do |name|
+        name_only = name.sub(/-\d+\.\d+\.\d+.*/,'')
+        registered_gems.include?(name_only)
+      end
     end
 
     # Use pre-compiled gem because the gem could have development header shared

data/lib/jets/gems/exist.rb

@@ -1,5 +1,3 @@
-require 'open-uri'
-
 module Jets::Gems
   class Exist
     include Jets::Gems::Api::Concern

data/lib/jets/gems/extract/base.rb

@@ -41,13 +41,12 @@ module Jets::Gems::Extract
       end
 
       say "Downloading..."
+      downloaded = URI.open(url, 'rb') { |read_file| read_file.read }
+
       FileUtils.mkdir_p(File.dirname(dest)) # ensure parent folder exists
 
-      File.open(dest, 'wb') do |saved_file|
-        URI.open(url, 'rb') do |read_file|
-          saved_file.write(read_file.read)
-        end
-      end
+      File.open(dest, 'wb') { |saved_file| saved_file.write(downloaded) }
+
       dest
     end
 

data/lib/jets/gems/registered.rb

@@ -0,0 +1,12 @@
+module Jets::Gems
+  class Registered
+    include Jets::Gems::Api::Concern
+
+    def all
+      data = api.registered_gems
+      data["gems"]
+    rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
+      []
+    end
+  end
+end

data/lib/jets/gems/version.rb

@@ -1,5 +1,5 @@
 module Jets
   module Gems
-    VERSION = "0.1.2"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -122,6 +122,7 @@ files:
 - lib/jets/gems/exist.rb
 - lib/jets/gems/extract/base.rb
 - lib/jets/gems/extract/gem.rb
+- lib/jets/gems/registered.rb
 - lib/jets/gems/report.rb
 - lib/jets/gems/version.rb
 - lib/serverlessgems.rb
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework