jets 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a10e580d02662a4ebaf411e72c6d5c6722f4364e8a0bf7adbd032e5846da9c9
-  data.tar.gz: dc54bc8b1a45001722702e5a1b6a196120df43efd0ea945e97e23ebd94d29f62
+  metadata.gz: a9682b366c1e6cff9d63140310ff2c32d0a132996f1383ad2d1381a43952e3fd
+  data.tar.gz: 128f7f3d161210124c8c551ca9b0cc1d45b9050d92d80aa9294d66512eaf1e70
 SHA512:
-  metadata.gz: c21dd6f28a6f5c6d150a441729a6c4ea7db9813160a9cfcf574ede7740ddd0ae58ed97f4c123590d1f8c01526597c10816899a89e187c968deb3b40ae97d8aca
-  data.tar.gz: ae3bd8e7d18c10479dc8bdd62a25781c6d34550c997f638ea7f809fe730f56345b1b1753a316146f9293a94385231b5b5536334cb389102030da31fc8865841e
+  metadata.gz: 4455ad5c44a56286a1f7a5572afa27e0d3119d5822e2bea2f1bbc5f30493a0da397a92ad8724eecdbae17c4dda76dc0475a5e1013a23f0257ef4cb31d21c7387
+  data.tar.gz: 52122940d1a971055d18d36632d828823349340b311c1b2b76e3dd5e0da0d4e0268078c6f48704115724e6cd44217ab5c1e7aa3fe99ebd40f44178a874312414

data/.gitmodules

@@ -1,6 +1,6 @@
-[submodule "vendor/lambdagem"]
-	path = vendor/lambdagem
-	url = https://github.com/tongueroo/lambdagem.git
 [submodule "vendor/dynomite"]
 	path = vendor/dynomite
 	url = https://github.com/tongueroo/dynomite.git
+[submodule "vendor/jets-gems"]
+	path = vendor/jets-gems
+	url = https://github.com/tongueroo/jets-gems

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.2]
+- jets import:rails --submodule option. pull request #54 from tongueroo/import
+- upgrade to jets-gems. pull request #53 from tongueroo/gems
+- jets gems:check command
+- jets gems:sources hidden command
+
 ## [1.0.1]
 - jets upgrade:v1 command
 - Merge pull request #52 from tongueroo/upgrade-command

data/Gemfile.lock

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

data/README.md

@@ -23,6 +23,21 @@ The official documentation is at: [Ruby on Jets](http://rubyonjets.com).
 
 Refer to the official docs for more info, but here's a quick intro.
 
+### Jets Functions
+
+Jets supports writing AWS Lambda functions with Ruby. You define them in the `app/functions` folder. A function looks like this:
+
+app/functions/simple.rb:
+
+```ruby
+def handle(event, context)
+  puts "hello world"
+  {hello: "world"}
+end
+```
+
+Though simple functions are supported by Jets, aside from the ability to use Ruby, they do not as much value as other ways to write code with Jets.
+
 ### Jets Controllers
 
 A Jets controller handles a web request and renders a response.  Here's an example:
@@ -115,6 +130,10 @@ After deployment, you can test the Lambda functions with the AWS Lambda console
 
 Here's a [Live Demo](https://demo.rubyonjets.com/posts) of the quintessential CRUD Jets app.
 
+### Rails Support
+
+Jets [Mega Mode](http://rubyonjets.com/docs/megamode/) provides Rails support with little effort.  This allows you run a Rails application on AWS Lambda. Refer to the [Rails Support](http://rubyonjets.com/docs/rails-support/) docs for more info.
+
 ### More Info
 
 For more documentation, check out the official docs: [Ruby on Jets](http://rubyonjets.com/).  Here's a list of useful links:
@@ -127,15 +146,18 @@ For more documentation, check out the official docs: [Ruby on Jets](http://rubyo
 * [App Configuration](http://rubyonjets.com/app-config/)
 * [Database Support](http://rubyonjets.com/docs/database-support/)
 * [Polymorphic Support](http://rubyonjets.com/docs/polymorphic-support/)
+* [Rails Support](http://rubyonjets.com/docs/rails-support/)
 * [Tutorials](http://rubyonjets.com/docs/tutorials/)
 * [Prewarming](http://rubyonjets.com/docs/prewarming/)
+* [Custom Resources](http://rubyonjets.com/docs/associated-resources/)
+* [Shared Resources](http://rubyonjets.com/docs/shared-resources/)
 * [Installation](http://rubyonjets.com/docs/install/)
 * [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
+## Learning Content
 
 * [Introducing Jets: A Ruby Serverless Framework](https://blog.boltops.com/2018/08/18/introducing-jets-a-ruby-serverless-framework)
 * [AWS Lambda Ruby Support at Native Speed with Jets](https://blog.boltops.com/2018/09/02/aws-lambda-ruby-support-at-native-speed-with-jets)

data/jets.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-sns"
   spec.add_dependency "colorize"
   spec.add_dependency "dotenv"
+  spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
   spec.add_dependency "json"
   spec.add_dependency "kramdown"
@@ -50,8 +51,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
 
-  spec.add_dependency "gems" # lambdagem dependency
-
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/jets.rb

@@ -8,7 +8,7 @@ require "fileutils"
 require "memoist"
 
 module Jets
-  # When we update Jets::RUBY_VERSION, need to update lambdagem/base.rb: def jets_ruby_version also
+  # When we update Jets::RUBY_VERSION, need to update jets-gems/base.rb: def jets_ruby_version also
   RUBY_VERSION = "2.5.0"
 
   autoload :Application, "jets/application"
@@ -22,6 +22,7 @@ module Jets
   autoload :Commands, "jets/commands"
   autoload :Controller, 'jets/controller'
   autoload :Core, "jets/core"
+  autoload :Db, 'jets/db'
   autoload :Dotenv, 'jets/dotenv'
   autoload :Erb, "jets/erb"
   autoload :Generator, "jets/generator"
@@ -52,9 +53,8 @@ end
 
 require "jets/core_ext/kernel"
 
-$:.unshift(File.expand_path("../../vendor/lambdagem/lib", __FILE__))
-require "lambdagem"
-require "gems" # lambdagem dependency
+$:.unshift(File.expand_path("../../vendor/jets-gems/lib", __FILE__))
+require "jets-gems"
 
 # lazy loaded dependencies: depends what project. Mainly determined by Gemfile
 # and config files.
@@ -63,10 +63,4 @@ if File.exist?("#{Jets.root}config/dynamodb.yml")
   require "dynomite"
 end
 
-# Thanks: https://makandracards.com/makandra/42521-detecting-if-a-ruby-gem-is-loaded
-# TODO: move require "pg" into loader class and abstract to support more gems
-if File.exist?("#{Jets.root}config/database.yml")
-  require "active_record"
-  require "pg" if Gem.loaded_specs.has_key?('pg')
-  require "mysql2" if Gem.loaded_specs.has_key?('mysql2')
-end
+Jets::Db # trigger autoload

data/lib/jets/builders/gem_replacer.rb

@@ -1,88 +1,35 @@
-# def extract_gems
-#   headline "Replacing compiled gems with Lambda Linux versions."
-#   Lambdagem::Extract::Gem.new(Jets::RUBY_VERSION,
-#     s3: "lambdagems",
-#     dest: full(cache_area),
-#   ).run
-# end
 class Jets::Builders
   class GemReplacer
     extend Memoist
-    attr_reader :missing_gems
     def initialize(ruby_version, options)
       @ruby_version = ruby_version
       @options = options
-      @missing_gems = [] # keeps track of gems that are not found in any of the lambdagems sources
     end
 
     def run
-      # Checks whether the gem is found on at least one of the lambdagems sources.
-      # By the time the loop finishes, found_gems will hold a map of gem names to found
-      # url sources. Example:
-      #
-      #   found_gems = {
-      #     "nokogiri-1.8.4" => "https://lambdagems.com",
-      #     "pg-0.21.0" => "https://anothersource.com",
-      #   }
-      #
-      found_gems = {}
-      compiled_gems.each do |gem_name|
-        gem_exists = false
-        Jets.config.lambdagems.sources.each do |source|
-          exist = Lambdagem::Exist.new(lambdagems_url: source)
-          found = exist.check(gem_name)
-          # gem exists on at least of the lambdagem sources
-          if found
-            gem_exists = true
-            found_gems[gem_name] = source
-            break
-          end
-        end
-        unless gem_exists
-          @missing_gems << gem_name
-        end
-      end
-
-      # Exits early if not all the linux gems are available.
-      # It better to error now than deploy a broken package to AWS Lambda.
-      # Provide users with message about using their own lambdagems source.
-      unless @missing_gems.empty?
-        puts missing_gems_message
+      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
 
-      # Reaching here means we can download and extract the gems
-      Lambdagem.log_level = :info
+      # Reaching here means its safe to download and extract the gems
       found_gems.each do |gem_name, source|
-        gem_extractor = Lambdagem::Extract::Gem.new(gem_name, @options.merge(lambdagems_url: source))
+        options = @options.merge(source_url: source)
+        gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, options)
         gem_extractor.run
       end
 
       tidy
     end
 
-    def missing_gems_message
-      template = <<-EOL
-Your project requires compiled gems were not available in any of your lambdagems sources.  Unavailable pre-compiled gems:
-<% missing_gems.each do |gem| %>
-* <%= gem -%>
-<% end %>
-
-Your current lambdagems sources:
-<% Jets.config.lambdagems.sources.map do |source| %>
-* <%= source -%>
-<% end %>
-
-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:
-
-* Build the gem yourself and add it to your own custom lambdagems sources. Refer to the Lambda Gems Docs: http://rubyonjets.com/docs/lambdagems
-* 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.
+    def report_missing_gems
 
-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.
-EOL
-      erb = ERB.new(template, nil, '-') # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
-      erb.result(binding)
     end
 
     # remove unnecessary files to reduce package size
@@ -120,36 +67,5 @@ EOL
         end
       end
     end
-
-    # If there are subfolders compiled_gem_paths might have files deeper
-    # in the directory tree.  So lets grab the gem name and figure out the
-    # unique paths of the compiled gems from there.
-    def compiled_gems
-      compiled_gem_paths.map { |p| gem_name_from_path(p) }.uniq# + ["whatever-0.0.1"]
-    end
-    memoize :compiled_gems
-
-    # Use pre-compiled gem because the gem could have development header shared
-    # object file dependencies.  The shared dependencies are packaged up as part
-    # of the pre-compiled gem so it is available in the Lambda execution environment.
-    #
-    # Example paths:
-    # Macosx:
-    #   bundled/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/nokogiri-1.8.1
-    #   bundled/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
-    # Official AWS Lambda Linux AMI:
-    #   bundled/gems/ruby/2.5.0/extensions/x86_64-linux/2.5.0-static/nokogiri-1.8.1
-    # Circleci Ubuntu based Linux:
-    #   bundled/gems/ruby/2.5.0/extensions/x86_64-linux/2.5.0/pg-0.21.0
-    def compiled_gem_paths
-      Dir.glob("#{Jets.build_root}/cache/bundled/gems/ruby/*/extensions/**/**/*.{so,bundle}")
-    end
-
-    # Input: bundled/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
-    # Output: byebug-9.1.0
-    def gem_name_from_path(path)
-      regexp = /gems\/ruby\/\d+\.\d+\.\d+\/extensions\/.*?\/.*?\/(.*?)\//
-      gem_name = path.match(regexp)[1]
-    end
   end
 end

data/lib/jets/builders/ruby_packager.rb

@@ -161,7 +161,7 @@ EOL
       IO.write(bundle_config, text)
     end
 
-    def lambdagem_options
+    def gems_options
       {
         s3: "lambdagems",
         build_root: cache_area, # used in lambdagem
@@ -171,13 +171,12 @@ EOL
 
     def extract_ruby
       headline "Setting up a vendored copy of ruby."
-      Lambdagem.log_level = :info
-      Lambdagem::Extract::Ruby.new(Jets::RUBY_VERSION, lambdagem_options).run
+      Jets::Gems::Extract::Ruby.new(Jets::RUBY_VERSION, gems_options).run
     end
 
     def extract_gems
       headline "Replacing compiled gems with AWS Lambda Linux compiled versions."
-      GemReplacer.new(Jets::RUBY_VERSION, lambdagem_options).run
+      GemReplacer.new(Jets::RUBY_VERSION, gems_options).run
     end
 
     def copy_bundled_cache

data/lib/jets/builders/tidy.rb

@@ -57,6 +57,15 @@ class Jets::Builders
 
         rm_rf(path)
       end
+
+      remove_gem_cache
+    end
+
+    # Reason do not remove the cache folder generally is because some gems have
+    # actual cache folders that they used.
+    def remove_gem_cache
+      ruby_minor_version = Jets::RUBY_VERSION.split('.')[0..1].join('.') + '.0'
+      FileUtils.rm_rf("#{@project_root}/bundled/gems/ruby/#{ruby_minor_version}/cache")
     end
 
     def rm_rf(path)

data/lib/jets/commands.rb

@@ -9,6 +9,7 @@ module Jets::Commands
   autoload :Delete, "jets/commands/delete"
   autoload :Deploy, "jets/commands/deploy"
   autoload :Dynamodb, "jets/commands/dynamodb"
+  autoload :Gems, 'jets/commands/gems'
   autoload :Help, "jets/commands/help"
   autoload :Import, "jets/commands/import"
   autoload :Main, "jets/commands/main"

data/lib/jets/commands/base.rb

@@ -63,7 +63,7 @@ class Jets::Commands::Base < Thor
                       .sub(/\.rb$/,'')
                       .sub(%r{.*/jets/commands}, 'jets/commands')
                       .classify
-        class_name.sub!(/Task$/, "Tasks") # special rule here for Tasks class
+        class_name = special_class_map(class_name)
         # NOTE: Weird thing where Jets::Commands::Db::Task => Thor::Command
         # because Task is a class available to Thor I believe.
         # puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
@@ -124,10 +124,19 @@ class Jets::Commands::Base < Thor
       else
         class_name = namespace.gsub(':','/')
         class_name = "Jets::Commands::#{class_name.classify}"
+        class_name = special_class_map(class_name)
         class_name.constantize
       end
     end
 
+    def special_class_map(class_name)
+      map = {
+        'Jets::Commands::RakeTask' => 'Jets::Commands::RakeTasks',
+        'Jets::Commands::Gem' => 'Jets::Commands::Gems',
+      }
+      map[class_name] || class_name
+    end
+
     # 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/gems.rb

@@ -0,0 +1,25 @@
+module Jets::Commands
+  class Gems < Jets::Commands::Base
+    desc "check", "Check if pre-built Lambda gems are available from the sources"
+    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
+    end
+    
+    desc "sources", "List configured sources", hide: true
+    long_desc Help.text("gems:sources")
+    def sources
+      puts "Your pre-built lambda gem sources are:"
+      Jets.config.lambdagems.sources.each do |source|
+        puts "  #{source}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+You can configure additional gem sources in config/application.rb:
+
+    Jets.application.configure do
+      config.lambdagems.sources = [
+        "https://gems.lambdagems.com"
+      ]
+    end

data/lib/jets/commands/help/import/rails.md

@@ -2,10 +2,10 @@ Imports a Rails application into a Jets project and configures it for [Mega Mode
 
 ## Example
 
-    jets import:rails http://github.com/tongueroo/jets-examples-rails.git
+    jets import:rails http://github.com/tongueroo/demo-rails.git
 
 ## More Examples
 
-    jets import:rails tongueroo/jets-examples-rails # expands to github
-    jets import:rails git@github.com:tongueroo/jets-examples-rails.git
+    jets import:rails tongueroo/demo-rails # expands to github
+    jets import:rails git@github.com:tongueroo/demo-rails.git
     jets import:rails /path/to/folder/jets-examples-rails

data/lib/jets/commands/import.rb

@@ -1,10 +1,14 @@
 module Jets::Commands
   class Import < Jets::Commands::Base
     autoload :Base, 'jets/commands/import/base'
+    autoload :Cheatsheet, 'jets/commands/import/cheatsheet'
     autoload :Rack, 'jets/commands/import/rack'
     autoload :Rail, 'jets/commands/import/rail'
     autoload :Sequence, 'jets/commands/import/sequence'
 
+    Jets::Commands::Import::Base.cli_options.each do |args|
+      class_option(*args)
+    end
     long_desc Help.text('import:rails')
     register(Jets::Commands::Import::Rail, "rails", "rails", "Imports rails project in the rack subfolder")
 

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

@@ -1,5 +1,15 @@
 class Jets::Commands::Import
   class Base < Sequence
+    # Ugly, but when the class_option is only defined in the Thor::Group class
+    # it doesnt show up with jets new help :(
+    # If anyone knows how to fix this let me know.
+    def self.cli_options
+      [
+        [:submodule, type: :boolean, default: false, desc: "Imports the project as a submodule"],
+      ]
+    end
+    cli_options.each { |args| class_option(*args) }
+
     # Since setup is public it will automatically run in the subclasses
     def setup
       start_message