jets 3.0.6 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed89daa4700646743805940f6847196c9be132562bb1f4e90bf4cbeb0053e65
-  data.tar.gz: '09db7db5170f8aefffbd963986a007c1643814cd853c77451b27d06f2f522335'
+  metadata.gz: 0b2e85111e507304b3bd11375499c70f4ba880e1f2523e5f7b2ff627e6558b76
+  data.tar.gz: 5e7bbb320f5e580726ab4d66e11cc47feca970edc61d6d01f1ed25fea2693bad
 SHA512:
-  metadata.gz: ddba3375086b7269d52cdcb0cbe2edca842ac94ab43fd65ea72d0a9ee5ab76cae42f3fc2f67678c4cb3a83533a9cf0993b84278e2268c133ed5bf1de57e41f20
-  data.tar.gz: 9907b63ebf1a56d1eb7ec51b171a98e3a9adb894cebd8dbdcb2a451510975da48704172c71401af5766c85a6ed0f39f804efa180b09aa2645364c62e5ec5397f
+  metadata.gz: 7dbf8891880be71e8b40da911ebb13e5ad39365158efa9bd62426b17e94d8b264a9832f14e32f10a8b402daf34cecda8f5986bcfcc70cb9278a7793b398b61d0
+  data.tar.gz: 6397148e88442a557552397ab01c7b7697f3642593f0aaedcbddd15f01c824e47b64922d21208bf99e01dd2929b547fcc3ef07a0c91afb6e49a58fe46185667f

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.10] - 2021-07-14
+- [#575](https://github.com/boltops-tools/jets/pull/575) fix missing webpacker helpers
+- [#576](https://github.com/boltops-tools/jets/pull/576) Fixes API Gateway base path Lambda not respecting various config opts
+- [#577](https://github.com/boltops-tools/jets/pull/577) Adjust .jetskeep handling and add .jetsignore docs
+- fix dbconsole (#568)
+
+## [3.0.9] - 2021-06-14
+- fix content type s3 metadata (#564)
+
+## [3.0.8] - 2021-06-03
+- Update cli.md (#560)
+- respect .jetsignore also (#562)
+
+## [3.0.7] - 2021-05-27
+- Dont bypass class_attribute setters (#559)
+- update pg version in jets new Gemfile to latest (#558)
+
 ## [3.0.6] - 2021-05-27
 - Handle Errors::InvalidClientTokenId when `get_caller_identity` fails (#543)
 - Use description specifed in function properties (#545)

data/lib/jets/builders/tidy.rb

@@ -35,9 +35,10 @@ module Jets::Builders
       removals = always_removals
       removals += get_removals("#{@project_root}/.gitignore")
       removals += get_removals("#{@project_root}/.dockerignore")
+      removals += get_removals("#{@project_root}/.jetsignore")
       removals = removals.reject do |p|
         jetskeep.find do |keep|
-          p.include?(keep)
+          p == keep
         end
       end
       removals.uniq
@@ -55,7 +56,7 @@ module Jets::Builders
     # We clean out ignored files pretty aggressively. So provide
     # a way for users to keep files from being cleaned out.
     def jetskeep
-      always = %w[.bundle packs vendor]
+      always = %w[.bundle /public/packs /public/packs-test vendor]
       path = "#{@project_root}/.jetskeep"
       return always unless File.exist?(path)
 

data/lib/jets/cfn/upload.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'digest'
+require 'rack/mime'
 
 module Jets::Cfn
   class Upload
@@ -8,12 +9,6 @@ module Jets::Cfn
 
     attr_reader :bucket_name
 
-    CONTENT_TYPES_BY_EXTENSION = {
-      '.css' => 'text/css',
-      '.js' => 'application/javascript',
-      '.html' => 'text/html'
-    }
-
     def initialize(bucket_name)
       @bucket_name = bucket_name
     end
@@ -93,16 +88,23 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path)
+      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      puts "Uploading and setting content type for s3://#{bucket_name}/#{key}" # uncomment to see and debug
-      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type_headers(full_path)))
+      content_type = content_type_headers(full_path)
+      puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
+    CONTENT_TYPES_BY_EXTENSION = {
+      '.css'  => 'text/css',
+      '.html' => 'text/html',
+      '.js'   => 'application/javascript',
+    }
     def content_type_headers(full_path)
-      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      ext = File.extname(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
         { content_type: content_type }
       else

data/lib/jets/commands/dbconsole.rb

@@ -1,12 +1,15 @@
 # Thanks: Rails dbconsole_command.rb
 module Jets::Commands
   class Dbconsole
+    extend Memoist
+
     def self.start(*args)
       new(*args).start
     end
 
     def initialize(options = {})
-      @options = options
+      defaults = {"include_password" => true}
+      @options = defaults.merge(options)
     end
 
     def start
@@ -85,14 +88,14 @@ module Jets::Commands
     end
 
     def config
-      @config ||= begin
-        if configurations[environment].blank?
-          raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
-        else
-          configurations[environment]
-        end
+      configs = configurations.configs_for(env_name: environment)
+      if configs.blank?
+        raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
+      else
+        configs.first.configuration_hash.dup.stringify_keys!
       end
     end
+    memoize :config
 
     def environment
       Jets.env.to_s

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -9,11 +9,11 @@ gem "jetpacker"
 <% if @database == 'postgresql' %>
 # Include pg gem if you are using ActiveRecord, remove next line
 # and config/database.yml file if you are not
-gem "pg", "~> 1.1.3"
+gem "pg", "~> 1.2.3"
 <% elsif @database == 'mysql' %>
 # Include mysql2 gem if you are using ActiveRecord, remove next line
 # and config/database.yml file if you are not
-gem "mysql2", "~> 0.5.2"
+gem "mysql2", "~> 0.5.3"
 <% end %>
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"

data/lib/jets/controller/callbacks.rb

@@ -17,10 +17,12 @@ class Jets::Controller
         end
 
         def skip_before_action(meth, options = {})
-          # adds the methods in the only to the exception list for the callback
-          return append_except_to_callbacks(self.before_actions, meth, options[:only]) if options[:only].present?
-            
-          self.before_actions.reject! { |el| el.first.to_s == meth.to_s }
+          self.before_actions = before_actions
+                                  .reject { |act| act.first.to_s == meth.to_s }
+
+          # If options include the `only` option,
+          # re-add the action using the setter with the `except` option 
+          before_action(meth, { except: options[:only] }) if options[:only].present?
         end
 
         alias_method :append_before_action, :before_action
@@ -38,20 +40,6 @@ class Jets::Controller
         end
 
         alias_method :append_after_action, :after_action
-
-        private
-
-        def append_except_to_callbacks(callback_methods, meth, excepted_methods)
-          callback_methods.map! do |callback_method|
-            if callback_method.first.to_s == meth.to_s
-              exceptions = callback_method.second[:except] || []
-              exceptions.concat(Array.wrap(excepted_methods))
-              callback_method.second[:except] = exceptions
-            end
-
-            callback_method
-          end
-        end
       end
     end # included
 

data/lib/jets/core.rb

@@ -43,7 +43,7 @@ module Jets::Core
   memoize :logger
 
   def webpacker?
-    Gem.loaded_specs.keys.include?("webpacker")
+    Gem.loaded_specs.keys.any?{|k| k.start_with?("webpacker")}
   end
   memoize :webpacker?
 

data/lib/jets/resource/api_gateway/base_path/function.rb

@@ -25,7 +25,9 @@ module Jets::Resource::ApiGateway::BasePath
     end
 
     def layers
-      ["!Ref GemLayer"]
+      return Jets.config.lambda.layers if Jets.config.gems.disable
+
+      ["!Ref GemLayer"] + Jets.config.lambda.layers
     end
 
     def function_name

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.6"
+  VERSION = "3.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.10
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer