lono 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718e48960a1c3a862ff214236f1ca2a41e086074
-  data.tar.gz: 3d88df2849d2d0c140e1484bfd441de14cf9c477
+  metadata.gz: 0cf2d662d15f91ab5a2be1fd65341349b343f8e5
+  data.tar.gz: ac0fb9f6cabba24f8d9c486100d2af4841131dc0
 SHA512:
-  metadata.gz: 028ceea2ac8e288fe9fbd4c720edd7ab21852b368b3d4b27ce30d523c1aaaf08722ceae4e9d6161f15d7382e4044d739015be252663f5283b3315497da364783
-  data.tar.gz: a726a5be3d63491b8af498a626b5e4322c9cb2c1453535f9511a90b6bba1fdc89e30a4bd14a52d28751510a407c9138a2502ea5f3416c030e189af816bcfb7fc
+  metadata.gz: 02479cb711b6b44348eb0d541cd1669dcc64166c329d67b969180baffba752a7aafd287c672843faa61462f867231edcc763d2be334eaaaeb6a4140f2b9ef700
+  data.tar.gz: a8c72b7ab907c2f5b9016a06037f9ef1644df59586fac5618708f2aa9ff91f3a524a4a61433dd9ef3f2de883c53df84da5aa52e3437762754066987352284394

data/README.md

@@ -16,10 +16,7 @@ Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud Formati
 ## Usage
 
 <pre>
-$ gem install lono
-$ mkdir lono
-$ cd lono
-$ lono init
+$ lono new lono
 </pre>
 
 This sets up a starter lono project with example templates.

data/lib/lono.rb

@@ -1,11 +1,12 @@
 require 'json'
 require 'pp'
+require 'colorize'
 
 $:.unshift File.dirname(__FILE__)
 require 'ext/hash'
 require 'lono/version'
 require 'lono/cli'
-require 'lono/task'
+require 'lono/new'
 require 'lono/template'
 require 'lono/dsl'
 require 'lono/bashify'

data/lib/lono/cli.rb

@@ -1,36 +1,31 @@
 require 'thor'
+require 'lono/cli/help'
 
 module Lono
   class CLI < Thor
 
-    desc "init", "Setup lono starter project"
-    long_desc "Sets up config/lono.rb"
-    method_option :force, :type => :boolean, :aliases => "-f", :desc => "override existing starter files"
-    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
-    method_option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
-    def init
-      Lono::Task.init(options.clone)
+    desc "new [NAME]", "Generates lono starter project"
+    Help.new_long_desc
+    option :force, :type => :boolean, :aliases => "-f", :desc => "override existing starter files"
+    option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
+    def new(project_root)
+      Lono::New.new(options.clone.merge(:project_root => project_root)).run
     end
 
     desc "generate", "Generate the cloud formation templates"
-    long_desc <<EOL
-Examples:
-
-1. lono generate
-2. lono g -c # shortcut
-
-Builds the cloud formation templates files based on config/lono.rb and writes them to the output folder on the filesystem.
-EOL
-    method_option :clean, :type => :boolean, :aliases => "-c", :desc => "remove all output files before generating"
-    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
-    method_option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
+    Help.generate
+    option :clean, :type => :boolean, :aliases => "-c", :desc => "remove all output files before generating"
+    option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
+    option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
+    option :pretty, :type => :boolean, :defautlt => true, :desc => "do not json prettier the output"
     def generate
-      Lono::Task.generate(options.clone)
+      Lono::DSL.new(options.clone).run
     end
 
-    desc "bashify [cloudformation-path]", "Convert the UserData section of an existing Cloud Formation Template to a starter bash script that is compatiable with lono"
+    desc "bashify [URL-OR-PATH]", "Convert the UserData section of an existing Cloud Formation Template to a starter bash script that is compatiable with lono"
+    Help.bashify
     def bashify(path)
-      Lono::Task.bashify(path)
+      Lono::Bashify.new(:path => path).run
     end
 
     desc "version", "Prints version"

data/lib/lono/cli/help.rb

@@ -0,0 +1,37 @@
+module Lono
+  module Help
+    def new_long_desc
+<<-EOL
+Examples:
+
+$ lono new project
+
+$ lono new lono
+EOL
+    end
+
+    def generate
+<<-EOL
+Examples:
+
+$ lono generate
+
+$ lono g -c # shortcut
+
+Builds the cloud formation templates files based on lono project and writes them to the output folder on the filesystem.
+EOL
+    end
+
+    def bashify
+<<-EOL
+Examples:
+
+$ lono bashify /path/to/cloudformation-template.json
+
+$ lono bashify https://s3.amazonaws.com/cloudformation-templates-us-east-1/EC2WebSiteSample.template
+EOL
+    end
+
+    extend self
+  end
+end

data/lib/lono/dsl.rb

@@ -38,11 +38,25 @@ module Lono
       @results.each do |name,json|
         path = "#{output_path}/#{name}"
         puts "  #{path}" unless @options[:quiet]
-        pretty_json = JSON.pretty_generate(JSON.parse(json))
-        File.open(path, 'w') {|f| f.write(pretty_json) }
+        validate(json, path)
+        File.open(path, 'w') {|f| f.write(output_json(json)) }
       end
     end
 
+    def validate(json, path)
+      begin
+        JSON.parse(json)
+      rescue JSON::ParserError => e
+        puts "Invalid json.  Output written to #{path} for debugging".colorize(:red)
+        File.open(path, 'w') {|f| f.write(json) }
+        exit 1
+      end
+    end
+
+    def output_json(json)
+      @options[:pretty] ? JSON.pretty_generate(JSON.parse(json)) : json
+    end
+
     def run(options={})
       evaluate
       build

data/lib/lono/{task.rb → new.rb}

@@ -1,14 +1,19 @@
 module Lono
-  class Task
-    def self.init(options={})
-      project_root = options[:project_root] || '.'
+  class New
+    attr_reader :options
+    def initialize(options)
+      @options = options
+      @project_root = options[:project_root] || '.'
+    end
+
+    def run
       puts "Setting up lono project" unless options[:quiet]
       source_root = File.expand_path("../../starter_project", __FILE__)
       paths = Dir.glob("#{source_root}/**/*").
                 select {|p| File.file?(p) }
       paths.each do |src|
         dest = src.gsub(%r{.*starter_project/},'')
-        dest = "#{project_root}/#{dest}"
+        dest = "#{@project_root}/#{dest}"
 
         if File.exist?(dest) and !options[:force]
           puts "already exists: #{dest}" unless options[:quiet]
@@ -21,21 +26,5 @@ module Lono
       end
       puts "Starter lono project created"
     end
-    def self.generate(options)
-      new(options).generate
-    end
-
-    def initialize(options={})
-      @options = options
-      @dsl = options.empty? ? DSL.new : DSL.new(options)
-    end
-    def generate
-      @dsl.run(@options)
-    end
-
-    def self.bashify(path)
-      @bashify = Lono::Bashify.new(:path => path)
-      @bashify.run
-    end
   end
-end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/starter_project/Gemfile

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

data/lib/starter_project/config/lono/api.rb

@@ -1,10 +1,6 @@
 template "prod-api-app.json" do
-  env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => env,
-    :app => app,
-    :role => role,
     :ami => "ami-123",
     :instance_type => "m1.small",
     :port => "80",
@@ -21,12 +17,8 @@ template "prod-api-app.json" do
 end
 
 template "prod-api-worker.json" do
-  env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => env,
-    :app => app,
-    :role => role,
     :ami => "ami-123",
     :instance_type => "m1.small",
     :port => "80",
@@ -44,12 +36,8 @@ template "prod-api-worker.json" do
 end
 
 template "prod-api-redis.json" do
-  env,app,role = name.sub('.json','').split('-')
   source "db.json.erb"
   variables(
-    :env => env,
-    :app => app,
-    :role => role,
     :ami => "ami-456",
     :instance_type => "m1.small",
     :port => "80",

data/lib/starter_project/templates/app.json.erb

@@ -1,3 +1,4 @@
+<% @env,@app,@role = name.sub('.json','').split('-') %>
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Description": "<%= @app.capitalize %> Stack",

data/lib/starter_project/templates/db.json.erb

@@ -1,3 +1,4 @@
+<% @env,@app,@role = name.sub('.json','').split('-') %>
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Description": "<%= @app.capitalize %> <%= @role %>",

data/lono.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "lono"
   gem.require_paths = ["lib"]
   gem.version       = Lono::VERSION
+  gem.license       = 'MIT'
 
   gem.add_dependency "rake"
   gem.add_dependency "json"
@@ -23,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rb-fsevent'
   gem.add_dependency "guard-cloudformation"
   gem.add_dependency "guard-lono"
+  gem.add_dependency "colorize"
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard-rspec'

data/spec/lib/lono_spec.rb

@@ -2,13 +2,16 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Lono do
   before(:each) do
-    @project = File.expand_path("../../project", __FILE__)
-    FileUtils.mkdir(@project) unless File.exist?(@project)
-    execute("./bin/lono init -f -q --project-root #{@project}")
+    lono_bin = File.expand_path("../../../bin/lono", __FILE__)
+    @project = File.expand_path("../../../tmp/lono_project", __FILE__)
+    dir = File.dirname(@project)
+    name = File.basename(@project)
+    FileUtils.mkdir(dir) unless File.exist?(dir)
+    execute("cd #{dir} && #{lono_bin} new #{name} -f -q ")
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project)
+    FileUtils.rm_rf(@project) unless ENV['LEAVE_TMP_PROJECT']
   end
 
   describe "bashify" do
@@ -174,10 +177,10 @@ describe Lono do
     end
 
     it "task should generate cloud formation templates" do
-      Lono::Task.generate(
+      Lono::DSL.new(
         :project_root => @project,
         :quiet => true
-      )
+      ).run
       raw = IO.read("#{@project}/output/prod-api-app.json")
       json = JSON.load(raw)
       json['Description'].should == "Api Stack"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,10 +201,12 @@ files:
 - lib/lono.rb
 - lib/lono/bashify.rb
 - lib/lono/cli.rb
+- lib/lono/cli/help.rb
 - lib/lono/dsl.rb
-- lib/lono/task.rb
+- 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
@@ -207,7 +223,8 @@ files:
 - spec/lib/lono_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tongueroo/lono
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []