lono 3.3.2 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b8dfbe5abe4a50a57843163b7d7d63c93fafe0
-  data.tar.gz: d6683b919f81a8c5e0ec8c9e20ae600fadbe5d63
+  metadata.gz: f1b5263f718afe419807510969a58e1a7941c699
+  data.tar.gz: 973753a128ac8bdc500b55236384d3105d1e72f9
 SHA512:
-  metadata.gz: a920f6e638ac50cd6ddefbb90b37211f6750d15d78cadab935ee8f5c959ce57c542022610a5dfd7a44dfd2a232d3f6da72c51d5ce73a51beb8ed3e2f0429903f
-  data.tar.gz: 923d74376b825621cfd5c4a3c5a368f495cf99cca8be3a854065edbc5b54713a0b1eabd0cced82e80930dc38d51bfa66d44a30657f82b5bebf51d310bf7204fd
+  metadata.gz: d987aebfcba6f25a505eedf2d9be21ffa00d456492828fd8b5911253d33aaac705a0242caa95291abc5927e5771b959c62f59efb5b4133a0c29e092d9b49593b
+  data.tar.gz: f7c37945a9135c67573c3dfc513978df26f02ba34bf4c1834959a13e69993987c635463651999448d3d295a5be53bd45f4dbd23ff9d8188fdda54af286b0b8c5

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [3.3.4]
+- require specific aws-sdk s3 and cloudformation dependencies to reduce size
+
+## [3.3.3]
+- lono import also creates a params/base file
+
 ## [3.3.2]
 - remove -prod from the starter project
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Tung Nguyen
+Copyright (c) 2017 Tung Nguyen
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/lono/cfn.rb

@@ -11,6 +11,7 @@ class Lono::Cfn < Lono::Command
   autoload :Delete, 'lono/cfn/delete'
   autoload :Preview, 'lono/cfn/preview'
   autoload :Diff, 'lono/cfn/diff'
+  autoload :Download, 'lono/cfn/download'
 
   class_option :verbose, type: :boolean
   class_option :noop, type: :boolean
@@ -64,4 +65,11 @@ class Lono::Cfn < Lono::Command
   def diff(name)
     Diff.new(name, options).run
   end
+
+  desc "download STACK", "download CloudFormation template from existing stack"
+  long_desc Help.download
+  option :name, desc: "Name you want to save the template as. Default: existing stack name."
+  def download(stack_name)
+    Download.new(stack_name, options).run
+  end
 end

data/lib/lono/cfn/aws_services.rb

@@ -1,4 +1,4 @@
-require "aws-sdk"
+require "aws-sdk-cloudformation"
 
 module Lono::Cfn::AwsServices
   def cfn

data/lib/lono/cfn/download.rb

@@ -0,0 +1,31 @@
+require 'json'
+
+class Lono::Cfn::Download < Lono::Cfn::Base
+  def run
+    puts "Download existing template to: #{download_path}"
+    return if @options[:noop]
+    download_template
+  end
+
+  def download_template
+    resp = cfn.get_template(
+      stack_name: @stack_name,
+      template_stage: "Original"
+    )
+    body = convert_to_yaml(resp.template_body)
+    IO.write(download_path, body)
+  end
+
+  def convert_to_yaml(body)
+    json?(body) ? YAML.dump(JSON.parse(body)) : body
+  end
+
+  def json?(body)
+    !!JSON.parse(body) rescue false
+  end
+
+  def download_path
+    name = @options[:name] || @stack_name
+    "/tmp/#{name}.yml"
+  end
+end

data/lib/lono/cfn/help.rb

@@ -87,6 +87,16 @@ Displays code diff of the generated CloudFormation template locally vs the exist
 Examples:
 
 $ lono cfn diff my-stack
+EOL
+    end
+
+    def download
+<<-EOL
+Download CloudFormation template from existing template on AWS.
+
+Examples:
+
+$ lono cfn download my-stack
 EOL
     end
   end

data/lib/lono/importer.rb

@@ -15,10 +15,12 @@ class Lono::Importer
     unless options[:noop]
       download_template
       template_definition_path = add_template_definition
+      create_params
       puts "Imported raw CloudFormation template and lono-fied it!"
       puts "Template definition added to #{template_definition_path}."
+      puts "Params file created to #{params_path}."
     end
-    puts "Template downloaded to #{dest_path}."
+    puts "Template downloaded to #{template_path}." # like having this message at the end
   end
 
   def download_template
@@ -30,9 +32,9 @@ class Lono::Importer
                 JSON.pretty_generate(JSON.load(template))
               end
 
-    folder = File.dirname(dest_path)
+    folder = File.dirname(template_path)
     FileUtils.mkdir_p(folder) unless File.exist?(folder)
-    IO.write(dest_path, result)
+    IO.write(template_path, result)
   end
 
   # Add template definition to config/templates/base/stacks.rb.
@@ -48,7 +50,35 @@ class Lono::Importer
     path
   end
 
-  def dest_path
+  # Creates starter params/base/[stack-name].txt file
+  def create_params
+    template = if @format == 'yml'
+                YAML.load_file(template_path)
+              else
+                JSON.load(IO.read(template_path))
+              end
+
+    result = []
+    required_parameters.each do |name, attributes|
+      result << "#{name}="
+    end
+    optional_parameters.each do |name, attributes|
+      key = "#{name}=".ljust(20, ' ')
+      result << "##{key} # optional"
+    end
+    content = result.join("\n") + "\n"
+
+    folder = File.dirname(params_path)
+    FileUtils.mkdir_p(folder) unless File.exist?(folder)
+    IO.write(params_path, content) unless File.exist?(params_path)
+  end
+
+  def params_path
+    "#{@project_root}/params/base/#{template_name}.txt"
+  end
+
+
+  def template_path
     "#{@project_root}/templates/#{template_name}.#{@format}"
   end
 
@@ -60,6 +90,24 @@ class Lono::Importer
   end
 
 private
+  def required_parameters
+    parameters.reject { |logical_id, p| p["Default"] }
+  end
+
+  def optional_parameters
+    parameters.select { |logical_id, p| p["Default"] }
+  end
+
+  def parameters
+    template_data["Parameters"] || []
+  end
+
+  def template_data
+    return @template_data if @template_data
+    template_path = "#{@project_root}/templates/#{template_name}.#{@format}"
+    @template_data = YAML.load(IO.read(template_path))
+  end
+
   def normalize_format(format)
     format == 'yaml' ? 'yml' : format
   end

data/lib/lono/inspector/summary.rb

@@ -4,13 +4,21 @@ class Lono::Inspector::Summary < Lono::Inspector::Base
     return if @options[:noop]
 
     puts "Parameters:"
-    print_parameters("Required", required_parameters)
-    print_parameters("Optional", optional_parameters)
+    print_parameters_summary
 
     puts "Resources:"
     print_resource_types
   end
 
+  def print_parameters_summary
+    if parameters.empty?
+      puts "  There are no parameters"
+    else
+      print_parameters("Required", required_parameters)
+      print_parameters("Optional", optional_parameters)
+    end
+  end
+
   def print_parameters(label, parameters)
     puts "#{label}:"
     if parameters.empty?
@@ -27,11 +35,15 @@ class Lono::Inspector::Summary < Lono::Inspector::Base
   end
 
   def required_parameters
-    data["Parameters"].reject { |logical_id, p| p["Default"] }
+    parameters.reject { |logical_id, p| p["Default"] }
   end
 
   def optional_parameters
-    data["Parameters"].select { |logical_id, p| p["Default"] }
+    parameters.select { |logical_id, p| p["Default"] }
+  end
+
+  def parameters
+    data["Parameters"] || []
   end
 
   def resource_types
@@ -48,5 +60,6 @@ class Lono::Inspector::Summary < Lono::Inspector::Base
       type, count = a
       printf "%3s %s\n", count, type
     end
+    printf "%3s %s\n", resource_types.size, "Total"
   end
 end

data/lib/lono/template/aws_services.rb

@@ -1,4 +1,4 @@
-require "aws-sdk"
+require "aws-sdk-s3"
 
 module Lono::Template::AwsServices
   def s3

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "3.3.2"
+  VERSION = "3.3.4"
 end

data/lono.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "guard-lono"
   gem.add_dependency "colorize"
   gem.add_dependency "hashie"
-  gem.add_dependency "aws-sdk", '~> 3'
+  gem.add_dependency "aws-sdk-cloudformation"
+  gem.add_dependency "aws-sdk-s3"
   gem.add_dependency "activesupport"
   gem.add_dependency "graph" # lono inspect depends
   # gem.add_dependency "plissken" # dependency for vendor/lono-params

data/spec/lib/lono/cfn_spec.rb

@@ -30,6 +30,11 @@ describe Lono::Cfn do
       out = execute("bin/lono cfn diff my-stack #{@args}")
       expect(out).to include("diff")
     end
+
+    it "download stack" do
+      out = execute("bin/lono cfn download my-stack #{@args}")
+      expect(out).to include("Download")
+    end
   end
 end
 

data/spec/lib/lono_spec.rb

@@ -5,6 +5,9 @@ describe Lono do
     before(:each) do
       @args = "--project-root spec/fixtures/my_project"
     end
+    after(:each) do
+      FileUtils.rm_rf("spec/fixtures/my_project/params/base")
+    end
 
     it "generate should build templates" do
       out = execute("./bin/lono generate #{@args}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -123,19 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +261,6 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -265,6 +278,7 @@ files:
 - lib/lono/cfn/create.rb
 - lib/lono/cfn/delete.rb
 - lib/lono/cfn/diff.rb
+- lib/lono/cfn/download.rb
 - lib/lono/cfn/help.rb
 - lib/lono/cfn/preview.rb
 - lib/lono/cfn/update.rb
@@ -385,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Lono is a CloudFormation Template ruby generator.  Lono generates CloudFormation

data/.ruby-version

@@ -1 +0,0 @@
-2.3.3