lono 7.4.6 → 7.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9574cc77561d997c5dc3f8aadeeaab7a708deaed94ab5a95578322e3020d12
-  data.tar.gz: b20a99267ec55c53aea744d6c5f42b2383e2c445b130c8df3cbaf97f56965639
+  metadata.gz: b9c7e01a4fe4a4ec3340df5f37c5eb41ad0cb02f6f5530fca1b5b4bcdc86fb08
+  data.tar.gz: 74c94b09507f4b0fe6528ec6278c7720335a3c78d9526d0253d6e0f1696ceaef
 SHA512:
-  metadata.gz: 8687587c45fc8d9efdf911fed49114f28b0ad8afddf81ddcbcb571578ba54ba1bbf9617fe3492bc1abbbf3487d040cf9891e9c1d0f867fdeec776ddd85f6e274
-  data.tar.gz: 7e0642fc5f26cfb4781e8bc9b9c64b52563ede7e4c8adfda386957d85e3ee0a0951b635afc53991ef085e1748bf106e6f30e22e94f53c26053bb206761209155
+  metadata.gz: 1cc2bfbe3afe38fb71c01c38d80dda79fccf36c7d2fa8463b452869031c3fcbc66669bd32753ebf895adeb3a8586ca70ea126112b3ac12bab8f67c3d7830e079
+  data.tar.gz: a3696d7bf282fbacf589308484e5f363d088ed6f3586067f1768b6f00a464f18a1e3e77b26c6f8de433149bffffcdf657abbf9acd96a9a421a1e48d615af3500

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.
 
+## [7.4.7]
+- #65 soft lono deprecations: `lono_type` must be set in gemspec
+- #66 fix configset s3_key, s3 endpoint is specially treated for us-east-1
+- #67 fix materializer for multiple extensions
+
 ## [7.4.6]
 - #64 lono new updates: no starter seed files, allow custom readme
 - silence type check

data/lib/lono/configset/s3_file/item.rb

@@ -22,9 +22,17 @@ module Lono::Configset::S3File
 
     def replacement_value
       aws_data = AwsData.new
-      # "https://s3.amazonaws.com/#{Lono::S3::Bucket.name}/#{s3_path}"
-      # "https://lono-bucket-12di8xz5sy72z.s3-us-west-2.amazonaws.com/stuff/s3-antivirus.tgz"
-      "https://#{Lono::S3::Bucket.name}.s3-#{aws_data.region}.amazonaws.com/#{s3_path}"
+      #
+      #   "https://s3.amazonaws.com/#{Lono::S3::Bucket.name}/#{s3_path}"
+      #   "https://lono-bucket-12di8xz5sy72z.s3-us-west-2.amazonaws.com/stuff/s3-antivirus.tgz"
+      #
+      # us-east-1 is special case:
+      #
+      #   "https://lono-bucket-12di8xz5sy72z.s3.amazonaws.com/stuff/s3-antivirus.tgz"
+      #
+      region = ""
+      region = "-#{aws_data.region}" unless aws_data.region == "us-east-1"
+      "https://#{Lono::S3::Bucket.name}.s3#{region}.amazonaws.com/#{s3_path}"
     end
   end
 end

data/lib/lono/extensions/preparer.rb

@@ -7,16 +7,20 @@ class Lono::Extensions
 
     def run
       @register.run
-      materialize
-      # loading happens in Lono::Extensions::Loader load_all_extension_helpers module
-      # so it has the proper self.class include scope
+      download
+      final_materialize
     end
 
-    def materialize
+    def download
       Lono::Jade::Registry.tracked_extensions.each do |registry|
         jade = Lono::Jade.new(registry.name, "extension", registry)
-        jade.materialize
+        jade.materialize # adds to Lono::Jade::Registry.downloaded_extensions
       end
     end
+
+    def final_materialize
+      jades = Lono::Jade::Registry.downloaded_extensions
+      Lono::Jade::Materializer::Final.new.build(jades)
+    end
   end
 end

data/lib/lono/jadespec.rb

@@ -28,6 +28,7 @@ module Lono
     end
 
     def lono_type
+      deprecation_check(metadata)
       metadata["lono_type"] || detect_type
     end
 
@@ -37,6 +38,7 @@ module Lono
     end
 
     def lono_strategy
+      deprecation_check(metadata)
       return metadata["lono_strategy"] if metadata["lono_strategy"]
       lono_type == "blueprint" ? "dsl" : "erb" # TODO: default to dsl for configset also in next major release
     end
@@ -50,5 +52,17 @@ module Lono
       gemspec.metadata || {}
     end
     memoize :metadata
+
+  private
+    @@deprecation_check_shown = {}
+    def deprecation_check(metadata)
+      return unless ENV['LONO_DEPRECATION_SOFT']
+      return if @@deprecation_check_shown[name]
+
+      unless metadata["lono_type"]
+        puts "DEPRECATION WARNING: lono_type is not set for #{name}".color(:yellow)
+      end
+      @@deprecation_check_shown[name] = true
+    end
   end
 end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.4.6"
+  VERSION = "7.4.7"
 end

data/lib/templates/blueprint/%blueprint_name%.gemspec.tt

@@ -15,9 +15,7 @@ Gem::Specification.new do |spec|
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata["lono_type"] = "blueprint"
-  <% if @options[:type] != "dsl" -%>
-    spec.metadata["lono_strategy"] = "erb"
-  <% end -%>
+    spec.metadata["lono_strategy"] = "<%= @options[:type] %>"
 
     spec.metadata["allowed_push_host"] = "<%= ENV['LONO_ALLOWED_PUSH_HOST'] || "TODO: Set to 'http://mygemserver.com'"%>"
     spec.metadata["homepage_uri"] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.4.6
+  version: 7.4.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport