jets 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44b41d2b76b96588efa60f037a9428b7116c817906b653088c163acbccfd2b8
-  data.tar.gz: a49185d012396c06b1e01b47df7174bd2abc7438e73bfffafa47e8864a7463d8
+  metadata.gz: fec31381880e8479247d24386a6e707d7bf7d7a78596bfebee22b4be7b7a1a6c
+  data.tar.gz: 23665458e46e20ead4787f5567950ba7d67581473c63413c69ac9f1e97356587
 SHA512:
-  metadata.gz: 5bd0117da8ed1de85ceff306f472e7e8cafbfdbb03342adc8d55f140368f0e2a7f6fb4d6b98b48e94b9908ed7249583217592348505505563d8872bd06a3e2d2
-  data.tar.gz: 05e867a383e52d8c3c6f98b0814e626040539a83b8975d5c599e3c88d5ace3f99324f66b7d667ad93354b36ea9a43f7f038d99eaaaf851fa8670ff4f094a1c26
+  metadata.gz: 4fc47d7cc8848285737cfa87a0029eba9170367a03e19a374d5d87b0df71ccd9dbc1945bb9ad9230411e3c29044f1f199a8b95fa55e67637d3719a5ce6da6184
+  data.tar.gz: ac6a5970973ab59d8336155dae880cbd3f6c0d93b0d8cb70549508108fa7d0ca0896973205aaef4c5f834b895d933f8fde1fa7918f9abd24d7f2eb4bef2423e8

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [0.10.4]
+- Merge pull request #51 from tongueroo/fix-aws-account: fix aws account lookup when ~/.aws/config not configured
+- deprecate config.api_mode for api.mode = "api"
+
 ## [0.10.3]
 - expose Jets::Application.default_iam_policy so user can re-use
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.10.3)
+    jets (0.10.4)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -72,7 +72,7 @@ GEM
     aws-sdk-cloudwatchlogs (1.8.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.28.0)
+    aws-sdk-core (3.30.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -86,7 +86,7 @@ GEM
     aws-sdk-lambda (1.10.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.20.0)
+    aws-sdk-s3 (1.21.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -118,7 +118,7 @@ GEM
     mimemagic (0.3.2)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     pg (0.21.0)
     rack (2.0.5)
@@ -145,7 +145,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/README.md

@@ -133,6 +133,7 @@ For more documentation, check out the official docs: [Ruby on Jets](http://rubyo
 * [CLI Reference](http://rubyonjets.com/reference/)
 * [Contributing](http://rubyonjets.com/docs/contributing/)
 * [Support Jets](http://rubyonjets.com/support-jets/)
+* [Example Projects](https://github.com/tongueroo/jets-examples)
 
 ## Articles
 

data/lib/jets/application.rb

@@ -104,7 +104,7 @@ class Jets::Application
     config.project_namespace = Jets.project_namespace
 
     # Must set default iam_policy here instead of `def config` because we need access to
-    # the project_namespace and if we call it from `def config` we get an infinit loop
+    # the project_namespace and if we call it from `def config` we get an infinite loop
     config.iam_policy ||= self.class.default_iam_policy
     config.managed_policy_definitions ||= [] # default empty
   end

data/lib/jets/aws_info.rb

@@ -13,13 +13,26 @@ module Jets
       region = nil
 
       # First try to get it from the ~/.aws/config
-      region = `aws configure get region`.strip rescue nil
+      region = `aws configure get region 2>&1`.strip rescue nil
+      exit_code = $?.exitstatus
+      if exit_code != 0
+        exception_message = region.split("\n").grep(/botocore\.exceptions/).first
+        if exception_message
+          puts "WARN: #{exception_message}".colorize(:yellow)
+        else
+          # show full message as warning
+          puts region.colorize(:yellow)
+        end
+        puts "You can also get rid of this message by setting AWS_REGION or configuring ~/.aws/config with the region"
+        region = nil
+      end
+      region = nil if region == ''
       return region if region
 
       # Second try the metadata endpoint, should be available on AWS Lambda environment
       # https://stackoverflow.com/questions/4249488/find-region-from-within-an-ec2-instance
       begin
-        az = `curl -s --max-time 5 --connect-timeout 5 http://169.254.169.254/latest/meta-data/placement/availability-zone`
+        az = `curl -s --max-time 3 --connect-timeout 5 http://169.254.169.254/latest/meta-data/placement/availability-zone`
         region = az.strip.chop # remove last char
         region = nil if region == ''
       rescue
@@ -33,6 +46,8 @@ module Jets
     # aws sts get-caller-identity
     def account
       return '123456789' if test?
+      # ensure region set, required for sts.get_caller_identity.account to work
+      ENV['AWS_REGION'] ||= region
       sts.get_caller_identity.account
     end
     memoize :account

data/lib/jets/commands/base.rb

@@ -128,7 +128,7 @@ class Jets::Commands::Base < Thor
       end
     end
 
-    # If this fails to match then it'l just return the original full command
+    # If this fails to find a match then return the original full command
     def autocomplete(full_command)
       return nil if full_command.nil? # jets help
 

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -1,6 +1,6 @@
 Jets.application.configure do
   config.project_name = "<%= @project_name %>"
-  config.api_mode = <%= @options[:mode] == 'api' %>
+  config.mode = "<%= @options[:mode] %>"
 
   # config.prewarm.enable = true # default is true
   # config.prewarm.rate = '30 minutes' # default is '30 minutes'

data/lib/jets/generator.rb

@@ -27,7 +27,7 @@ class Jets::Generator
     g.stylesheets     false
     g.javascripts     false
     g.assets          false
-    g.api             Jets.config.api_mode
+    g.api             Jets.config.mode == 'api'
     g.resource_route  true
     g.templates.unshift(template_paths)
     g

data/lib/jets/router.rb

@@ -30,14 +30,14 @@ module Jets
     end
 
     def api_mode?
-      if Jets.config.api_generator
+      unless Jets.config.key?(:mode)
         puts <<~EOL.colorize(:yellow)
           DEPRECATED: Jets.config.api_generator
           Instead, please update your config/application.rb to use:
-            Jets.config.api_mode
+            Jets.config.mode = 'api'
         EOL
       end
-      api_mode = Jets.config.api_mode || Jets.config.api_generator
+      api_mode = Jets.config.mode == 'api' || Jets.config.api_mode || Jets.config.api_generator
       api_mode
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

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