lono 0.5.2 → 1.0.0

data/spec/lib/lono_spec.rb

@@ -3,15 +3,15 @@ require File.expand_path("../../spec_helper", __FILE__)
 describe Lono do
   before(:each) do
     lono_bin = File.expand_path("../../../bin/lono", __FILE__)
-    @project = File.expand_path("../../../tmp/lono_project", __FILE__)
-    dir = File.dirname(@project)
-    name = File.basename(@project)
+    @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 ")
+    execute("cd #{dir} && #{lono_bin} new #{name} -f -q --format json")
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project) unless ENV['KEEP_TMP_PROJECT']
+    FileUtils.rm_rf(@project_root) unless ENV['KEEP_TMP_PROJECT']
   end
 
   describe "bashify" do
@@ -79,119 +79,9 @@ describe Lono do
     end
   end
 
-  describe "ruby specs" do
-    before(:each) do
-      dsl = Lono::DSL.new(
-        project_root: @project,
-        quiet: true
-      )
-      dsl.run
-    end
-
-    it "should generate cloudformation template" do
-      raw = IO.read("#{@project}/output/prod-api-app.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api Stack"
-      expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
-    end
-
-    it "should make trailing options pass to the partial helper available as instance variables" do
-      raw = IO.read("#{@project}/output/prod-api-app.json")
-      json = JSON.load(raw)
-      expect(json['Resources']['HostRecord']['Properties']['Comment']).to eq 'DNS name for mydomain.com'
-    end
-
-    it "should generate user data with variables" do
-      raw = IO.read("#{@project}/output/prod-api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include("VARTEST=foo\n")
-    end
-
-    it "should include multiple user_data scripts" do
-      raw = IO.read("#{@project}/output/prod-api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include("DB2=test\n")
-    end
-
-    it "should generate db template" do
-      raw = IO.read("#{@project}/output/prod-api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include({"Ref" => "AWS::StackName"})
-      expect(user_data).to include({"Ref" => "WaitHandle"})
-      expect(user_data).to include({
-        "Fn::FindInMap" => [
-          "EnvironmentMapping",
-          "HostnamePrefix",
-          {"Ref" => "Environment"}
-        ]
-      })
-      expect(user_data).to include({
-        "Fn::FindInMap" => [
-          "MapName",
-          "TopLevelKey",
-          "SecondLevelKey"
-        ]
-      })
-      expect(user_data).to include({"Ref" => "DRINK"})
-
-      expect(user_data).to include({"Fn::Base64" => "value to encode"})
-      expect(user_data).to include({"Fn::GetAtt" => ["server", "PublicDnsName"]})
-      expect(user_data).to include({"Fn::GetAZs" => "AWS::Region"})
-      expect(user_data).to include({"Fn::Join" => [ ':', ['a','b','c']]})
-      expect(user_data).to include({"Fn::Select" => [ '1', ['a','b','c']]})
-    end
-
-    it "should transform bash script to CF template user_data" do
-      block = Proc.new { }
-      template = Lono::Template.new("foo", block)
-
-      line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name ; {"Ref"=>"Ami"}'
-      data = template.transform(line)
-      expect(data).to eq ["echo ", {"Ref"=>"AWS::StackName"}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
-
-      line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name'
-      data = template.transform(line)
-      expect(data).to eq ["echo ", {"Ref"=>"AWS::StackName"}, " > /tmp/stack_name\n"]
-
-      line = 'echo {"Fn::FindInMap" => [ "A", "B", {"Ref"=>"AWS::StackName"} ]}'
-      data = template.transform(line)
-      expect(data).to eq ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, "\n"]
-
-      line = 'echo {"Fn::FindInMap" => [ "A", "B", {"Ref"=>"AWS::StackName"} ]} > /tmp/stack_name ; {"Ref"=>"Ami"}'
-      data = template.transform(line)
-      expect(data).to eq ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
-    end
-
-    it "should not transform user_data ruby scripts" do
-      raw = IO.read("#{@project}/output/prod-api-worker.json")
-      json = JSON.load(raw)
-      user_data = json['Resources']['LaunchConfig']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include(%Q|ec2.tags.create(ec2.instances[my_instance_id], "Name", {value: Facter.hostname})\n|)
-      expect(user_data).to include(%Q{find_all{ |record_set| record_set[:name] == record_name }\n})
-    end
-
-    it "should create parent folders for parent/db-stack.json" do
-      directory_created = File.exist?("#{@project}/output/parent")
-      expect(directory_created).to be true
-    end
-
-    it "task should generate CloudFormation templates" do
-      raw = IO.read("#{@project}/output/prod-api-app.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api Stack"
-      expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
-    end
-  end
-
   describe "cli specs" do
     it "should generate templates" do
-      out = execute("./bin/lono generate -c --project-root #{@project}")
+      out = execute("./bin/lono generate -c --project-root #{@project_root}")
       expect(out).to match /Generating CloudFormation templates/
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "pp"
+require "byebug"
 require "bundler"
 
 Bundler.require(:development)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Lono is a CloudFormation Template ruby generator.  Lono generates CloudFormation
   templates based on ERB templates.
 email:
@@ -193,20 +207,31 @@ files:
 - lib/lono/new.rb
 - lib/lono/template.rb
 - lib/lono/version.rb
-- lib/starter_project/Gemfile
-- lib/starter_project/Guardfile
-- lib/starter_project/config/lono.rb
-- lib/starter_project/config/lono/api.rb
-- lib/starter_project/templates/app.json.erb
-- lib/starter_project/templates/db.json.erb
-- lib/starter_project/templates/partial/host_record.json.erb
-- lib/starter_project/templates/partial/server.json.erb
-- lib/starter_project/templates/user_data/app.sh.erb
-- lib/starter_project/templates/user_data/db.sh.erb
-- lib/starter_project/templates/user_data/db2.sh.erb
-- lib/starter_project/templates/user_data/ruby_script.rb.erb
+- lib/starter_project_json/Gemfile
+- lib/starter_project_json/Guardfile
+- lib/starter_project_json/config/lono.rb
+- lib/starter_project_json/config/lono/api.rb
+- lib/starter_project_json/templates/db.json.erb
+- lib/starter_project_json/templates/partial/host_record.json.erb
+- lib/starter_project_json/templates/partial/server.json.erb
+- lib/starter_project_json/templates/user_data/app.sh.erb
+- lib/starter_project_json/templates/user_data/db.sh.erb
+- lib/starter_project_json/templates/user_data/db2.sh.erb
+- lib/starter_project_json/templates/user_data/ruby_script.rb.erb
+- lib/starter_project_json/templates/web.json.erb
+- lib/starter_project_yaml/Gemfile
+- lib/starter_project_yaml/Guardfile
+- lib/starter_project_yaml/config/lono.rb
+- lib/starter_project_yaml/config/lono/api.rb
+- lib/starter_project_yaml/templates/db.yml.erb
+- lib/starter_project_yaml/templates/partial/host_record.yml.erb
+- lib/starter_project_yaml/templates/partial/server.yml.erb
+- lib/starter_project_yaml/templates/partial/user_data/bootstrap.sh.erb
+- lib/starter_project_yaml/templates/web.yml.erb
 - lono.gemspec
 - spec/fixtures/cfn.json
+- spec/lib/lono/dsl_spec.rb
+- spec/lib/lono/new_spec.rb
 - spec/lib/lono_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tongueroo/lono
@@ -229,12 +254,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Lono is a CloudFormation Template ruby generator.  Lono generates CloudFormation
   templates based on ERB templates.
 test_files:
 - spec/fixtures/cfn.json
+- spec/lib/lono/dsl_spec.rb
+- spec/lib/lono/new_spec.rb
 - spec/lib/lono_spec.rb
 - spec/spec_helper.rb