lono 7.5.1 → 8.0.0.pre.rc2

data/lib/lono/utils/item/zip.rb

@@ -14,7 +14,7 @@ module Lono::Utils::Item
       path = item.output_path
       zip_file = item.zip_file_name
 
-      puts "Zipping file and generating md5 named file from: #{path}"
+      logger.info "Zipping file and generating md5 named file from: #{path}"
       command = "cd #{File.dirname(path)} && zip -q #{zip_file} #{File.basename(path)}" # create zipfile at same level of file
       execute_zip(command)
     end
@@ -23,18 +23,18 @@ module Lono::Utils::Item
       path = item.output_path
       zip_file = item.zip_file_name
 
-      puts "Zipping folder and generating md5 named file from: #{path}"
+      logger.info "Zipping folder and generating md5 named file from: #{path}"
       command = "cd #{path} && zip --symlinks -rq #{zip_file} ." # create zipfile witih directory
       execute_zip(command)
       FileUtils.mv("#{path}/#{zip_file}", "#{File.dirname(path)}/#{zip_file}") # move zip back to the parent directory
     end
 
     def execute_zip(command)
-      # puts "=> #{command}".color(:green) # uncomment to debug
+      # logger.info "=> #{command}".color(:green) # uncomment to debug
       `#{command}`
       unless $?.success?
-        puts "ERROR: Fail to run #{command}".color(:red)
-        puts "Maybe zip is not installed or path is incorrect?"
+        logger.info "ERROR: Fail to run #{command}".color(:red)
+        logger.info "Maybe zip is not installed or path is incorrect?"
         exit 1
       end
     end

data/lib/lono/utils/logging.rb

@@ -0,0 +1,7 @@
+module Lono::Utils
+  module Logging
+    def logger
+      Lono.logger
+    end
+  end
+end

data/lib/lono/utils/{pretty_time.rb → pretty.rb}

@@ -1,5 +1,9 @@
 module Lono::Utils
-  module PrettyTime
+  module Pretty
+    def pretty_path(path)
+      path.sub("#{Lono.root}/",'')
+    end
+
     # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
     def pretty_time(total_seconds)
       minutes = (total_seconds / 60) % 60
@@ -11,4 +15,4 @@ module Lono::Utils
       end
     end
   end
-end
+end

data/lib/lono/utils/quit.rb

@@ -0,0 +1,7 @@
+module Lono::Utils
+  module Quit
+    def quit(code)
+      ENV['LONO_TEST'] ? raise : exit(code)
+    end
+  end
+end

data/lib/lono/utils/rsync.rb

@@ -2,10 +2,12 @@ require 'shellwords'
 
 module Lono::Utils
   module Rsync
+    include Lono::Utils::Logging
+
     def sh(command)
-      puts "=> #{command}"
+      logger.info "=> #{command}"
       out = `#{command}`
-      puts out if ENV['LONO_DEBUG_SH']
+      logger.info out if ENV['LONO_DEBUG_SH']
       success = $?.success?
       raise("ERROR: running command #{command}").color(:red) unless success
       success

data/lib/lono/utils/sure.rb

@@ -1,8 +1,8 @@
 module Lono::Utils
   module Sure
     def sure?(message, desc=nil)
-      if @options[:sure]
-        sure = 'y'
+      if @options[:yes]
+        yes = 'y'
       else
         out = message
         if desc
@@ -11,10 +11,10 @@ module Lono::Utils
           out += " (y/N) "
         end
         print out
-        sure = $stdin.gets
+        yes = $stdin.gets
       end
 
-      unless sure =~ /^y/
+      unless yes =~ /^y/
         puts "Whew! Exiting."
         exit 0
       end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.5.1"
+  VERSION = "8.0.0-rc2"
 end

data/lib/lono.rb

@@ -1,34 +1,30 @@
 $stdout.sync = true unless ENV["LONO_STDOUT_SYNC"] == "0"
 
-require "active_support/core_ext/class"
+require 'active_support'
+require 'active_support/core_ext/class'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'aws_data'
 require 'cfn_camelizer'
+require 'cfn_status'
+require 'cli-format'
+require 'dsl_evaluator'
 require 'fileutils'
 require 'json'
 require 'memoist'
 require 'plissken'
 require 'rainbow/ext/string'
 require 'render_me_pretty'
+require 'singleton'
 require 'yaml'
 
-gem_root = File.dirname(__dir__)
-$:.unshift("#{gem_root}/lib")
-$:.unshift("#{gem_root}/vendor/cfn-status/lib")
-require "cfn_status"
-
-require "lono/ext/bundler"
-
 require "lono/autoloader"
 Lono::Autoloader.setup
 
 module Lono
   API_DEFAULT = 'https://api.lono.cloud/v1'
   API = ENV['LONO_API'] || API_DEFAULT
-
   extend Core
 end
 
-Lono.set_aws_profile!
-Lono.lono_pro_removal_check!
+Lono::Booter.boot

data/lib/templates/blueprint/template.rb

@@ -0,0 +1,2 @@
+# This is where you put your infrastructure code
+# Docs: https://lono.cloud/docs/dsl/

data/lib/templates/examples/blueprint/template.rb

@@ -0,0 +1,9 @@
+parameter("BucketName", Conditional: true)
+parameter("AccessControl", Default: "Private")
+
+resource("Bucket", "AWS::S3::Bucket",
+  BucketName: ref("BucketName", Conditional: true),
+  AccessControl: ref("AccessControl"),
+)
+
+output("BucketName", ref("Bucket"))

data/lib/templates/helper/%underscore_name%_helper.rb.tt

@@ -0,0 +1,6 @@
+module <%= class_name %>Helper
+  # Your code goes here
+  # def custom_dsl_method
+  # ...
+  # end
+end

data/lib/templates/{skeleton → project}/.gitignore

@@ -1,4 +1,3 @@
 .lono
-dev.mode
 output
-tmp
+tmp

data/lib/templates/project/Gemfile.tt

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+# gem "lono", "~> <%= Lono::VERSION %>"
+
+if ENV['C9_USER']
+  gem "lono", path: "~/boltops-tools/lono"
+  gem "rspec-lono", path: "~/boltops-tools/rspec-lono"
+else
+  gem "lono", git: "https://github.com/boltops-tools/lono", branch: "v8"
+  gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
+end

data/lib/templates/project/README.md

@@ -0,0 +1,9 @@
+# Lono Project
+
+This is a Lono project. It contains code to provision Cloud infrastructure built with [CloudFormation](https://aws.amazon.com/cloudformation/) and the [Lono Framework](https://lono.cloud/).
+
+## Deploy
+
+To deploy
+
+    lono up demo # where demo app/blueprints/demo

data/lib/templates/project/config/app.rb

@@ -0,0 +1,3 @@
+Lono.configure do |config|
+  config.logger.level = "info"
+end

data/lib/templates/shim/lono

@@ -0,0 +1,7 @@
+#!/bin/bash
+<%= switch_ruby_version_line %>
+if [ -f config/app.rb ]; then
+  exec bundle exec lono "$@"
+else
+  exec lono "$@"
+fi

data/lono.gemspec

@@ -1,54 +1,62 @@
 # -*- encoding: utf-8 -*-
 require_relative "lib/lono/version"
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Tung Nguyen"]
-  gem.email         = ["tongueroo@gmail.com"]
-  gem.summary       = "The CloudFormation Framework"
-  gem.homepage      = "https://lono.cloud"
+Gem::Specification.new do |spec|
+  spec.authors       = ["Tung Nguyen"]
+  spec.email         = ["tongueroo@gmail.com"]
+  spec.summary       = "Lono: The CloudFormation Framework"
+  spec.homepage      = "https://lono.cloud"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/boltops-tools/lono"
+  spec.metadata["changelog_uri"] = "https://github.com/boltops-tools/lono/blob/master/CHANGELOG.md"
 
   vendor_files       = Dir.glob("vendor/**/*")
   gem_files          = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|docs)/})
   end
-  gem.files         = gem_files + vendor_files
-  gem.bindir        = "exe"
-  gem.executables   = gem.files.grep(%r{^exe/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features|docs)/})
-  gem.name          = "lono"
-  gem.require_paths = ["lib"]
-  gem.version       = Lono::VERSION
-  gem.license       = "https://boltops.com/boltops-community-license"
+  spec.files         = gem_files + vendor_files
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features|docs)/})
+  spec.name          = "lono"
+  spec.require_paths = ["lib"]
+  spec.version       = Lono::VERSION
+  spec.license       = "Apache-2.0"
 
-  gem.add_dependency "activesupport"
-  gem.add_dependency "aws-mfa-secure"
-  gem.add_dependency "aws-sdk-cloudformation"
-  gem.add_dependency "aws-sdk-ec2" # lono seed
-  gem.add_dependency "aws-sdk-iam" # lono seed
-  gem.add_dependency "aws-sdk-s3"
-  gem.add_dependency "aws-sdk-ssm"
-  gem.add_dependency "aws_data"
-  gem.add_dependency "bundler", "~> 2"
-  gem.add_dependency "cfn_camelizer"
-  gem.add_dependency "cli-format"
-  gem.add_dependency "filesize"
-  gem.add_dependency "graph" # lono xgraph command dependency
-  gem.add_dependency "hashie"
-  gem.add_dependency "json"
-  gem.add_dependency "memoist"
-  gem.add_dependency "parslet"
-  gem.add_dependency "plissken"
-  gem.add_dependency "rainbow"
-  gem.add_dependency "rb-fsevent"
-  gem.add_dependency "render_me_pretty"
-  gem.add_dependency "text-table"
-  gem.add_dependency "thor"
-  gem.add_dependency "zeitwerk"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "aws-mfa-secure"
+  spec.add_dependency "aws-sdk-cloudformation"
+  spec.add_dependency "aws-sdk-ec2" # lono seed
+  spec.add_dependency "aws-sdk-iam" # lono seed
+  spec.add_dependency "aws-sdk-s3"
+  spec.add_dependency "aws-sdk-ssm"
+  spec.add_dependency "aws_data"
+  spec.add_dependency "bundler", ">= 2"
+  spec.add_dependency "cfn-status"
+  spec.add_dependency "cfn_camelizer"
+  spec.add_dependency "cli-format"
+  spec.add_dependency "dsl_evaluator"
+  spec.add_dependency "filesize"
+  spec.add_dependency "graph" # lono graph command dependency
+  spec.add_dependency "hashie"
+  spec.add_dependency "json"
+  spec.add_dependency "memoist"
+  spec.add_dependency "parslet"
+  spec.add_dependency "plissken"
+  spec.add_dependency "rainbow"
+  spec.add_dependency "rb-fsevent"
+  spec.add_dependency "render_me_pretty"
+  spec.add_dependency "rexml"
+  spec.add_dependency "text-table"
+  spec.add_dependency "thor"
+  spec.add_dependency "zeitwerk"
+  # spec.add_dependency "rspec-lono"
 
-  gem.add_development_dependency "byebug"
-  gem.add_development_dependency "cli_markdown"
-  gem.add_development_dependency "guard-bundler"
-  gem.add_development_dependency "guard-rspec"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "cli_markdown"
+  spec.add_development_dependency "guard-bundler"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end