lono 1.1.3 → 2.0.0

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "1.1.3"
+  VERSION = "2.0.0"
 end

data/lib/{starter_project_yaml → starter_projects/json_project}/Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
 gem 'lono'
-gem 'lono-cfn'

data/lib/starter_projects/json_project/params/api-web-prod.txt

@@ -0,0 +1,20 @@
+require "thor"
+
+module Lono
+  class Param < Command
+    autoload :Help, 'lono/param/help'
+    autoload :Generator, 'lono/param/generator'
+
+    class_option :verbose, type: :boolean
+    class_option :noop, type: :boolean
+    class_option :mute, type: :boolean
+    class_option :project_root, desc: "project root to use", default: '.'
+
+    desc "generate NAME", "generate parameter json file for NAME"
+    long_desc Help.generate
+    option :path, desc: "Name of the source that maps to the params txt file.  name -> params/NAME.txt.  Use this to override the params/NAME.txt convention"
+    def generate
+      Generator.generate_all(options)
+    end
+  end
+end

data/lib/{starter_project_json → starter_projects/yaml_project}/Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
 gem 'lono'
-gem 'lono-cfn'

data/lib/starter_projects/yaml_project/params/api-web-prod.txt

@@ -0,0 +1,20 @@
+require "thor"
+
+module Lono
+  class Param < Command
+    autoload :Help, 'lono/param/help'
+    autoload :Generator, 'lono/param/generator'
+
+    class_option :verbose, type: :boolean
+    class_option :noop, type: :boolean
+    class_option :mute, type: :boolean
+    class_option :project_root, desc: "project root to use", default: '.'
+
+    desc "generate NAME", "generate parameter json file for NAME"
+    long_desc Help.generate
+    option :path, desc: "Name of the source that maps to the params txt file.  name -> params/NAME.txt.  Use this to override the params/NAME.txt convention"
+    def generate
+      Generator.generate_all(options)
+    end
+  end
+end

data/lono.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/lono/version', __FILE__)
+require_relative "lib/lono/version"
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Tung Nguyen"]
@@ -8,25 +8,30 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Lono is a CloudFormation Template ruby generator.  Lono generates CloudFormation templates based on ERB templates.}
   gem.homepage      = "http://github.com/tongueroo/lono"
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files`.split($\) + Dir.glob("vendor/**/*")
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "lono"
   gem.require_paths = ["lib"]
   gem.version       = Lono::VERSION
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
-  gem.add_dependency "rake"
   gem.add_dependency "json"
   gem.add_dependency "thor"
-  gem.add_dependency 'guard'
-  gem.add_dependency 'rb-fsevent'
+  gem.add_dependency "guard"
+  gem.add_dependency "rb-fsevent"
   gem.add_dependency "guard-cloudformation"
   gem.add_dependency "guard-lono"
   gem.add_dependency "colorize"
+  gem.add_dependency "hashie"
+  gem.add_dependency "aws-sdk"
+  # gem.add_dependency "plissken" # dependency for vendor/lono-params
+  # using the vendor fork version: https://github.com/tongueroo/plissken
+  # until https://github.com/futurechimp/plissken/pull/6 gets merged
 
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'guard-rspec'
-  gem.add_development_dependency 'guard-bundler'
-  gem.add_development_dependency 'byebug'
+  gem.add_development_dependency "byebug"
+  gem.add_development_dependency "guard-bundler"
+  gem.add_development_dependency "guard-rspec"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec"
 end

data/spec/fixtures/my_project/config/lono.rb

@@ -0,0 +1 @@
+# this file is just in here to get the lono-cfn spec to pass

data/spec/fixtures/my_project/params/my-stack.txt

@@ -0,0 +1,3 @@
+Param1=1
+Param2=1
+

data/spec/lib/lono/cfn_spec.rb

@@ -0,0 +1,35 @@
+require_relative "../../spec_helper"
+
+describe Lono::Cfn do
+  before(:all) do
+    @args = "--noop --project-root spec/fixtures/my_project"
+  end
+
+  describe "lono cfn" do
+    it "create stack" do
+      out = execute("bin/lono cfn create my-stack #{@args}")
+      expect(out).to include("Creating")
+    end
+
+    it "update stack" do
+      out = execute("bin/lono cfn update my-stack #{@args}")
+      expect(out).to include("Updating")
+    end
+
+    it "delete stack" do
+      out = execute("bin/lono cfn delete my-stack #{@args}")
+      expect(out).to include("Deleted")
+    end
+
+    it "preview stack" do
+      out = execute("bin/lono cfn preview my-stack #{@args}")
+      expect(out).to include("CloudFormation preview")
+    end
+
+    it "diff stack" do
+      out = execute("bin/lono cfn diff my-stack #{@args}")
+      expect(out).to include("diff")
+    end
+  end
+end
+

data/spec/lib/lono/new_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require_relative "../../spec_helper"
 
 describe Lono::New do
   before(:each) do
@@ -20,7 +20,7 @@ describe Lono::New do
     end
 
     it "should be able to lono generate" do
-      dsl = Lono::DSL.new(
+      dsl = Lono::Template::DSL.new(
         project_root: @project_root,
         quiet: true
       )
@@ -42,7 +42,7 @@ describe Lono::New do
     end
 
     it "should be able to lono generate" do
-      dsl = Lono::DSL.new(
+      dsl = Lono::Template::DSL.new(
         project_root: @project_root,
         quiet: true
       )

data/spec/lib/lono/param_spec.rb

@@ -0,0 +1,15 @@
+require_relative "../../spec_helper"
+
+describe Lono::Param do
+  before(:all) do
+    @args = "--project-root spec/fixtures/my_project"
+  end
+
+  describe "lono param" do
+    it "generate" do
+      out = execute("bin/lono param generate #{@args}")
+      expect(out).to include("Generating")
+    end
+  end
+end
+

data/spec/lib/lono/{dsl_spec.rb → template/dsl_spec.rb}

@@ -1,6 +1,6 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require_relative "../../../spec_helper"
 
-describe Lono::DSL do
+describe Lono::Template::DSL do
   before(:each) do
     @project_root = File.expand_path("../../../../tmp/lono_project", __FILE__)
   end
@@ -20,11 +20,11 @@ describe Lono::DSL do
     end
 
     it "json" do
-      dsl = Lono::DSL.new(
+      dsl = Lono::Template::DSL.new(
         project_root: @project_root,
         quiet: true
       )
-      dsl.evaluate # run the dependent instance_eval and load_subfoler so @templates is assigned
+      dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
       detected_format = dsl.detect_format
       expect(detected_format).to eq 'json'
     end
@@ -42,11 +42,11 @@ describe Lono::DSL do
     end
 
     it "yaml" do
-      dsl = Lono::DSL.new(
+      dsl = Lono::Template::DSL.new(
         project_root: @project_root,
         quiet: true
       )
-      dsl.evaluate # run the dependent instance_eval and load_subfoler so @templates is assigned
+      dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
       detected_format = dsl.detect_format
       expect(detected_format).to eq 'yaml'
     end
@@ -54,7 +54,7 @@ describe Lono::DSL do
 
   context "multiple format starter project" do
     # it "yaml" do
-    #   dsl = Lono::DSL.new(
+    #   dsl = Lono::Template::DSL.new(
     #     project_root: @project,
     #     quiet: true
     #   )
@@ -73,7 +73,7 @@ describe Lono::DSL do
       )
       new_project.run
 
-      dsl = Lono::DSL.new(
+      dsl = Lono::Template::DSL.new(
         project_root: @project_root,
         quiet: true
       )
@@ -141,7 +141,7 @@ describe Lono::DSL do
 
     it "should transform bash script to CF template user_data" do
       block = Proc.new { }
-      template = Lono::Template.new("foo", block)
+      template = Lono::Template::Template.new("foo", block)
 
       line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name ; {"Ref"=>"Ami"}'
       data = template.transform(line)

data/spec/lib/lono/template/template_spec.rb

@@ -0,0 +1,104 @@
+require_relative "../../../spec_helper"
+
+describe Lono::Template do
+  let(:template) do
+    block = Proc.new {}
+    template = Lono::Template::Template.new("output_name.yml", block)
+
+    # override the puts and printf methods within the test
+    def template.messages
+      @messages
+    end
+
+    def template.puts(msg)
+      @messages ||= []
+      @messages << msg
+      nil
+    end
+
+    def template.printf(*args)
+      @messages ||= []
+      @messages << args
+    end
+
+    template
+  end
+
+  context "valid erb template" do
+    it "should be able to lono generate" do
+      template.erb_result("path", "template")
+    end
+  end
+
+  context "invalid erb template" do
+    it "should print out useful error message about undefined variable" do
+      template.erb_result("path", "variable does not exist\n<% variable %>\nanother line")
+      errors = template.messages.grep(/Error evaluating ERB template on line/)
+      expect(errors).not_to be_empty
+    end
+
+    it "should print out useful error message about syntax error" do
+      template.erb_result("path", "<%s dsfds ?%>\nanother line")
+      errors = template.messages.grep(/Error evaluating ERB template on line/)
+      expect(errors).not_to be_empty
+    end
+  end
+
+  describe "parsing" do
+    it "should transform bash script into json array with cloudformation objects" do
+      block = Proc.new { }
+      template = Lono::Template::Template.new("foo", block)
+
+      line = '0{2345}7'
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,6],[7,7]]
+      line = '0{2}4{6}' # more than one bracket
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,3],[4,4],[5,7]]
+      line = '0{2}4{6{8}0}2' # nested brackets
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,3],[4,4],[5,11],[12,12]]
+
+      line = '{'
+      expect(template.decompose(line)).to eq ['{']
+
+      ##########################
+      line = '1{"Ref"=>"A"}{"Ref"=>"B"}'
+      expect(template.decompose(line)).to eq ['1','{"Ref"=>"A"}','{"Ref"=>"B"}']
+
+      line = '{"Ref"=>"A"}{"Ref"=>"B"}2'
+      expect(template.decompose(line)).to eq ['{"Ref"=>"A"}','{"Ref"=>"B"}','2']
+
+      line = '1{"Ref"=>"A"}{"Ref"=>"B"}2'
+      expect(template.decompose(line)).to eq ['1','{"Ref"=>"A"}','{"Ref"=>"B"}','2']
+
+      line = '{"Ref"=>"A"}{"Ref"=>"B"}'
+      expect(template.decompose(line)).to eq ['{"Ref"=>"A"}','{"Ref"=>"B"}']
+
+      line = 'Ref{"Ref"=>"B"}'
+      expect(template.decompose(line)).to eq ['Ref','{"Ref"=>"B"}']
+      ##############################
+
+      # only allow whitelist
+      line = 'a{b}{"foo"=>"bar"}h'
+      expect(template.decompose(line)).to eq ['a{b}{"foo"=>"bar"}h']
+
+      line = 'a{b}{"Ref"=>"bar"}h'
+      expect(template.decompose(line)).to eq ['a{b}','{"Ref"=>"bar"}','h']
+      line = 'a{"Ref"=>"bar"}c{"Ref"=>{"cat"=>"mouse"}}e' # nested brackets
+      expect(template.decompose(line)).to eq ['a','{"Ref"=>"bar"}','c','{"Ref"=>{"cat"=>"mouse"}}','e']
+
+      line = 'test{"Ref"=>"world"}me' # nested brackets
+      decomposition = template.decompose(line)
+      result = template.recompose(decomposition)
+      expect(result).to eq ["test", {"Ref" => "world"}, "me"]
+
+      line = 'test{"Ref"=>"world"}me'
+      expect(template.transform(line)).to eq ["test", {"Ref" => "world"}, "me\n"]
+      line = '{"Ref"=>"world"}'
+      expect(template.transform(line)).to eq [{"Ref" => "world"}, "\n"]
+      line = '{'
+      expect(template.transform(line)).to eq ["{\n"]
+      line = 'Ref{"Ref"=>"B"}'
+      expect(template.transform(line)).to eq ['Ref',{"Ref"=>"B"}, "\n"]
+    end
+  end
+
+end

data/spec/lib/lono/template_spec.rb

@@ -1,46 +1,31 @@
-require File.expand_path("../../../spec_helper", __FILE__)
-
-describe Lono::Template do
-  let(:template) do
-    block = Proc.new {}
-    template = Lono::Template.new("output_name.yml", block)
-
-    # override the puts and printf methods within the test
-    def template.messages
-      @messages
-    end
-
-    def template.puts(msg)
-      @messages ||= []
-      @messages << msg
-      nil
-    end
-
-    def template.printf(*args)
-      @messages ||= []
-      @messages << args
-    end
-
-    template
+require_relative "../../spec_helper"
+
+describe Lono do
+  before(:each) do
+    lono_bin = File.expand_path("../../../../bin/lono", __FILE__)
+    @project_root = File.expand_path("../../../../tmp/lono_project", __FILE__)
+    dir = File.dirname(@project_root)
+    name = File.basename(@project_root)
+    FileUtils.mkdir(dir) unless File.exist?(dir)
+    execute("cd #{dir} && #{lono_bin} new #{name} -f -q --format json")
   end
 
-  context "valid erb template" do
-    it "should be able to lono generate" do
-      template.erb_result("path", "template")
-    end
+  after(:each) do
+    FileUtils.rm_rf(@project_root) unless ENV['KEEP_TMP_PROJECT']
   end
 
-  context "invalid erb template" do
-    it "should print out useful error message about undefined variable" do
-      template.erb_result("path", "variable does not exist\n<% variable %>\nanother line")
-      errors = template.messages.grep(/Error evaluating ERB template on line/)
-      expect(errors).not_to be_empty
+  describe "bashify" do
+    it "should convert cfn user_data to bash script" do
+      path = "#{$root}/spec/fixtures/cfn.json"
+      out = execute("./bin/lono template bashify #{path}")
+      expect(out).to match /bash -lexv/
     end
+  end
 
-    it "should print out useful error message about syntax error" do
-      template.erb_result("path", "<%s dsfds ?%>\nanother line")
-      errors = template.messages.grep(/Error evaluating ERB template on line/)
-      expect(errors).not_to be_empty
+  describe "cli specs" do
+    it "should generate templates" do
+      out = execute("./bin/lono template generate -c --project-root #{@project_root}")
+      expect(out).to match /Generating CloudFormation templates/
     end
   end
 end