jets 1.3.9 → 1.4.0

data/lib/jets/builders/ruby_packager.rb

@@ -6,7 +6,7 @@ class Jets::Builders
 
     attr_reader :full_app_root
     def initialize(relative_app_root)
-      @full_app_root = full(relative_app_root)
+      @full_app_root = "#{build_area}/#{relative_app_root}"
     end
 
     def install
@@ -16,18 +16,12 @@ class Jets::Builders
       clean_old_submodules
       bundle_install
       setup_bundle_config
+      copy_cache_gems
     end
 
     #   build gems in vendor/gems/ruby/2.5.0 (done in install phase)
-    # replace_compiled_gems:
-    #   remove binary gems in vendor/gems/ruby/2.5.0
-    #   extract binary gems in opt/ruby/gems/2.5.0
-    #   move binary gems from opt/ruby/gems/2.5.0 to vendor/gems/ruby/2.5.0
     def finish
       return unless gemfile_exist?
-
-      copy_cache_gems
-      replace_compiled_gems
       tidy
     end
 
@@ -53,6 +47,9 @@ class Jets::Builders
 
       copy_gemfiles(full_project_path)
 
+      # Uncomment out to always remove the cache/vendor/gems to debug
+      # FileUtils.rm_rf("#{cache_area}/vendor/gems")
+
       require "bundler" # dynamically require bundler so user can use any bundler
       Bundler.with_clean_env do
         sh(
@@ -131,7 +128,9 @@ class Jets::Builders
     def copy_gemfiles(full_project_path)
       FileUtils.mkdir_p(cache_area)
       FileUtils.cp("#{full_project_path}/Gemfile", "#{cache_area}/Gemfile")
-      FileUtils.cp("#{full_project_path}/Gemfile.lock", "#{cache_area}/Gemfile.lock")
+
+      gemfile_lock = "#{full_project_path}/Gemfile.lock"
+      FileUtils.cp(gemfile_lock, "#{cache_area}/Gemfile.lock") if File.exist?(gemfile_lock)
     end
 
     def setup_bundle_config
@@ -163,19 +162,6 @@ EOL
       IO.write(bundle_config, text)
     end
 
-    def gems_options
-      {
-        s3: "lambdagems",
-        build_root: cache_area, # used in lambdagem
-        project_root: @full_app_root, # used in gem_replacer and lambdagem
-      }
-    end
-
-    def replace_compiled_gems
-      headline "Replacing compiled gems with AWS Lambda Linux compiled versions."
-      GemReplacer.new(Jets::RUBY_VERSION, gems_options).run
-    end
-
     def copy_cache_gems
       vendor_bundle = "#{@full_app_root}/vendor/gems"
       if File.exist?(vendor_bundle)
@@ -188,10 +174,5 @@ EOL
         FileUtils.cp_r("#{cache_area}/vendor/gems", vendor_bundle)
       end
     end
-
-  private
-    def cache_area
-      "#{Jets.build_root}/cache" # cleaner to use full path for this setting
-    end
   end
 end

data/lib/jets/builders/shim_vars/base.rb

@@ -21,9 +21,5 @@ module Jets::Builders::ShimVars
       return unless checksum
       "#{name}-#{checksum}.zip"
     end
-
-    def stage_area
-      "#{Jets.build_root}/stage"
-    end
   end
 end

data/lib/jets/builders/util.rb

@@ -1,5 +1,6 @@
 class Jets::Builders
   module Util
+  private
     def sh(command)
       puts "=> #{command}".colorize(:green)
       success = system(command)
@@ -15,18 +16,16 @@ class Jets::Builders
       puts "=> #{message}".colorize(:cyan)
     end
 
-    # Provide pretty clear way to desinate full path.
-    # full("bundled") => /tmp/jets/demo/bundled
-    def full(relative_path)
-      "#{Jets.build_root}/#{relative_path}"
+    def build_area
+      Jets.build_root
     end
 
     def stage_area
-      "#{Jets.build_root}/stage"
+      "#{build_area}/stage"
     end
 
-    def code_area
-      "#{stage_area}/code"
+    def cache_area
+      "#{build_area}/cache" # cleaner to use full path for this setting
     end
   end
 end

data/lib/jets/commands/deploy.rb

@@ -2,7 +2,6 @@ module Jets::Commands
   class Deploy
     extend Memoist
     include StackInfo
-
     def initialize(options)
       @options = options
     end
@@ -15,6 +14,7 @@ module Jets::Commands
       check_dev_mode
       validate_routes!
 
+      # deploy full nested stack when stack already exists
       # Delete existing rollback stack from previous bad minimal deploy
       delete_minimal_stack if minimal_rollback_complete?
       exit_unless_updateable! # Stack could be in a weird rollback state or in progress state
@@ -28,7 +28,6 @@ module Jets::Commands
       # on_aws? and s3_base_url logic
       build_code
 
-      # deploy full nested stack when stack already exists
       ship(stack_type: :full, s3_bucket: s3_bucket)
     end
 

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

@@ -29,22 +29,7 @@ CODE
     end
 
     def reconfigure_database_yml
-      current_yaml = "#{Jets.root}rack/config/database.yml"
-      return unless File.exist?(current_yaml)
-
-      vars = {}
-      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)
-      IO.write(current_yaml, content)
-      puts "Reconfigured #{current_yaml}"
-    rescue Exception
-      # If unable to copy the database.yml settings just slightly fail.
-      # Do this because really unsure what is in the current database.yml
+      Jets::Turbo::DatabaseYaml.new.reconfigure
     end
 
     def finish_message
@@ -85,23 +70,5 @@ CODE
             jets deploy
         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/core.rb

@@ -22,12 +22,12 @@ module Jets::Core
   # Useful for appending a './' in front of a path or leaving it alone.
   # Returns: '/path/with/trailing/slash/' or './'
   def root
+    # Do not memoize this method. Turbo mode can change it
     root = ENV['JETS_ROOT'].to_s
     root = '.' if root == ''
     root = "#{root}/" unless root.ends_with?('/')
     Pathname.new(root)
   end
-  memoize :root
 
   def env
     env = ENV['JETS_ENV'] || 'development'
@@ -91,10 +91,11 @@ module Jets::Core
     path =~ %r{/functions} ||
     path =~ %r{/internal/app} ||
     path =~ %r{/jets/stack} ||
-    path =~ %r{/rackup_wrappers} ||
     path =~ %r{/overrides} ||
+    path =~ %r{/rackup_wrappers} ||
     path =~ %r{/reconfigure_rails} ||
     path =~ %r{/templates/} ||
+    path =~ %r{/turbo/project/} ||
     path =~ %r{/version} ||
     path =~ %r{/webpacker}
   end

data/lib/jets/turbo.rb

@@ -0,0 +1,47 @@
+require 'fileutils'
+
+module Jets
+  class Turbo
+    autoload :DatabaseYaml, 'jets/turbo/database_yaml'
+    autoload :Rail, 'jets/turbo/rail'
+
+    # Turbo charge mode
+    def charge
+      framework = detect
+      case framework
+      when :jets
+        # do nothing
+      when :rails
+        Rail.new.setup
+      else
+        # should never get here
+      end
+    end
+
+    def detect
+      if rails?
+        :rails
+      elsif jets?
+        :jets
+      else
+        :unknown_framework
+      end
+    end
+
+    def rails?
+      config_ru_contains?('run Rails.application')
+    end
+
+    def jets?
+      config_ru_contains?('run Jets.application')
+    end
+
+    def config_ru_contains?(value)
+      config_ru = "#{Dir.pwd}/config.ru"
+      return false unless File.exist?(config_ru)
+
+      lines = ::IO.readlines(config_ru)
+      lines.detect { |l| l.include?(value) }
+    end
+  end
+end

data/lib/jets/turbo/database_yaml.rb

@@ -0,0 +1,41 @@
+class Jets::Turbo
+  class DatabaseYaml
+    def reconfigure
+      current_yaml = "#{Jets.root}rack/config/database.yml"
+      return unless File.exist?(current_yaml)
+
+      vars = {}
+      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)
+      IO.write(current_yaml, content)
+      # puts "Reconfigured #{current_yaml}" # uncomment to inspect and debug
+    rescue Exception => e
+      puts "WARNING: Was not able to generate a database.yml. Leaving your current one in place"
+      puts e.message
+      # If unable to copy the database.yml settings just slightly fail.
+      # Do this because really unsure what is in the current database.yml
+    end
+
+    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/turbo/project/.gitignore

@@ -0,0 +1,12 @@
+*.gem
+.bundle
+.byebug_history
+.DS_Store
+.env.*
+/node_modules
+/public/packs
+/public/packs-test
+bundled
+coverage
+pkg
+tmp

data/lib/jets/turbo/project/.jetskeep

@@ -0,0 +1 @@
+pack

data/lib/jets/turbo/project/Gemfile

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gem "jets"
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'shotgun'
+  gem 'rack'
+end
+
+group :test do
+  gem 'rspec' # rspec test group only or we get the "irb: warn: can't alias context from irb_context warning" when starting jets console
+  gem 'launchy'
+  gem 'capybara'
+end

data/lib/jets/turbo/project/Gemfile.lock

@@ -0,0 +1,184 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.126.0)
+    aws-sdk-apigateway (1.23.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudformation (1.14.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudwatchlogs (1.12.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-core (3.44.1)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-dynamodb (1.18.1)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lambda (1.16.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sns (1.9.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sqs (1.10.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
+    builder (3.2.3)
+    byebug (10.0.2)
+    capybara (3.12.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    dotenv (2.5.0)
+    erubi (1.8.0)
+    gems (1.1.1)
+      json
+    hashie (3.6.0)
+    i18n (1.3.0)
+      concurrent-ruby (~> 1.0)
+    jets (1.3.9)
+      actionpack (>= 5.2.1)
+      actionview (>= 5.2.1)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
+      aws-sdk-apigateway
+      aws-sdk-cloudformation
+      aws-sdk-cloudwatchlogs
+      aws-sdk-dynamodb
+      aws-sdk-lambda
+      aws-sdk-s3
+      aws-sdk-sns
+      aws-sdk-sqs
+      colorize
+      dotenv
+      gems
+      hashie
+      json
+      kramdown
+      memoist
+      mimemagic
+      rack
+      railties (>= 5.2.1)
+      recursive-open-struct
+      text-table
+      thor
+    jmespath (1.4.0)
+    json (2.1.0)
+    kramdown (1.17.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    memoist (0.16.0)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    recursive-open-struct (1.1.0)
+    regexp_parser (1.3.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    shotgun (0.9.2)
+      rack (>= 1.0)
+    text-table (1.2.4)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  capybara
+  jets
+  launchy
+  rack
+  rspec
+  shotgun
+
+BUNDLED WITH
+   1.17.2