jets 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f493298a24d9f81047427851d58c6a2b07d210c1712e92bbe7f75b26d17933
-  data.tar.gz: daaa2abacea4002f91a0d4a9d49085c25618b3d6ce7df00c856a04aa6b13d9f5
+  metadata.gz: f1ab6e5098560d1702587c1b6b7f49e9f6d2a315f48122de5090c372df485aa8
+  data.tar.gz: 5e5ac74eac851362e414c1e4f85127a88cbac2cb161a2fcbfb19bd933bf311b1
 SHA512:
-  metadata.gz: 76f11fd73231957fb357babf695267f5bf37b955fa2d9bcc916979412dc07315a37027dbab1f0a252dc5b3f6017f2aaf2216797090420ab5ad414c3e0a441319
-  data.tar.gz: 625f09d4db4790fd7765031932f16f67adc8b116d2e7b07a1972962f6319d46a887b2bcb36dbc7cbe00fafc29b3628913e281b55335c4456ffaacb5096de22ed
+  metadata.gz: 386a5732285bd3aea9ddf3b47d5873e09a168aec0c88f247eb82dcd14a3d9a3b6d63137f61b1c630f82d93346d15231bedaa5aaf3b944397c60f913a808fe27f
+  data.tar.gz: 771b40cc30dafc61600e0a15e0a85aafd68a69a1cca808bcb86d18646e60769a3ad27be938acaac8c360aebeb2d8adeb898d8540be7d1c4c723f828677cfd582

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.5.5]
+- clean old git submodules from cache to reduce cache bloat
+- dont prewarm after deploy if disabled :pull request #12
+- update docs
+
 ## [0.5.4]
 - add route check before cloudformation update: pull request #11
 - hide confusing debugging logs for node shim for user

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.5.4)
+    jets (0.5.5)
       actionpack
       actionview
       activerecord

data/lib/jets/builders/code_builder.rb

@@ -4,6 +4,7 @@ require "colorize"
 require "socket"
 require "net/http"
 require "action_view"
+require "bundler" # for clean_old_submodules only
 
 # Some important folders to help understand how jets builds a project:
 #
@@ -72,7 +73,7 @@ class Jets::Builders
       Dir.chdir(full(tmp_app_root)) do
         # These commands run from project root
         start_app_root_setup
-        bundle_install
+        bundle
         finish_app_root_setup
         create_zip_file
       end
@@ -301,6 +302,12 @@ EOL
     end
     time :create_zip_file
 
+    def bundle
+      clean_old_submodules
+      bundle_install
+    end
+    time :bundle
+
     # Installs gems on the current target system: both compiled and non-compiled.
     # If user is on a macosx machine, macosx gems will be installed.
     # If user is on a linux machine, linux gems will be installed.
@@ -330,7 +337,38 @@ EOL
 
       puts 'Bundle install success.'
     end
-    time :bundle_install
+
+    # When using submodules, bundler leaves old submodules behind. Over time this inflates
+    # the size of the the bundled gems.  So we'll clean it up.
+    def clean_old_submodules
+      lockfile = "#{cache_area}/Gemfile.lock"
+      # https://stackoverflow.com/questions/38800129/parsing-a-gemfile-lock-with-bundler
+      parser = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
+      specs = parser.specs
+
+      # specs = Bundler.load.specs
+      # IE: spec.source.to_s: "https://github.com/tongueroo/webpacker.git (at jets@a8c4661)"
+      submoduled_specs = specs.select do |spec|
+        spec.source.to_s =~ /@\w+\)/
+      end
+
+      # find git shas to keep
+      # IE: ["a8c4661", "abc4661"]
+      git_shas = submoduled_specs.map do |spec|
+        md = spec.source.to_s.match(/@(\w+)\)/)
+        git_sha = md[1]
+      end
+      puts "git_shas #{git_shas.inspect}"
+
+      # IE: /tmp/jets/demo/cache/bundled/gems/ruby/2.5.0/bundler/gems/webpacker-a8c46614c675
+      Dir.glob("#{cache_area}/bundled/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}"
+          FileUtils.rm_rf(path) # REMOVE old submodule directory
+        end
+      end
+    end
 
     def copy_gemfiles
       FileUtils.mkdir_p(cache_area)

data/lib/jets/builders/node-shim.js

@@ -124,13 +124,16 @@ function request(event, handler, callback) {
   });
 
   client.on('error', function(error) {
-    log("Socket error %o", error);
+    log("Socket error:");
+    log(error);
     log("Retrying request");
     setTimeout(function() {
       if (fs.existsSync(TMP_LOG_PATH)) {
         var contents = fs.readFileSync(TMP_LOG_PATH, 'utf8');
-        log("subprocess output:");
-        log(contents);
+        if (contents != "") {
+          log("subprocess output:", "debug");
+          log(contents, "debug");
+        }
       }
       request(event, handler, callback);
     }, 500);

data/lib/jets/cfn/ship.rb

@@ -83,6 +83,8 @@ class Jets::Cfn
 
     def prewarm
       return unless @options[:stack_type] == :full # s3 bucket is available
+      return unless Jets.config.prewarm.enable
+
       puts "Prewarming application..."
       if Jets::PreheatJob::CONCURRENCY > 1
         Jets::PreheatJob.perform_now(:torch, {quiet: true})

data/lib/jets/commands/templates/skeleton/.gitignore

@@ -2,7 +2,7 @@
 .bundle
 .byebug_history
 .DS_Store
-.env.*.deploy
+.env.*.remote
 .env.production
 .env.staging
 /node_modules

data/lib/jets/ruby_server.rb

@@ -43,7 +43,7 @@ module Jets
     def serve
       # child process
       server = TCPServer.new(8080) # Server bind to port 8080
-      puts "Ruby server started on port #{PORT}"
+      puts "Ruby server started on port #{PORT}" if ENV['FOREGROUND'] || ENV['JETS_DEBUG'] || ENV['C9_USER']
       input_completed = false
       loop do
         event, handler = nil, nil

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

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