jets 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751c93f86f093c6acb059fb618e50c6bf7afdcd643365bba49ea4b62cd3a0d2f
-  data.tar.gz: c542c41f988f565ef3fa19fa7790dc90961906a92d1d4c631a409febac512151
+  metadata.gz: fe68aea730b33f60b486186a386b6d0f30909e370cbb04060ec853c0b831c205
+  data.tar.gz: aac8106b0ea1223b8208f28036b54cd19fc9d7e5a1c357513c0c1ad674f1a499
 SHA512:
-  metadata.gz: b0c12539cc50ca7241c0b135964e22dda9b76fd96e3a8086c526a5ed7f6d4e54f771dd2d5e417f01063803e7553bf008680d24908988d14e39bef1ef959cc666
-  data.tar.gz: 5aa8d4a58de8ef1b24f0d5e137ce33846aea48138af7ff10a6cd4e329fafccc567af15dafbfff46ae4db5c8ce1dc2f40d21e108a417d9a7a0fcf1f480ff8c078
+  metadata.gz: 8cbf12325ca0fef018c9e3ad776c1264f2455f87f055f1a8cfc664ffbe295cdfe11ab2f8f9904d18a223e5ee48de9a54c8c66d02e52c961c574b46f636ed28b6
+  data.tar.gz: 6ae00057569e6a2f139e2869eeccc2fc1bcbda02caebc3d9a17bafbb58f1831f3bb41f777457ed80e9c5fdc4bf4c7d68a334255024c17651b83e65e8d507b6ad

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.
 
+## [1.3.7]
+- #100 from tongueroo/vendor-gems bundle in vendor/gems folder to avoid vendor/bundle collison
+- use database from cli option in api mode for new
+
 ## [1.3.6]
 - Merge pull request #91 from mveer99/patch-1 jets deploy production docs
 - #96 from tongueroo/mega-mode-prod-deploy fix mega mode prod deploy, fix typo

data/Gemfile.lock

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

data/lib/jets/builders/gem_replacer.rb

@@ -19,7 +19,7 @@ class Jets::Builders
 
       # At this point the current compiled gems have been removed and compiled gems
       # have been unpacked to code/opt. We can take the unpacked gems in opt and fully
-      # move them into vendor/bundle gems now.
+      # move them into vendor/gems gems now.
       move_opt_gems_to_vendor
 
       tidy
@@ -28,7 +28,7 @@ class Jets::Builders
     def move_opt_gems_to_vendor
       code = "#{Jets.build_root}/stage/code"
       opt_gems = "#{code}/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
-      vendor_gems = "#{code}/vendor/bundle/ruby/#{Jets::Gems.ruby_folder}"
+      vendor_gems = "#{code}/vendor/gems/ruby/#{Jets::Gems.ruby_folder}"
       # https://stackoverflow.com/questions/23698183/how-to-force-cp-to-overwrite-directory-instead-of-creating-another-one-inside
       # Trailing slashes are required
       sh "rsync -a --links #{opt_gems}/ #{vendor_gems}/"

data/lib/jets/builders/lambda_layer.rb

@@ -2,10 +2,10 @@ class Jets::Builders
   class LambdaLayer
     include Util
 
-    # At this point we gems have all been moved to stage/code/vendor/bundle, this includes
+    # At this point we gems have all been moved to stage/code/vendor/gems, this includes
     # binary gems, a good state. This method moves them:
     #
-    #   from stage/code/vendor/bundle/ruby/2.5.0
+    #   from stage/code/vendor/gems/ruby/2.5.0
     #   to stage/opt/ruby/gems/2.5.0
     #
     # So we can move gems into the Lambda Layer. Important folders later:
@@ -28,20 +28,21 @@ class Jets::Builders
 
     def move_vendor_to_opt
       ruby_folder = Jets::Gems.ruby_folder
-      gems_original = "#{code_area}/vendor/bundle/ruby/#{ruby_folder}"
+      gems_original = "#{code_area}/vendor/gems/ruby/#{ruby_folder}"
       gems = "#{stage_area}/opt/ruby/gems/#{ruby_folder}"
+
       FileUtils.mkdir_p(File.dirname(gems))
       FileUtils.mv(gems_original, gems)
       # Deleting in this way to make sure folders are empty before we delete them
-      FileUtils.rmdir("#{code_area}/vendor/bundle/ruby")
-      FileUtils.rmdir("#{code_area}/vendor/bundle")
+      FileUtils.rmdir("#{code_area}/vendor/gems/ruby")
+      FileUtils.rmdir("#{code_area}/vendor/gems")
       FileUtils.rmdir("#{code_area}/vendor") if Dir.empty?("#{code_area}/vendor")
     end
 
-    # Simple logic: vendor/bundle/ruby/2.5.0 -> /opt/ruby/gems/2.5.0
+    # Simple logic: vendor/gems/ruby/2.5.0 -> /opt/ruby/gems/2.5.0
     def symlink_vendor_gems
       ruby_folder = Jets::Gems.ruby_folder
-      dest = "#{code_area}/vendor/bundle/ruby/#{ruby_folder}"
+      dest = "#{code_area}/vendor/gems/ruby/#{ruby_folder}"
       FileUtils.mkdir_p(File.dirname(dest))
       # puts "ln -sf /opt/ruby/gems/#{ruby_folder} #{dest}" # uncomment to debug
       FileUtils.ln_sf("/opt/ruby/gems/#{ruby_folder}", dest)

data/lib/jets/builders/rack_packager.rb

@@ -11,7 +11,7 @@ class Jets::Builders
     def symlink_gems
       ruby_folder = Jets::Gems.ruby_folder
       # IE: @full_app_root: /tmp/jets/demo/stage/code/rack
-      dest = "#{@full_app_root}/vendor/bundle/ruby/#{ruby_folder}"
+      dest = "#{@full_app_root}/vendor/gems/ruby/#{ruby_folder}"
       FileUtils.mkdir_p(File.dirname(dest))
       FileUtils.ln_sf("/opt/ruby/gems/#{ruby_folder}", dest)
     end

data/lib/jets/builders/ruby_packager.rb

@@ -18,11 +18,11 @@ class Jets::Builders
       setup_bundle_config
     end
 
-    #   build gems in vendor/bundle/ruby/2.5.0 (done in install phase)
+    #   build gems in vendor/gems/ruby/2.5.0 (done in install phase)
     # replace_compiled_gems:
-    #   remove binary gems in vendor/bundle/ruby/2.5.0
+    #   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/bundle/ruby/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?
 
@@ -57,7 +57,7 @@ class Jets::Builders
       Bundler.with_clean_env do
         sh(
           "cd #{cache_area} && " \
-          "env BUNDLE_IGNORE_CONFIG=1 bundle install --path #{cache_area}/vendor/bundle --without development test"
+          "env BUNDLE_IGNORE_CONFIG=1 bundle install --path #{cache_area}/vendor/gems --without development test"
         )
       end
 
@@ -118,8 +118,8 @@ class Jets::Builders
         md[1] # git_sha
       end
 
-      # IE: /tmp/jets/demo/cache/vendor/bundle/ruby/2.5.0/bundler/gems/webpacker-a8c46614c675
-      Dir.glob("#{cache_area}/vendor/bundle/ruby/2.5.0/bundler/gems/*").each do |path|
+      # IE: /tmp/jets/demo/cache/vendor/gems/ruby/2.5.0/bundler/gems/webpacker-a8c46614c675
+      Dir.glob("#{cache_area}/vendor/gems/ruby/2.5.0/bundler/gems/*").each do |path|
         sha = path.split('-').last[0..6] # only first 7 chars of the git sha
         unless git_shas.include?(sha)
           # puts "Removing old submoduled gem: #{path}" # uncomment to see and debug
@@ -140,7 +140,7 @@ class Jets::Builders
       # Override project's .bundle/config and ensure that .bundle/config matches
       # at these 2 spots:
       #   app_root/.bundle/config
-      #   vendor/bundle/.bundle/config
+      #   vendor/gems/.bundle/config
       cache_bundle_config = "#{cache_area}/.bundle/config"
       app_bundle_config = "#{@full_app_root}/.bundle/config"
       FileUtils.mkdir_p(File.dirname(app_bundle_config))
@@ -155,7 +155,7 @@ class Jets::Builders
       text =<<-EOL
 ---
 BUNDLE_FROZEN: "true"
-BUNDLE_PATH: "vendor/bundle"
+BUNDLE_PATH: "vendor/gems"
 BUNDLE_WITHOUT: "development:test"
 EOL
       bundle_config = "#{cache_area}/.bundle/config"
@@ -177,15 +177,15 @@ EOL
     end
 
     def copy_cache_gems
-      vendor_bundle = "#{@full_app_root}/vendor/bundle"
+      vendor_bundle = "#{@full_app_root}/vendor/gems"
       if File.exist?(vendor_bundle)
         puts "Removing current vendor_bundle from project"
         FileUtils.rm_rf(vendor_bundle)
       end
       # Leave #{Jets.build_root}/vendor_bundle behind to act as cache
-      if File.exist?("#{cache_area}/vendor/bundle")
+      if File.exist?("#{cache_area}/vendor/gems")
         FileUtils.mkdir_p(File.dirname(vendor_bundle))
-        FileUtils.cp_r("#{cache_area}/vendor/bundle", vendor_bundle)
+        FileUtils.cp_r("#{cache_area}/vendor/gems", vendor_bundle)
       end
     end
 

data/lib/jets/builders/tidy.rb

@@ -39,7 +39,7 @@ class Jets::Builders
     # We clean out ignored files pretty aggressively. So provide
     # a way for users to keep files from being cleaned out.
     def jetskeep
-      defaults = %w[.bundle bundled pack handlers public/assets]
+      defaults = %w[.bundle pack handlers public/assets]
       path = "#{@project_root}/.jetskeep"
       return defaults unless File.exist?(path)
 
@@ -48,9 +48,9 @@ class Jets::Builders
       (defaults + keep).uniq
     end
 
-    # folders to remove in the vendor/bundle folder regardless of the level of the folder
+    # folders to remove in the vendor/gems folder regardless of the level of the folder
     def tidy_bundled
-      Dir.glob("#{@project_root}/vendor/bundle/**/*").each do |path|
+      Dir.glob("#{@project_root}/vendor/gems/**/*").each do |path|
         next unless File.directory?(path)
         dir = File.basename(path)
         next unless always_removals.include?(dir)
@@ -65,7 +65,7 @@ class Jets::Builders
     # actual cache folders that they used.
     def remove_gem_cache
       ruby_minor_version = Jets::RUBY_VERSION.split('.')[0..1].join('.') + '.0'
-      cache_path = "#{@project_root}/vendor/bundle/ruby/#{ruby_minor_version}/cache"
+      cache_path = "#{@project_root}/vendor/gems/ruby/#{ruby_minor_version}/cache"
       FileUtils.rm_rf(cache_path)
     end
 

data/lib/jets/commands/new.rb

@@ -32,7 +32,11 @@ module Jets::Commands
         @bootstrap = options[:bootstrap]
         @database = options[:database]
         @webpacker = options[:webpacker]
-      when 'api', 'job'
+      when 'api'
+        @bootstrap = false
+        @database = options[:database]
+        @webpacker = false
+      when 'job'
         @bootstrap = false
         @database = false
         @webpacker = false

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

data/vendor/jets-gems/lib/jets/gems/check.rb

@@ -126,21 +126,21 @@ EOL
     #
     # Example paths:
     # Macosx:
-    #   vendor/bundle/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/nokogiri-1.8.1
-    #   vendor/bundle/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
+    #   vendor/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/nokogiri-1.8.1
+    #   vendor/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
     # Official AWS Lambda Linux AMI:
-    #   vendor/bundle/ruby/2.5.0/extensions/x86_64-linux/2.5.0-static/nokogiri-1.8.1
+    #   vendor/gems/ruby/2.5.0/extensions/x86_64-linux/2.5.0-static/nokogiri-1.8.1
     # Circleci Ubuntu based Linux:
-    #   vendor/bundle/ruby/2.5.0/extensions/x86_64-linux/2.5.0/pg-0.21.0
+    #   vendor/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/vendor/bundle/ruby/*/extensions/**/**/*.{so,bundle}")
+      Dir.glob("#{Jets.build_root}/cache/vendor/gems/ruby/*/extensions/**/**/*.{so,bundle}")
     end
 
-    # Input: vendor/bundle/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
+    # Input: vendor/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 = /vendor\/bundle\/ruby\/\d+\.\d+\.\d+\/extensions\/.*?\/.*?\/(.*?)\//
-      gem_name = path.match(regexp)[1]
+      regexp = %r{vendor/gems/ruby/\d+\.\d+\.\d+/extensions/.*?/.*?/(.*?)/}
+      path.match(regexp)[1] # gem_name
     end
 
     # So can also check for compiled gems with Gem::Specification

data/vendor/jets-gems/lib/jets/gems/extract/gem.rb

@@ -52,7 +52,7 @@ module Jets::Gems::Extract
     # The folder contains the re-produced directory structure. Example with
     # the gem: byebug-9.1.0
     #
-    #   vendor/bundle/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
+    #   vendor/gems/ruby/2.5.0/extensions/x86_64-darwin-16/2.5.0-static/byebug-9.1.0
     #
     def download_gem
       # download - also move to /tmp/jets/demo/compiled_gems folder
@@ -84,7 +84,7 @@ module Jets::Gems::Extract
       say "Removing current #{full_gem_name} gem installation:"
       gem_dirs = Dir.glob("#{project_root}/**/*").select do |path|
                   File.directory?(path) &&
-                  path =~ %r{vendor/bundle} &&
+                  path =~ %r{vendor/gems} &&
                   File.basename(path) == full_gem_name
                 end
       gem_dirs.each do |dir|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Tung Nguyen