serverlessgems 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeff425996a2704acdc46eae6992d6c862089961ae6cd210c7cea61de9684855
-  data.tar.gz: 8d1888c4a187e3c63b5262f458a06daf8782c0db3dfeb682fc63ae45df6c12fb
+  metadata.gz: f45e4781de3600f9c61880c3b508a2955a393332efff18d980bbc2ef0ebc88ab
+  data.tar.gz: f3d78701b967fb4fc01a0ad7f332ec83690a38f0f86a0549a210d984e8b362ae
 SHA512:
-  metadata.gz: 47675c0ac980e0089541784aea12b04b5b2d2d6c1a077a65524de091c8eada0afbdd2c3541f68670b7554ae67d3ae5f224ee156573ef77391404479e18535405
-  data.tar.gz: c853581680f9bf7c26fef89eaf96c59b5791b178a5850e28c83acd51391beb1f783f80d20ac50c0dfa3fbf84dc0e7993a7a65d0ee825bc7a55e004a489ec0473
+  metadata.gz: f7182eb8a6bafde793df547b4e8aa93a09160dfdc01181f5909fe6327971186f1c45e9d1e42d82ca65afcb98c8bf52785b877f9f9c6eb1385a8a3f4fd5b97ab4
+  data.tar.gz: 8d6d08fdc726541ce96b1d3a7fc56a2e324f816018e5f96705883994b2a084160bbe213d91ba043f3ab5e9dcbbc20e85cfca2227df68458810f40b2307a22cfd

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.4.1] - 2024-06-22
+- standardrb and updates
+
 ## [0.4.0] - 2023-07-24
 - [#8](https://github.com/boltops-tools/serverlessgems/pull/8) erb ruby 3 and autoloader improvements
 

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in serverlessgems.gemspec
 gemspec

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/jets/gems/agree.rb

@@ -1,7 +1,7 @@
 module Jets::Gems
   class Agree
     def initialize
-      @agree_file = "#{ENV['HOME']}/.jets/agree"
+      @agree_file = "#{ENV["HOME"]}/.jets/agree"
     end
 
     # Only prompts if hasnt prompted before and saved a ~/.jets/agree file
@@ -38,7 +38,7 @@ module Jets::Gems
       EOL
 
       answer = $stdin.gets.strip
-      value = answer =~ /y/i ? 'yes' : 'no'
+      value = /y/i.match?(answer) ? "yes" : "no"
 
       write_file(value)
     end
@@ -46,24 +46,24 @@ module Jets::Gems
     # Allow user to bypass prompt with JETS_AGREE=1 JETS_AGREE=yes etc
     # Useful for CI/CD pipelines.
     def bypass_prompt
-      agree = ENV['JETS_AGREE']
+      agree = ENV["JETS_AGREE"]
       return false unless agree
 
       if %w[1 yes true].include?(agree.downcase)
-        write_file('yes')
+        write_file("yes")
       else
-        write_file('no')
+        write_file("no")
       end
 
       true
     end
 
     def yes?
-      File.exist?(@agree_file) && IO.read(@agree_file).strip == 'yes'
+      File.exist?(@agree_file) && IO.read(@agree_file).strip == "yes"
     end
 
     def no?
-      File.exist?(@agree_file) && IO.read(@agree_file).strip == 'no'
+      File.exist?(@agree_file) && IO.read(@agree_file).strip == "no"
     end
 
     def yes!

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

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

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

@@ -5,14 +5,18 @@ class Jets::Gems::Api
     extend Memoist
 
     # Always translate raw json response to ruby Hash
-    def request(klass, path, data={})
+    def request(klass, path, data = {})
       url = url(path)
       req = build_request(klass, url, data)
       resp = http.request(req) # send request
       load_json(url, resp)
     end
 
-    def build_request(klass, url, data={})
+    def build_request(klass, url, data = {})
+      data = global_data.merge(data)
+      if klass == Net::HTTP::Get
+        url += "?#{URI.encode_www_form(data)}" if data.any?
+      end
       req = klass.new(url) # url includes query string and uri.path does not, must used url
       set_headers!(req)
       if [Net::HTTP::Delete, Net::HTTP::Patch, Net::HTTP::Post, Net::HTTP::Put].include?(klass)
@@ -24,13 +28,29 @@ class Jets::Gems::Api
     end
 
     def set_headers!(req)
-      req['Authorization'] = token if token
-      req['x-account'] = account if account
-      req['Content-Type'] = "application/vnd.api+json"
+      req["Authorization"] = token if token
+      req["x-account"] = account if account
+      req["Content-Type"] = "application/vnd.api+json"
+    end
+
+    def global_data
+      Jets.boot
+      params = {}
+      params[:jets_env] = Jets.env.to_s
+      params[:jets_extra] = Jets.extra.to_s if Jets.extra
+      params[:name] = Jets.project_namespace
+      params[:region] = Jets.aws.region
+      params[:account] = Jets.aws.account
+      params[:project_id] = Jets.config.project_name
+      params[:serverlessgems_version] = Jets::Gems::VERSION
+      params[:jets_version] = Jets::VERSION
+      params[:ruby_version] = RUBY_VERSION
+      params[:ruby_folder] = Jets::Gems.ruby_folder
+      params
     end
 
     def token
-      Jets::Gems::Config.instance.data['key']
+      Jets::Gems::Config.instance.data["key"]
     end
 
     def load_json(url, res)
@@ -40,7 +60,7 @@ class Jets::Gems::Api
       else
         puts "Error: Non-successful http response status code: #{res.code}"
         puts "headers: #{res.each_header.to_h.inspect}"
-        puts "ServerlessGems API #{url}" if ENV['SG_DEBUG']
+        puts "ServerlessGems API #{url}" if ENV["SG_DEBUG"]
         raise "ServerlessGems API called failed: #{uri.host}"
       end
     end
@@ -55,7 +75,7 @@ class Jets::Gems::Api
       uri = URI(endpoint)
       http = Net::HTTP.new(uri.host, uri.port)
       http.open_timeout = http.read_timeout = 30
-      http.use_ssl = true if uri.scheme == 'https'
+      http.use_ssl = true if uri.scheme == "https"
       http
     end
     memoize :http
@@ -65,24 +85,26 @@ class Jets::Gems::Api
       "#{endpoint}/#{path}"
     end
 
-    def get(path)
-      request(Net::HTTP::Get, path)
+    def get(path, data = {})
+      request(Net::HTTP::Get, path, data)
     end
 
-    def post(path, data={})
+    def post(path, data = {})
       request(Net::HTTP::Post, path, data)
     end
 
-    def patch(path, data={})
+    def patch(path, data = {})
       request(Net::HTTP::Patch, path, data)
     end
 
-    def delete(path, data={})
+    def delete(path, data = {})
       request(Net::HTTP::Delete, path, data)
     end
 
     def account
-      sts.get_caller_identity.account rescue nil
+      sts.get_caller_identity.account
+    rescue
+      nil
     end
     memoize :account
 

data/lib/jets/gems/api.rb

@@ -3,19 +3,19 @@ module Jets::Gems
     include Core
 
     def endpoint
-      ENV['SG_API'] || Jets.config.gems.source || 'https://api.serverlessgems.com/api/v1'
+      ENV["SG_API"] || Jets.config.gems.source || "https://api.serverlessgems.com/api/v1"
     end
 
     def download_url(gem_name:, project:)
-      get("gem/download?gem_name=#{gem_name}&ruby_folder=#{ruby_folder}&project=#{project}")
+      get("gem/download", gem_name: gem_name, ruby_folder: ruby_folder, project: project)
     end
 
     def check_exist(gem_name:)
-      get("gem/exist?gem_name=#{gem_name}&ruby_folder=#{ruby_folder}")
+      get("gem/exist", gem_name: gem_name, ruby_folder: ruby_folder)
     end
 
     def report_missing(gem_name:)
-      get("report/missing?gem_name=#{gem_name}&ruby_folder=#{ruby_folder}")
+      get("report/missing", gem_name: gem_name, ruby_folder: ruby_folder)
     end
 
     def registered_gems

data/lib/jets/gems/autoloader.rb

@@ -6,7 +6,7 @@ module Jets
     class Autoloader
       class Inflector < Zeitwerk::Inflector
         def camelize(basename, _abspath)
-          map = { cli: "CLI", version: "VERSION" }
+          map = {cli: "CLI", version: "VERSION"}
           map[basename.to_sym] || super
         end
       end
@@ -15,7 +15,7 @@ module Jets
         def setup
           loader = Zeitwerk::Loader.new
           loader.inflector = Inflector.new
-          lib = File.expand_path('../..', __dir__)
+          lib = File.expand_path("../..", __dir__)
           loader.push_dir(lib) # lib
           loader.ignore("#{lib}/serverlessgems.rb")
           loader.setup

data/lib/jets/gems/check.rb

@@ -6,7 +6,7 @@ module Jets::Gems
     extend Memoist
 
     attr_reader :missing_gems
-    def initialize(options={})
+    def initialize(options = {})
       @options = options
       @missing_gems = [] # keeps track of gems that are not found in any of the serverlessgems source
     end
@@ -17,7 +17,7 @@ module Jets::Gems
     end
 
     def gems_source
-      ENV['SG_API'] || Jets.config.gems.source
+      ENV["SG_API"] || Jets.config.gems.source
     end
 
     # Checks whether the gem is found at the serverlessgems source.
@@ -35,7 +35,7 @@ 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
-        names = @missing_gems.map {|i| i['gem_name']}
+        names = @missing_gems.map { |i| i["gem_name"] }
         Report.new(@options).report(names) if agree.yes?
         exit 1
       end
@@ -48,36 +48,36 @@ module Jets::Gems
     end
 
     def missing_message
-      template = <<-EOL
-Your project requires compiled gems that are not currently available.  Unavailable pre-compiled gems:
-<% 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:
-
-* Use another gem that does not require compilation.
-* Create your own custom layer with the gem: http://rubyonjets.com/docs/extras/custom-lambda-layers/
-<% if agree.yes? -%>
-* No need to report this to us, as we've already been notified.
-* Usually, missing gems can be built within a few minutes.
-* Some gems may take days or even longer.
-<% elsif agree.no? -%>
-* You have choosen not to report data to serverlessgems so we will not be notified about these missing gems.
-* You can edit ~/.jets/agree to change this.
-* Reporting gems generally allows Serverless Gems to build the missing gems within a few minutes.
-* You can try redeploying again after a few minutes.
-* Non-reported gems may take days or even longer to be built.
-<% end -%>
-
-Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages.
-More info: http://rubyonjets.com/docs/serverlessgems/
-
-EOL
-      erb = ERB.new(template, trim_mode: '-') # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
+      template = <<~EOL
+        Your project requires compiled gems that are not currently available.  Unavailable pre-compiled gems:
+        <% 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:
+        
+        * Use another gem that does not require compilation.
+        * Create your own custom layer with the gem: http://rubyonjets.com/docs/extras/custom-lambda-layers/
+        <% if agree.yes? -%>
+        * No need to report this to us, as we've already been notified.
+        * Usually, missing gems can be built within a few minutes.
+        * Some gems may take days or even longer.
+        <% elsif agree.no? -%>
+        * You have choosen not to report data to serverlessgems so we will not be notified about these missing gems.
+        * You can edit ~/.jets/agree to change this.
+        * Reporting gems generally allows Serverless Gems to build the missing gems within a few minutes.
+        * You can try redeploying again after a few minutes.
+        * Non-reported gems may take days or even longer to be built.
+        <% end -%>
+        
+        Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages.
+        More info: http://rubyonjets.com/docs/serverlessgems/
+        
+      EOL
+      erb = ERB.new(template, trim_mode: "-") # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
       erb.result(binding)
     end
 
@@ -159,7 +159,7 @@ EOL
     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(GEM_REGEXP,'') }
+      paths.map { |p| File.basename(p).sub(GEM_REGEXP, "") }
     end
 
     def registered_compiled_gems
@@ -167,9 +167,9 @@ 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(GEM_REGEXP,'') }
+      project_gems = paths.map { |p| File.basename(p).sub(GEM_REGEXP, "") }
       project_gems.select do |name|
-        name_only = name.sub(/-\d+\.\d+\.\d+.*/,'')
+        name_only = name.sub(/-\d+\.\d+\.\d+.*/, "")
         registered_gems.include?(name_only)
       end
     end
@@ -210,7 +210,7 @@ EOL
     # Thanks: https://gist.github.com/aelesbao/1414b169a79162b1d795 and
     #   https://stackoverflow.com/questions/5165950/how-do-i-get-a-list-of-gems-that-are-installed-that-have-native-extensions
     def gemspec_compiled_gems
-      specs = Gem::Specification.each.select { |spec| spec.extensions.any?  }
+      specs = Gem::Specification.each.select { |spec| spec.extensions.any? }
       specs.reject! { |spec| weird_gem?(spec.name) }
       specs.map(&:full_name)
     end

data/lib/jets/gems/config/token.rb

@@ -1,11 +1,11 @@
 class Jets::Gems::Config
   class Token
     def key
-      data['key']
+      data["key"]
     end
 
     def data
-      load_yaml("#{ENV['HOME']}/.jets/config.yml")
+      load_yaml("#{ENV["HOME"]}/.jets/config.yml")
     end
 
     # Ensure a Hash is returned

data/lib/jets/gems/exist.rb

@@ -6,7 +6,7 @@ module Jets::Gems
     def check(gem_name)
       api.check_exist(gem_name: gem_name) # data = {"exist": ..., "available"}
     rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
-      {"exist" => false, gem_name: gem_name, available: [] }
+      {"exist" => false, :gem_name => gem_name, :available => []}
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Jets::Gems::Extract
     class NotFound < RuntimeError; end
 
     attr_reader :project_root
-    def initialize(name, options={})
+    def initialize(name, options = {})
       @name = name
       @options = options
       ruby_folder = Jets::Gems.ruby_folder
@@ -35,17 +35,17 @@ module Jets::Gems::Extract
 
     # Returns the dest path
     def download_file(url, dest)
-      if File.exist?(dest) && ENV['SG_FORCE_DOWNLOAD'].blank?
+      if File.exist?(dest) && ENV["SG_FORCE_DOWNLOAD"].blank?
         say "File already downloaded #{dest}"
         return dest
       end
 
       say "Downloading..."
-      downloaded = URI.open(url, 'rb') { |read_file| read_file.read }
+      downloaded = URI.open(url, "rb") { |read_file| read_file.read }
 
       FileUtils.mkdir_p(File.dirname(dest)) # ensure parent folder exists
 
-      File.open(dest, 'wb') { |saved_file| saved_file.write(downloaded) }
+      File.binwrite(dest, downloaded)
 
       dest
     end
@@ -56,7 +56,7 @@ module Jets::Gems::Extract
       @@log_level = val
     end
 
-    def say(message, level=:info)
+    def say(message, level = :info)
       enabled = @@log_level == :debug || level == :debug
       puts(message) if enabled
     end

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

@@ -36,7 +36,7 @@ module Jets::Gems::Extract
     end
 
     def gem_name
-      full_gem_name.gsub(VERSION_PATTERN,'') # folder: byebug
+      full_gem_name.gsub(VERSION_PATTERN, "") # folder: byebug
     end
 
     # Downloads and extracts the linux gem into the proper directory.
@@ -53,10 +53,10 @@ module Jets::Gems::Extract
       begin
         @retries ||= 0
         url = gem_url
-        basename = File.basename(url).gsub(/\?.*/,'') # remove query string info
+        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(/\?.*/,'')
+        url_without_query = url.gsub(/\?.*/, "")
         puts "Error downloading #{url_without_query}"
         @retries += 1
         if @retries < 3
@@ -104,10 +104,10 @@ module Jets::Gems::Extract
     def remove_current_gem
       say "Removing current #{full_gem_name} gem installation:"
       gem_dirs = Dir.glob("#{project_root}/**/*").select do |path|
-                  File.directory?(path) &&
-                  path =~ %r{vendor/gems} &&
-                  File.basename(path) == full_gem_name
-                end
+        File.directory?(path) &&
+          path =~ %r{vendor/gems} &&
+          File.basename(path) == full_gem_name
+      end
       gem_dirs.each do |dir|
         say "  rm -rf #{dir}"
         FileUtils.rm_rf(dir)

data/lib/jets/gems/registered.rb

@@ -9,4 +9,4 @@ module Jets::Gems
       []
     end
   end
-end
+end

data/lib/jets/gems/report.rb

@@ -4,7 +4,7 @@ module Jets::Gems
   class Report
     include Jets::Gems::Api::Concern
 
-    def initialize(options={})
+    def initialize(options = {})
       @options = options
     end
 

data/lib/jets/gems/version.rb

@@ -1,5 +1,5 @@
 module Jets
   module Gems
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/jets/gems.rb

@@ -10,8 +10,8 @@ require "yaml"
 module Jets
   module Gems
     def ruby_folder
-      major, minor, _ = RUBY_VERSION.split('.')
-      [major, minor, '0'].join('.') # 2.5.1 => 2.5.0
+      major, minor, _ = RUBY_VERSION.split(".")
+      [major, minor, "0"].join(".") # 2.5.1 => 2.5.0
     end
 
     extend self

data/lib/serverlessgems.rb

@@ -1 +1 @@
-require "jets/gems"
+require "jets/gems"

data/serverlessgems.gemspec

@@ -3,22 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jets/gems/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "serverlessgems"
-  spec.version       = Jets::Gems::VERSION
-  spec.authors       = ["Tung Nguyen"]
-  spec.email         = ["tongueroo@gmail.com"]
+  spec.name = "serverlessgems"
+  spec.version = Jets::Gems::VERSION
+  spec.authors = ["Tung Nguyen"]
+  spec.email = ["tongueroo@gmail.com"]
 
-  spec.summary       = "Client Library works with Serverless Gems API for Jets Ruby Serverless Framework"
-  spec.homepage      = "https://github.com/boltops-tools/serverlessgems"
-  spec.license       = "MIT"
+  spec.summary = "Client Library works with Serverless Gems API for Jets Ruby Serverless Framework"
+  spec.homepage = "https://github.com/boltops-tools/serverlessgems"
+  spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "gems"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2024-06-22 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.4.10
+rubygems_version: 3.5.13
 signing_key: 
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework