lono-pro 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81bd2b91f14117ac3b8baec8719b2de27d28b9d82065d5f83ce2cc0513e99a1d
-  data.tar.gz: 8b52c80fe8e3a9e6eab4467e59fdce650961637e3df21e60185b5fa30005eb01
+  metadata.gz: 9d3d921141c36b14bbfedbe78646c6e09966fd55dfd0d13f809cfbb50b7fb44a
+  data.tar.gz: 54d5618c7985e3a578f2f9f51c88e0e56dda900f1d5542308e728b09d07b3cee
 SHA512:
-  metadata.gz: 639460ffa51375903e5cb77d6a2f63b7ffbf5a4f69818abf0f1daf1fb1c2392c929030815a4108edeeb37b2b69e5d934ec2a967957b0222c8bf8947d2eaef229
-  data.tar.gz: 9c251a223cd25f6023cb0c5add5852d1b86eda9db5e42a9c7176c7afdd44f5d00c4a2b769fc0af256e0b31f03c70d34ced96043a5cd2ac06bb36f684fff3f14b
+  metadata.gz: '0228935145363b2238c72b9f61245043d233bbce07c39ad0a3b9a4722f6aaf6894e2d33168170bd0e5d272ac4397b2411b243ff656877f1287673a925e97f2f3'
+  data.tar.gz: 3507512cf1e0c40e0b42d3d36322c61425e4725d01d877f6211cabc7dc26fb1bde8fce3ec028ea8972293ecc09b8a93c094473a1d7d4c5ce8b7a8ff47c609d97

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.3.0]
+- only print ruby code to stdout with lono code convert
+- source can be file or url source
+
 ## [0.2.0]
 - lono code convert
 - lono code import

data/README.md

@@ -2,7 +2,7 @@
 
 Lono pro is a paid addon that adds additional features to [lono](https://lono.cloud).  Notably, the `lono code import` and `lono code convert` commands.
 
-The conversion process is not perfect but gets you 80% of the way here. It saves you time.
+The conversion process gets you 80% of the way here. It saves you time.
 
 ## Usage
 

data/lib/lono/pro/code.rb

@@ -16,7 +16,7 @@ module Lono::Pro
     long_desc Help.text(:convert)
     option :casing, default: "as-is", desc: "Controls casing of logical ids. IE: as-is, camelcase or underscore"
     def convert(source)
-      Importer::Converter.new(source, options).run
+      Importer::Converter.new(source, options.merge(print: true)).run
     end
   end
 end

data/lib/lono/pro/help/convert.md

@@ -1,3 +1,51 @@
-## Example
+## Examples
 
-    lono code convert path/to/file
+    lono code convert path/to/file
+    lono code convert http://example.com/url/to/template.yml
+    lono code convert http://example.com/url/to/template.json
+
+## Example with Output
+
+    $ lono code convert https://s3-us-east-2.amazonaws.com/cloudformation-templates-us-east-2/AutoScalingMultiAZWithNotifications.template
+    INFO: The ruby syntax is invalid
+    INFO: Translated ruby code below:
+
+    aws_template_format_version "2010-09-09"
+    parameter("VpcId",
+      type: "AWS::EC2::VPC::Id",
+      description: "VpcId of your existing Virtual Private Cloud (VPC)",
+      constraint_description: "must be the VPC Id of an existing Virtual Private Cloud."
+    )
+    ...
+    ...
+    ...
+    resource("InstanceSecurityGroup", "AWS::EC2::SecurityGroup",
+      group_description: "Enable SSH access and HTTP from the load balancer only",
+      security_group_ingress: [
+        {
+          ip_protocol: "tcp",
+          from_port: "22",
+          to_port: "22",
+          cidr_ip: ref("SSHLocation")
+        },
+        {
+          ip_protocol: "tcp",
+          from_port: "80",
+          to_port: "80",
+          source_security_group_id: select(0,get_att("ApplicationLoadBalancer","SecurityGroups"))
+        }
+      ],
+      vpc_id: ref("VpcId")
+    )
+    output("URL",
+      description: "The URL of the website",
+      value: join("",[
+          "http://",
+          get_att("ApplicationLoadBalancer","DNSName")
+        ])
+    )
+
+The `INFO` messages are written to stderr so you can grab the translated template Ruby code by directing it to a file. Example:
+
+    lono code convert https://s3-us-east-2.amazonaws.com/cloudformation-templates-us-east-2/AutoScalingMultiAZWithNotifications.template > autoscaling.rb
+    cat autoscaling.rb

data/lib/lono/pro/help/import.md

@@ -1,3 +1,12 @@
-## Example
+## Examples
 
-    lono code import path/to/file
+    lono code import path/to/file
+    lono code import http://example.com/url/to/template.yml
+    lono code import http://example.com/url/to/template.json
+
+## Example with Output
+
+    $ lono code import https://s3-us-east-2.amazonaws.com/cloudformation-templates-us-east-2/asg.template
+    Template imported to: blueprints/asg/app/templates/asg.rb
+    Params file created at configs/asg/development.txt
+    $

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

@@ -1,9 +1,7 @@
-require "open-uri"
-require "json"
-require "yaml"
-
 class Lono::Pro::Importer
   class Base
+    include Download
+
     def initialize(source, options)
       @source, @options = source, options
       @blueprint = @options[:blueprint] || blueprint_name
@@ -39,7 +37,7 @@ class Lono::Pro::Importer
     end
 
     def create_dot_lono(type)
-      dot_lono = "#{Lono.blueprint_root}/.lono"
+      dot_lono = "#{Lono.blueprint_root}/.meta"
       FileUtils.mkdir_p(dot_lono)
       config = {
         "blueprint_name" => @blueprint,
@@ -55,28 +53,5 @@ class Lono::Pro::Importer
       name = File.basename(@source, ".*")
       @options[:casing] == "camelcase" ? name.camelize : name.underscore.dasherize
     end
-
-    def download_template(dest_path)
-      template =  open(@source).read
-
-      result = if json?(template)
-                  # abusing YAML.dump(YAML.load()) to convert json to yaml
-                  YAML.dump(YAML.load(template))
-                else
-                  template # template is already in YAML format
-                end
-
-      folder = File.dirname(dest_path)
-      FileUtils.mkdir_p(folder) unless File.exist?(folder)
-      IO.write(dest_path, result)
-      dest_path
-    end
-
-    def json?(text)
-      JSON.load(text)
-      true # if reach here than it's just
-    rescue JSON::ParserError
-      false # not json
-    end
   end
 end

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

@@ -1,12 +1,17 @@
 class Lono::Pro::Importer
   class Converter
+    include Download
+
     # source is a path
     def initialize(source, options)
       @source, @options = source, options
     end
 
     def run
-      coder = Service::Coder.new(@source, @options)
+      tmp_path = "/tmp/lono/import/template.yml"
+      tmp_template_path = download_template(@source, tmp_path)
+      template = IO.read(tmp_template_path)
+      coder = Service::Coder.new(template, @options)
       puts coder.translate
     end
   end

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

@@ -0,0 +1,46 @@
+require "json"
+require "open-uri"
+require "yaml"
+
+class Lono::Pro::Importer
+  module Download
+    def download_template(source, dest_path)
+      template =  read_source(source)
+
+      result = if json?(template)
+                  # abusing YAML.dump(YAML.load()) to convert json to yaml
+                  YAML.dump(YAML.load(template))
+                else
+                  template # template is already in YAML format
+                end
+
+      folder = File.dirname(dest_path)
+      FileUtils.mkdir_p(folder) unless File.exist?(folder)
+      IO.write(dest_path, result)
+      dest_path
+    end
+
+    def read_source(source)
+      open(source).read
+    rescue OpenURI::HTTPError, SocketError, Errno::ENOENT
+      puts "ERROR: Unable to read source template provided: #{source}".color(:red)
+      e = $!
+      puts "#{e.class}: #{e.message}"
+      puts "Please double check the source provided."
+      exit 1
+    rescue Exception => e
+      puts "ERROR: Unable to read source template provided: #{source}".color(:red)
+      puts "General Exception Error:"
+      puts "#{e.class}: #{e.message}"
+      puts "Please double check the source provided."
+      exit 1
+    end
+
+    def json?(text)
+      JSON.load(text)
+      true # if reach here than it's just
+    rescue JSON::ParserError
+      false # not json
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 class Lono::Pro::Importer
   class Dsl < Base
     def run
-      tmp_template_path = download_template(@tmp_path)
-      translate_to_dsl(tmp_template_path)
+      tmp_template_path = download_template(@source, @tmp_path)
+      template = IO.read(tmp_template_path)
+      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.
@@ -10,8 +11,8 @@ class Lono::Pro::Importer
       # summarize
     end
 
-    def translate_to_dsl(source_path)
-      coder = Service::Coder.new(source_path, @options)
+    def translate_to_dsl(template)
+      coder = Service::Coder.new(template, @options)
       result = coder.translate
 
       path = "#{Lono.config.templates_path}/#{@template}.rb"

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

@@ -1,10 +1,9 @@
 class Lono::Pro::Importer
   class Erb < Base
     def run
-      template_path = "#{Lono.config.templates_path}/#{@template}.yml"
-
       puts "=> Imported CloudFormation template.".color(:green)
-      download_template(template_path)
+      template_path = "#{Lono.config.templates_path}/#{@template}.yml"
+      download_template(@source, template_path)
       puts "Template downloaded to #{pretty_path(template_path)}"
 
       create_dot_lono("erb")

data/lib/lono/pro/importer/service/coder.rb

@@ -5,18 +5,16 @@ require 'net/http'
 class Lono::Pro::Importer::Service::Coder
   LONO_API = ENV['LONO_API'] || 'https://api.lono.cloud/v1'
 
-  def initialize(source, options={})
-    @source, @options = source, options
-    @template = File.exist?(@source) ? IO.read(@source) : @source
+  def initialize(template, options={})
+    @template, @options = template, options
   end
 
   def translate
     url = "#{LONO_API}/code"
+
     http = net_http_client(url)
-    req = Net::HTTP::Post.new(url) # url includes query string and uri.path does not, must used url
-    req = set_request_data(req,
-      # Base64 JSON to handle special chars that Rack::LintWrapper cannot process
-      template: Base64.encode64(@template),
+    req = net_http_request(url,
+      template: Base64.encode64(@template), # Base64 JSON for special chars that Rack::LintWrapper cannot process
       lono_version: Lono::VERSION,
       lono_pro_version: Lono::Pro::VERSION,
       lono_command: lono_command,
@@ -25,24 +23,29 @@ class Lono::Pro::Importer::Service::Coder
 
     if res.code == "200"
       data = JSON.load(res.body)
-      validity = data["valid_ruby"] ? "valid" : "invalid"
-      $stderr.puts <<~EOL
-        INFO: The ruby syntax is #{validity}
-        Translated ruby code below:
-
-      EOL
-      ruby_code = data["ruby_code"]
-      puts ruby_code
-      ruby_code
-    # TODO: improve error messaging
+      print(data)
+      data["ruby_code"]
     else
-      puts "Non-successful http response:"
-      puts "status code: #{res.code}"
+      puts "Unable to convert template to ruby code."
+      puts "The error has been reported."
+      puts "Non-successful http response status code: #{res.code}"
       # puts "headers: #{res.each_header.to_h.inspect}"
     end
   end
 
 private
+  def print(data)
+    return unless @options[:print]
+    validity = data["valid_ruby"] ? "valid" : "invalid"
+    $stderr.puts <<~EOL
+      INFO: The ruby syntax is #{validity}
+      INFO: Translated ruby code below:
+
+    EOL
+    ruby_code = data["ruby_code"]
+    puts ruby_code
+  end
+
   def net_http_client(url)
     uri = URI(url)
     http = Net::HTTP.new(uri.host, uri.port)
@@ -51,7 +54,8 @@ private
     http
   end
 
-  def set_request_data(req, data)
+  def net_http_request(url, data)
+    req = Net::HTTP::Post.new(url) # url includes query string and uri.path does not, must used url
     text = JSON.dump(data)
     req.body = text
     req.content_length = text.bytesize

data/lib/lono/pro/version.rb

@@ -1,5 +1,5 @@
 module Lono
   module Pro
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono-pro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -92,6 +92,7 @@ files:
 - lib/lono/pro/importer.rb
 - lib/lono/pro/importer/base.rb
 - lib/lono/pro/importer/converter.rb
+- lib/lono/pro/importer/download.rb
 - lib/lono/pro/importer/dsl.rb
 - lib/lono/pro/importer/erb.rb
 - lib/lono/pro/importer/params.rb