serverlessgems 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 801c924a1a3b4c3308e4637a26d849d7423322f579c9985c2197a1ae64b6b98d
-  data.tar.gz: d567760d50e0f0c095a4d6ece3bb659a31a351898bb6827266c9bbc0bef0a27a
+  metadata.gz: 17849f420754066145243aefd213033867f4926967d1bfd0e530ac183731ebca
+  data.tar.gz: 358170e435dea0015b7440c8016be0e715dd5f111276334bd3c17ad51c49ef2d
 SHA512:
-  metadata.gz: 723634152694aebb484c1693c1cbf49466195b0e84424e72a8f46cce75216211fcf138bd5fd36ac4b75fc3c3dbd79f75703964ebac8b1bfc4704e0fef93b76c4
-  data.tar.gz: cceb728e1d0bf62c2ced97d31059ab8ff0c155338c540572bbf70c72238b81365392eea49fcc66e2c0ada09c862d4cd152fd5e77b3375e13282af712ad37e6f8
+  metadata.gz: c4618ff2e516a104d98f56ce0edd5a93229f48d7d14565a289712f7edf28c484a7052c36eb5e2dae060c43852d4664d7e3d91c290713d1a6a5b67caff2f7c969
+  data.tar.gz: 4ab7918973479151b2200636a30547d67a9cc5eecb6fd6e178fc7000c93c837ec3801e45c796a2d11ce1d747fa65a45467399eed65220b1d76e0e7038a3a255f

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 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.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
+
+## [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
 

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:
@@ -148,9 +151,13 @@ 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
@@ -158,7 +165,7 @@ EOL
       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(/-x\d+.*-(darwin|linux)/,'') }
+      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)

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

@@ -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/version.rb

@@ -1,5 +1,5 @@
 module Jets
   module Gems
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -146,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.3.10
 signing_key: 
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework