jets 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb22c9d9b8de3f074f3365fb40ce6f0a5aa5e745ae51ae7d295c5b21929b3c2
-  data.tar.gz: 0d990945082be50bbce002a6c0b0232560f2ea17553b5b642dd96eb17264832e
+  metadata.gz: 2caf68ff06e809fb88b76bdfb381aca29ce7f8540989dd775da2b288351b7f28
+  data.tar.gz: 566b69b388a24b2d110cd522c410b4be939a4a8e38f2771a69618228ffd8009c
 SHA512:
-  metadata.gz: 8d4340fe4a89c7f482a37e6f22161a49edc2cbd6e9c1d3b02279b2a01bd3e4ee44137f2eee93a868623351655a0fb6c7683808a21816bf196b91e9de26f589ec
-  data.tar.gz: ee828e0a8f06ff7122fc273f854719fe9256150a18d9c418620d4d009b54871fa2f1040bdae3c083022cd80470dce1ae5057b41c4f0e12a4eb4f1122c343faab
+  metadata.gz: c76ed8e21738349e7052c01d27bce581afd66a8c32980532e1a2c63fcf597336bb6deabcdea64db75a880b4e055516d33271e543dcae9196b74a22e95685be9c
+  data.tar.gz: c753ef10f2c180de87e82305b68195ff591a53f1b3b497144df7ddf43aeb7bce3d779183172984d068458a070512b072920b85986ad3354a5384ee5dead40c09

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/), even before v1.0.
 
+## [1.0.5]
+- change config.lambdagems to config.gems
+- friendly info message when yarn is not installed
+- improve rails:import rack/config/database.yml generation
+- update gems check
+
 ## [1.0.4]
 - import:rails reconfigure database.yml pull request #56 from tongueroo/database-yml
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.0.4)
+    jets (1.0.5)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/application.rb

@@ -32,8 +32,8 @@ class Jets::Application
     config.prewarm.public_ratio = 3
     config.prewarm.rack_ratio = 5
 
-    config.lambdagems = ActiveSupport::OrderedOptions.new
-    config.lambdagems.sources = [
+    config.gems = ActiveSupport::OrderedOptions.new
+    config.gems.sources = [
       'https://gems.lambdagems.com'
     ]
 

data/lib/jets/builders/gem_replacer.rb

@@ -8,15 +8,7 @@ class Jets::Builders
 
     def run
       check = Jets::Gems::Check.new
-      found_gems = check.run
-      if check.missing?
-        # Exits early if not all the linux gems are available.
-        # Better to error now than deploy a broken package to AWS Lambda.
-        # Provide users with message about using their own lambdagems source.
-        puts check.missing_message
-        Jets::Gems::Report.missing(check.missing_gems)
-        exit 1
-      end
+      found_gems = check.run! # exits early if missing gems found
 
       # Reaching here means its safe to download and extract the gems
       found_gems.each do |gem_name, source|

data/lib/jets/commands/gems.rb

@@ -4,20 +4,16 @@ module Jets::Commands
     long_desc Help.text("gems:check")
     def check
       check = Jets::Gems::Check.new(cli: true)
-      check.run
-      if check.missing?
-        puts check.missing_message
-        Jets::Gems::Report.missing(check.missing_gems)
-      else
-        puts "Congrats! All gems are available in as pre-built Lambda gems 👍"
-      end
+      check.run! # exits early if missing gems found
+      # If reach here, means all gems are ok.
+      puts "Congrats! All gems are available in as pre-built Lambda gems 👍"
     end
-    
-    desc "sources", "List configured sources", hide: true
+
+    desc "sources", "List pre-built Lambda gem sources"
     long_desc Help.text("gems:sources")
     def sources
-      puts "Your pre-built lambda gem sources are:"
-      Jets.config.lambdagems.sources.each do |source|
+      puts "Your pre-built Lambda gem sources are:"
+      Jets.config.gems.sources.each do |source|
         puts "  #{source}"
       end
     end

data/lib/jets/commands/help/gems/check.md

@@ -1,7 +1,8 @@
 You can configure additional gem sources in config/application.rb:
 
+    # Sources for check for pre-compiled Lambda gems. Checks the list in order.
     Jets.application.configure do
-      config.lambdagems.sources = [
+      config.gems.sources = [
         "https://gems.lambdagems.com"
       ]
     end

data/lib/jets/commands/import/rail.rb

@@ -33,12 +33,10 @@ CODE
       return unless File.exist?(current_yaml)
 
       vars = {}
-      data = YAML.load_file(current_yaml)
-      # Grab values from current database.yml
-      %w[development test production].each do |env|
-        vars["database_#{env}"] = data[env]['database']
-      end
-      vars['adapter'] = data['development']['adapter']
+      current_database = YAML.load_file(current_yaml)
+      database_names = infer_database_name(current_database)
+      vars.merge!(database_names)
+      vars['adapter'] = current_database['development']['adapter']
 
       path = File.expand_path("templates/config/database.yml", File.dirname(__FILE__))
       content = Jets::Erb.result(path, vars)
@@ -82,10 +80,28 @@ CODE
 
         # Deploy
 
-        When you're ready deploy to AWS Lambda with:
+        When you are ready deploy to AWS Lambda with:
 
             jets deploy
-      EOL
+        EOL
+    end
+
+  private
+    def infer_database_name(current_database)
+      vars = {}
+      %w[development test production].each do |env|
+        if !current_database[env]['database'].include?('<%') # already has ERB
+          vars["database_#{env}"] = current_database[env]['database']
+        else
+          lines = IO.readlines("#{Jets.root}rack/config/application.rb")
+          module_line = lines.find { |l| l =~ /^module / }
+          app_module = module_line.gsub(/^module /,'').strip
+          app_name = app_module.underscore
+          vars["database_#{env}"] = "#{app_name}_#{env}"
+        end
+      end
+
+      vars
     end
   end
 end

data/lib/jets/commands/import/sequence.rb

@@ -40,7 +40,7 @@ class Jets::Commands::Import
       puts "Creating rack folder"
       template_path = File.expand_path(@source)
       set_source_paths(template_path)
-      directory ".", rack_folder
+      directory ".", rack_folder, exclude_pattern: %r{.git}
     end
 
     def set_source_paths(*paths)

data/lib/jets/commands/new.rb

@@ -60,6 +60,21 @@ module Jets::Commands
 
     def webpacker_install
       return unless @webpacker
+      unless yarn_installed?
+        puts "Yarn is not installed or has not been detected. Please double check that yarn has been installed.".colorize(:red)
+        puts <<~EOL
+          To check:
+
+              which yarn
+
+          If it is not installed, you can usually install it with:
+
+              npm install -g yarn
+
+          Refer to the install docs for more info: http://rubyonjets.com/docs/install/
+        EOL
+        exit 1
+      end
 
       command = "jets webpacker:install"
       command += " FORCE=1" if options[:force]

data/lib/jets/commands/sequence.rb

@@ -69,6 +69,10 @@ private
   end
 
   def git_installed?
-    system("type git > /dev/null")
+    system("type git > /dev/null 2>&1")
+  end
+
+  def yarn_installed?
+    system("type yarn > /dev/null 2>&1")
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/vendor/jets-gems/lib/jets/gems/check.rb

@@ -20,13 +20,13 @@ module Jets::Gems
     #     "pg-0.21.0" => "https://anothersource.com",
     #   }
     #
-    def run
+    def run!
       puts "Checking projects gems for pre-built Lambda gems..."
       found_gems = {}
       compiled_gems.each do |gem_name|
         puts "Checking #{gem_name}..." if @options[:cli]
         gem_exists = false
-        Jets.config.lambdagems.sources.each do |source|
+        Jets.config.gems.sources.each do |source|
           exist = Jets::Gems::Exist.new(source_url: source)
           found = exist.check(gem_name)
           # gem exists on at least of the lambdagem sources
@@ -40,6 +40,16 @@ module Jets::Gems
           @missing_gems << gem_name
         end
       end
+
+      unless @missing_gems.empty?
+        # Exits early if not all the linux gems are available.
+        # Better to error now than deploy a broken package to AWS Lambda.
+        # Provide users with message about using their own lambdagems source.
+        puts missing_message
+        Report.missing(@missing_gems)
+        exit 1
+      end
+
       found_gems
     end
 
@@ -55,7 +65,7 @@ Your project requires compiled gems were not available in any of your lambdagems
 <% end %>
 
 Your current lambdagems sources:
-<% Jets.config.lambdagems.sources.map do |source| %>
+<% Jets.config.gems.sources.map do |source| %>
 * <%= source -%>
 <% end %>
 
@@ -65,7 +75,7 @@ Jets is unable to build a deployment package that will work on AWS Lambda withou
 * Wait until it added to lambdagems.com. No need to report this to us, as we've already been notified.
 * Use another gem that does not require compilation.
 
-Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages. We make an effort add new gems as soon as we can.
+Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages.
 EOL
       erb = ERB.new(template, nil, '-') # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
       erb.result(binding)

data/vendor/jets-gems/lib/jets/gems/exist.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Jets::Gems
   class Exist
     def initialize(options)
@@ -31,7 +33,7 @@ module Jets::Gems
       end
       res = req.request_head(url.path)
       res.code == "200"
-    rescue SocketError, OpenURI::HTTPError
+    rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
       false
     end
 

data/vendor/jets-gems/lib/jets/gems/report.rb

@@ -2,6 +2,8 @@ require "net/http"
 
 module Jets::Gems
   class Report
+    # For local testing, example:
+    #   LAMBDAGEM_API_URL=localhost:8888/api/v1 jets gems:check
     LAMBDAGEM_API_URL = ENV["LAMBDAGEM_API_URL"] || "https://api.lambdagems.com/api/v1"
 
     def self.missing(gems)
@@ -19,7 +21,7 @@ module Jets::Gems
         if md = gem_name.match(version_pattern)
           name, version = md[1], md[2]
           threads << Thread.new do
-            call_api("report/missing?name=#{name}&version=#{version}")
+            call_api("report/missing?name=#{name}&version=#{version}", async: true)
           end
         else
           puts "WARN: Unable to extract the version from the gem name."
@@ -31,16 +33,30 @@ module Jets::Gems
     end
 
     def api_url(path)
-      "#{LAMBDAGEM_API_URL}/#{path}"
+      url = "#{LAMBDAGEM_API_URL}/#{path}"
+      url.include?("http") ? url : "http://#{url}" # ensure http or https has been provided
     end
 
-    def call_api(path)
-      # raise "HI"
+    def call_api(path, async: false)
       uri = URI(api_url(path))
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == "https"
+      # Abusing read_timeout to mimic async fire and forget behavior.
+      # This makes the code continue and return very quickly and we ignore the response
+      # Thanks: https://www.mikeperham.com/2015/05/08/timeout-rubys-most-dangerous-api/
+      # https://github.com/ankane/the-ultimate-guide-to-ruby-timeouts/issues/8
+      http.max_retries = 0 # Fix http retries, read_timeout will cause retries immediately, we want to disable this behavior
+      http.read_timeout = 0.01 if async
       request = Net::HTTP::Get.new(uri)
-      response = http.request(request)
+      begin
+        response = http.request(request)
+      rescue Net::ReadTimeout
+        # Abusing read_timeout to mimic async fire and forget behavior
+      end
+      return nil if async # always return nil if async behavior requested.
+        # In theory we can sometimes get back a response if it returns before
+        # the read timeout but that's a confusing interface.
+
       resp = {
         status: response.code.to_i,
         headers: response.each_header.to_h,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Tung Nguyen