lono-pro 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44135091fe26622bcf15f190d99d15304e4d42ec6870683d4532e0899cd561c0
-  data.tar.gz: dd19339c4e8acb97f5e5df63904e637c0ae72a5ac20b9f0d27fd4b02f655e3ba
+  metadata.gz: 941189b455e443202a2e75bf8912033b64f5235106c795d8c2fd8de06ec4ea3a
+  data.tar.gz: adf2c75a22cda3734a9213505e174af3d6b82e4ae46a746ed5c291578e72909d
 SHA512:
-  metadata.gz: d18efd211e2fc8f43b438d8c7747b7abfd9e2708667546154d97b1fa637a91966daac2ff6c58fbe8d198ae13ca08069d260b070bcdc0d175c7b18e50c14517bd
-  data.tar.gz: a39ceca84af1c19f71411ee7d52fe91c3ee2e6708bc33c546f761f12cb7e0bccf83f4ece78d3b13663a6ce12c2279b06d1d8f2585376081a1fb541453ec2e4f7
+  metadata.gz: e2d90a4f2408d3fde97aaf0ee234871b4230a2cb9e2ecfb873cbdac89d44ee3cdbdb4d57adf44b59da915cd5ce65bd525fd7a107d79f13e09cf07aa2ba608309
+  data.tar.gz: e027f7bf9a5708cb14119412b5da5097f9e303bd84e08b08bfece0cdb29f7790425dff36c987ec08e8fa97ef744c59be1f260dcfa887c0c57257430e7880ae5f

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.4.7]
+- #1 code import: create full blueprint structure
+
 ## [0.4.6]
 - update cli help: convert, import
 

data/lib/lono/pro/importer/base.rb

@@ -1,6 +1,8 @@
 class Lono::Pro::Importer
   class Base
     include Download
+    include Thor::Actions
+    include Thor::Base
 
     def initialize(source, options)
       @source, @options = source, options
@@ -11,6 +13,7 @@ class Lono::Pro::Importer
       Lono.blueprint_root = "#{Lono.root}/blueprints/#{@blueprint}"
 
       @tmp_path = "/tmp/lono/import/template.yml"
+      self.destination_root = Dir.pwd # Thor::Actions require destination_root to be set
     end
 
   private
@@ -21,14 +24,18 @@ class Lono::Pro::Importer
     end
 
     def create_params(template_path)
+      create_params_file(template_path, "development")
+      create_params_file(template_path, "production")
+    end
+
+    def create_params_file(template_path, env)
       params_path = if @blueprint != @template
-                      "configs/#{@blueprint}/params/#{Lono.env}/#{@template}.txt"
+                      "configs/#{@blueprint}/params/#{env}/#{@template}.txt"
                     else
-                      "configs/#{@blueprint}/params/#{Lono.env}.txt"
+                      "configs/#{@blueprint}/params/#{env}.txt"
                     end
       params = Params.new(template_path, params_path)
       params.create
-      puts "Params file created at #{pretty_path(params_path)}"
     end
 
     # removes the ./ at the beginning if it's there in the path

data/lib/lono/pro/importer/dsl.rb

@@ -3,12 +3,16 @@ class Lono::Pro::Importer
     def run
       tmp_template_path = download_template(@source, @tmp_path)
       template = IO.read(tmp_template_path)
+
+      Lono::Blueprint::New.start([@blueprint, "--import", "--type", "dsl"])
+
       translate_to_dsl(template)
-      create_dot_lono("dsl")
       create_params(tmp_template_path)
       # Let's not summarize the template in case the Ruby syntax is invalid with the import coder.
       # Add summarize back in later
       # summarize
+
+      final_message
     end
 
     def translate_to_dsl(template)
@@ -17,9 +21,16 @@ class Lono::Pro::Importer
 
       path = "#{Lono.config.templates_path}/#{@template}.rb"
       FileUtils.mkdir_p(File.dirname(path))
-      IO.write(path, result)
-      pretty_path = path.sub("#{Lono.root}/",'')
-      puts "Template imported to: #{pretty_path}"
+      create_file(path, result) # Thor::Action
+    end
+
+    def final_message
+      puts <<~EOL
+        #{"="*64}
+        Congrats 🎉 You have successfully imported a lono blueprint.
+
+        More info: https://lono.cloud/docs/core/blueprints
+      EOL
     end
   end
 end

data/lib/lono/pro/importer/params.rb

@@ -1,16 +1,17 @@
 class Lono::Pro::Importer
   class Params
+    include Thor::Actions
+    include Thor::Base
     extend Memoist
 
     def initialize(template_path, params_path)
       @template_path, @params_path = template_path, params_path
       @params_path = normalize_path(@params_path)
+      self.destination_root = Dir.pwd # Thor::Actions require destination_root to be set
     end
 
     # Creates starter params/base/[stack-name].txt file
     def create
-      template = YAML.load_file(@template_path)
-
       result = []
       required_parameters.each do |name, attributes|
         result << "#{name}=#{attributes["Default"]}"
@@ -21,9 +22,10 @@ class Lono::Pro::Importer
       end
       content = result.join("\n") + "\n"
 
+
       folder = File.dirname(@params_path)
       FileUtils.mkdir_p(folder) unless File.exist?(folder)
-      IO.write(@params_path, content) unless File.exist?(@params_path)
+      create_file(@params_path, content) # Thor::Action
     end
 
     def required_parameters

data/lib/lono/pro/version.rb

@@ -1,5 +1,5 @@
 module Lono
   module Pro
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono-pro
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk