jets 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ecc5e447f03b9d40dade6bff50a44934927025c95ccf361f982cc53604df333
-  data.tar.gz: 73c5f39837c54978981ec64d95fb35357120a9713b607da78489f7c90f2b6dcc
+  metadata.gz: f0e2ca4e1e46c54d0900404bd31e09e0d142a2e1b15452e680a1ca61caec0c11
+  data.tar.gz: f299c7812a68de607e111195649b948c7099055ebb7db250c351807828ad38ca
 SHA512:
-  metadata.gz: f2e6263c94821deef72dede51d7f7bb90f5f23a097a019e934f43244ad281f3aacfe64c7ff11645a13b059927b5d4607de4e299b9290cbd77cd29323643c929a
-  data.tar.gz: e9d1d33c1941262bca8139d7d0512b0ab89ec9e4b0300d2d232ca4de083c0eeffe009e5e62910ea5c2661fd8bda4f35295246b5cc18e37a129b1126b5b16a65c
+  metadata.gz: 50812ce230aad0e1fa837152dcf69ad53436772ce2c4339f1b2e868efe182ae9af7bec4c2f5dc8efc9d86ebd2f0857f3bc8c6dc0faedb4822af2b69c9636cea7
+  data.tar.gz: a34ff0de3463ec1db9f4cab3f5f9372de2211c2efa6eb0888a0c680755605b4d82e8843553e9bfca484cf056046b57b7dc36a5d054aba94a47d6dc1bd2641094

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.1.3]
+- Merge pull request #79 from tongueroo/misc-fixes
+- fix has_poly? check to account for shared functions
+- fix jets new mode job copy_options
+- fix Jets Turbine require active support fixes issue #78
+- parse for project name as workaround to avoid double loading config/application.rb
+
 ## [1.1.2]
 - Add option to specify authorization type application-wide option and on a per-route basis.
 - Add option to specify endpoint type of the ApiGateway: config.api.endpoint_type option

data/Gemfile.lock

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

data/lib/jets/application.rb

@@ -85,28 +85,32 @@ class Jets::Application
     config
   end
 
-  def load_app_config
-    # First time loading will not have all correct values. Some values like
-    # project_namespace depend on project_name. Loading the config twice
-    # resolves the chicken-and-egg problem with config.project_name.
-    # TODO: Improve the way we this is solved.
-    eval_app_config(squash_exception: true) # first time load to capture the config.project_name
-    @config = default_config(config.project_name) # reset config with the captured project_name
+  # Double evaling config/application.rb causes subtle issues:
+  #   * double loading of shared resources: Jets::Stack.subclasses will have the same
+  #   class twice when config is called when declaring a function
+  #   * forces us to rescue all exceptions, which is a big hammer
+  #
+  # Lets parse for the project name instead for now.
+  #
+  def parse_project_name
+    lines = IO.readlines("#{Jets.root}config/application.rb")
+    project_name_line = lines.find { |l| l =~ /project_name/ }
+    project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') # project_name
+  end
 
+  def load_app_config
+    project_name = parse_project_name
+    @config = default_config(project_name)
     set_dependent_configs! # things like project_namespace that need project_name
-
-    # Running eval_app_config the second time, hack to solve the chicken-and-egg problem
     eval_app_config
 
     set_iam_policy # relies on dependent values, must be called afterwards
     normalize_env_vars!
   end
 
-  def eval_app_config(squash_exception: false)
+  def eval_app_config
     app_config = "#{Jets.root}config/application.rb"
-    load app_config
-  rescue NoMethodError => e
-    raise(e) unless squash_exception
+    require app_config
   end
 
   def load_environments_config

data/lib/jets/commands/build.rb

@@ -141,12 +141,29 @@ module Jets::Commands
     # In this case, we can skip a lot of the ruby related building and speed up the
     # deploy process.
     def self.poly_only?
+      !app_has_ruby? && !shared_has_ruby?
+    end
+
+    def self.app_has_ruby?
       has_ruby = app_files.detect do |path|
         app_class = Jets::Klass.from_path(path)  # IE: PostsController, Jets::PublicController
         langs = app_class.tasks.map(&:lang)
         langs.include?(:ruby)
       end
-      !has_ruby
+      !!has_ruby
+    end
+
+    def self.shared_has_ruby?
+      has_ruby = false
+      Jets::Stack.subclasses.each do |klass|
+        klass.functions.each do |fun|
+          if fun.lang == :ruby
+            has_ruby = true
+            break
+          end
+        end
+      end
+      has_ruby
     end
 
     # Add internal Jets controllers if they are being used

data/lib/jets/commands/sequence.rb

@@ -65,6 +65,15 @@ private
         database.yml
         models/application_record
       ]
+    else
+      []
+    end
+
+    if excludes.empty?
+      {}
+    else
+      pattern = Regexp.new(excludes.join('|'))
+      {exclude_pattern: pattern }
     end
   end
 

data/lib/jets/turbine.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 module Jets
   class Turbine
     class_attribute :initializers

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack