serverlessgems 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e84f29a566951ffcc259be3bdf1e10421a5eb86528089fc0ff4f5805f52e8d
-  data.tar.gz: c3497fbf6fd4a7169bf29b7319599a43c59b3e6cc69d2b4a9ddd98e1bba395b1
+  metadata.gz: 1bc39f373e2ec3dd463cdb015b038d91e21fef1bb903e3e5145786dde7062117
+  data.tar.gz: 6cdfc0f15004cd366fa7ceb7236a3bfdfcee966afdabf4bcf129da06023669b6
 SHA512:
-  metadata.gz: cf4a3db72832ca353ea6fbe74d7e819e7631e88121d209efb1b1c645f56e520538323d480d289de5df861ddc22dd0bcc583214df6a261c6e5bf82664cbbaac13
-  data.tar.gz: 9d6d8d4669d7e7659a3b2ea6add218b963cd3160361ff6c5cf1b58699d0b5a069073364f9b959c1b4f9c23b7634c7178f85ea2ca4f05816651d59dbb6cda0e11
+  metadata.gz: 96e938a4f91820f34553746cdbd468cc3f5d6fe962f949b180fa9e3a3b905dd50fa29e0d412e6e55f203d287ba6c9eeaaddc6ff899fb86e7bd76d540c21dc08c
+  data.tar.gz: be87aee1edd695c7fb005bf204a7bc57a640dd198e6047d14f1c03fb46e262a61d2007ce3b1cec1dcfd607ed25e5562bfec6da7e3491d83e867c9f29c9d78b7f

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.2.1] - 2023-02-07
+- [#7](https://github.com/boltops-tools/serverlessgems/pull/7) download retry for 403 forbidden
+
+## [0.2.0] - 2022-07-02
+- provide gems available info
+
 ## [0.1.6] - 2021-11-11
 - [#5](https://github.com/boltops-tools/serverlessgems/pull/5) fix gem regexp detection for 2021 macbook m1 chip
 

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

@@ -1,3 +1,5 @@
+require "aws-sdk-core"
+
 class Jets::Gems::Api
   module Core
     extend Memoist
@@ -23,6 +25,7 @@ class Jets::Gems::Api
 
     def set_headers!(req)
       req['Authorization'] = token if token
+      req['x-account'] = account if account
       req['Content-Type'] = "application/vnd.api+json"
     end
 
@@ -77,5 +80,15 @@ class Jets::Gems::Api
     def delete(path, data={})
       request(Net::HTTP::Delete, path, data)
     end
+
+    def account
+      sts.get_caller_identity.account rescue nil
+    end
+    memoize :account
+
+    def sts
+      Aws::STS::Client.new
+    end
+    memoize :sts
   end
 end

data/lib/jets/gems/check.rb

@@ -26,7 +26,8 @@ module Jets::Gems
       compiled_gems.each do |gem_name|
         puts "Checking #{gem_name}..." if @options[:verbose]
         exist = Jets::Gems::Exist.new
-        @missing_gems << gem_name unless exist.check(gem_name)
+        data = exist.check(gem_name)
+        @missing_gems << data unless data["exist"]
       end
 
       if exit_early && !@missing_gems.empty?
@@ -34,7 +35,8 @@ module Jets::Gems
         # Better to error now than deploy a broken package to AWS Lambda.
         # Provide users with message about using their own serverlessgems source.
         puts missing_message
-        Report.new(@options).report(@missing_gems) if agree.yes?
+        names = @missing_gems.map {|i| i['gem_name']}
+        Report.new(@options).report(names) if agree.yes?
         exit 1
       end
 
@@ -48,10 +50,11 @@ module Jets::Gems
     def missing_message
       template = <<-EOL
 Your project requires compiled gems that are not currently available.  Unavailable pre-compiled gems:
-<% missing_gems.each do |gem| %>
-* <%= gem -%>
+<% missing_gems.each do |missing_gem|
+   available = missing_gem['available'].reject { |v| missing_gem['gem_name'].include?(v) }
+%>
+* Unavailable: <%= missing_gem['gem_name'] -%> Available versions: <%= available.join(' ') %>
 <% end %>
-
 Your current serverlessgems source: #{gems_source}
 
 Jets is unable to build a deployment package that will work on AWS Lambda without the required pre-compiled gems. To remedy this, you can:

data/lib/jets/gems/exist.rb

@@ -2,29 +2,11 @@ module Jets::Gems
   class Exist
     include Jets::Gems::Api::Concern
 
-    # We check all the availability before even downloading so we can provide a
-    # full list of gems they might want to research all at once instead of incrementally
-    #
-    # Examples:
-    #
-    #   check(single_gem)
-    #   check(list, of, gems)
-    def check(*gem_names)
-      gem_names = gem_names.flatten
-      exists = gem_names.inject({}) do |hash, gem_name|
-        exist = gem_exist?(gem_name)
-        hash[gem_name] = exist
-        hash.merge(hash)
-      end
-
-      exists.values.all? {|v| v } # all_exist
-    end
-
-    def gem_exist?(gem_name)
-      data = api.check_exist(gem_name: gem_name)
-      data["exist"]
+    # gem_name IE: nokogiri-1.1.1
+    def check(gem_name)
+      api.check_exist(gem_name: gem_name) # data = {"exist": ..., "available"}
     rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
-      false
+      {"exist" => false, gem_name: gem_name, available: [] }
     end
   end
-end
+end

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

@@ -35,7 +35,7 @@ module Jets::Gems::Extract
 
     # Returns the dest path
     def download_file(url, dest)
-      if File.exist?(dest)
+      if File.exist?(dest) && ENV['SG_FORCE_DOWNLOAD'].blank?
         say "File already downloaded #{dest}"
         return dest
       end

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

@@ -50,9 +50,24 @@ module Jets::Gems::Extract
     #
     def download_gem
       # download - also move to /tmp/jets/demo/compiled_gems folder
-      url = gem_url
-      basename = File.basename(url).gsub(/\?.*/,'') # remove query string info
-      tarball_dest = download_file(url, download_path(basename))
+      begin
+        @retries ||= 0
+        url = gem_url
+        basename = File.basename(url).gsub(/\?.*/,'') # remove query string info
+        tarball_dest = download_file(url, download_path(basename))
+      rescue OpenURI::HTTPError => e
+        url_without_query = url.gsub(/\?.*/,'')
+        puts "Error downloading #{url_without_query}"
+        @retries += 1
+        if @retries < 3
+          sleep 1
+          puts "Retrying download. Retry attempt: #{@retries}"
+          retry
+        else
+          raise e
+        end
+      end
+
       unless tarball_dest
         message = "Url: #{url} not found"
         if @options[:exit_on_error]

data/lib/jets/gems/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Tung Nguyen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tongueroo@gmail.com
 executables: []
@@ -131,7 +131,7 @@ homepage: https://github.com/boltops-tools/serverlessgems
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework
 test_files: []