stackup 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ac043517d513f34ee9d26b0575dd09490244d3
-  data.tar.gz: a7964f8761f674eadc3dbd9bef961f3761e9b964
+  metadata.gz: 7968636aea4da953ab3902af33236e0705ad4d26
+  data.tar.gz: 7c1f9ad8bc8f02f9a59e0a74692c4c54548d171f
 SHA512:
-  metadata.gz: a1b6073edf68ff4dd0a75ed31e73787fbd549c2523370eaf1b4c51fd07bbeb5a21e524edc75f1a898b98389af462af28286b3022b9cd12dfbf915c2d27d32362
-  data.tar.gz: 252fc02edab1de1d593b840238e28d10e59427a5a32d119ee50dad819aa614d4b989ecb3bd0f3b8c80abed6888ad285ed032d208ab3d13cf9f33a660bfcdbaab
+  metadata.gz: 2d7cfc30af2ada8982ccdb9fda1b438da8add5f759c20767304d8f5a1a71b857e5c44bb9b3084e73104990b7ea39e1e2e672db5dc606e5b2fbac345a159bd99f
+  data.tar.gz: 62dd4d15cf71214870ff0b5ba1234b9d4c7f3f22e58724de38789c91817d4f8f8dda04cfc954f81a66b3f9a6c6d14d3cfb96fbb9fd64c0ee7f8965e02209629d

data/.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

data/.gitignore

@@ -0,0 +1,20 @@
+*.gem
+*.rbc
+.bundle
+.config
+.rbenv-*
+.ruby-version
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.rvmrc

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format documentation

data/.rubocop.yml

@@ -0,0 +1,47 @@
+Eval:
+  Exclude:
+    - "Rakefile"
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 30
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  Exclude:
+    - "spec/**/*"
+
+Style/Documentation:
+  Exclude:
+    - "spec/**/*"
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - "bin/*"
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/WordArray:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.2.3

data/bin/stackup

@@ -4,6 +4,7 @@ $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 
 require "clamp"
 require "console_logger"
+require "diffy"
 require "multi_json"
 require "stackup"
 require "stackup/version"
@@ -74,6 +75,12 @@ Clamp do
     puts "Stack #{change}" unless change.nil?
   end
 
+  def load_data(file)
+    YAML.load_file(file)
+  rescue Errno::ENOENT
+    signal_error "no such file: #{file.inspect}"
+  end
+
   subcommand "status", "Print stack status." do
 
     def execute
@@ -115,12 +122,47 @@ Clamp do
       end
     end
 
+  end
+
+  subcommand "diff", "Compare template/params to current stack." do
+
+    option ["-t", "--template"], "FILE", "template file",
+           :attribute_name => :template_file
+
+    option ["-p", "--parameters"], "FILE", "parameters file",
+           :attribute_name => :parameters_file
+
+    option "--diff-format", "FORMAT", "'text', 'color', or 'html'", :default => "color"
+
+    def execute
+      # rubocop:disable Style/GuardClause
+      if template_file
+        template = load_data(template_file)
+        diff_data(stack.template, template)
+      end
+      if parameters_file
+        parameters = hashify_parameters(load_data(parameters_file))
+        diff_data(stack.parameters, parameters)
+      end
+    end
+
     private
 
-    def load_data(file)
-      YAML.load_file(file)
-    rescue Errno::ENOENT
-      signal_error "no such file: #{file.inspect}"
+    def diff_data(existing_data, pending_data)
+      existing = format_data(existing_data) + "\n"
+      pending = format_data(pending_data) + "\n"
+      diff = Diffy::Diff.new(existing, pending).to_s(diff_format.to_sym)
+      return if diff =~ /\A\s*\Z/
+      puts diff
+    end
+
+    def hashify_parameters(parameters)
+      return parameters unless parameters.is_a?(Array)
+      {}.tap do |result|
+        parameters.each do |p|
+          result[p["parameter_key"]] = p["parameter_value"]
+        end
+      end
     end
 
   end

data/examples/parameters.json

@@ -0,0 +1,6 @@
+[
+  {
+    "parameter_key": "IndexDoc",
+    "parameter_value": "default.htm"
+  }
+]

data/examples/parameters.yml

@@ -0,0 +1 @@
+IndexDoc: index.htm

data/{woollyams → examples}/template.json

@@ -1,13 +1,20 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "AWS CloudFormation Sample Template S3_Website_Bucket_With_Retain_On_Delete: Sample template showing how to create a publicly accessible S3 bucket configured for website access with a deletion policy of retail on delete. **WARNING** This template creates an S3 bucket that will NOT be deleted when the stack is deleted. You will be billed for the AWS resources used if you create a stack from this template.",
+  "Description": "AWS CloudFormation Sample Template",
+  "Parameters": {
+    "IndexDoc": {
+      "Description": "Website index doc",
+      "Type": "String",
+      "Default": "index.html"
+    }
+  },
   "Resources": {
     "S3Bucket": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "AccessControl": "PublicRead",
         "WebsiteConfiguration": {
-          "IndexDocument": "index.html",
+          "IndexDocument": { "Ref": "IndexDoc" },
           "ErrorDocument": "error.html"
         }
       }

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 
 end

data/stackup.gemspec

@@ -13,13 +13,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/realestate-com-au/stackup"
   spec.license       = "MIT"
 
-  spec.files         = Dir["**/*"].reject { |f| File.directory?(f) }
-  spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
   spec.require_paths = ["lib"]
 
+  spec.bindir = "bin"
+  spec.executables << "stackup"
+
   spec.add_dependency "aws-sdk", "~> 2.0"
   spec.add_dependency "clamp", "~> 1.0"
   spec.add_dependency "console_logger"
+  spec.add_dependency "diffy", "~> 3.0.5"
   spec.add_dependency "multi_json"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -76,35 +90,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/stackup
-- doc/Stackup.html
-- doc/Stackup/ErrorMappingProxy.html
-- doc/Stackup/InvalidStateError.html
-- doc/Stackup/NoSuchStack.html
-- doc/Stackup/NoUpdateRequired.html
-- doc/Stackup/Service.html
-- doc/Stackup/ServiceError.html
-- doc/Stackup/Stack.html
-- doc/Stackup/StackUpdateError.html
-- doc/Stackup/StackWatcher.html
-- doc/_index.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/top-level-namespace.html
+- examples/parameters.json
+- examples/parameters.yml
+- examples/template.json
 - lib/stackup.rb
 - lib/stackup/error_handling.rb
 - lib/stackup/errors.rb
@@ -112,16 +109,10 @@ files:
 - lib/stackup/stack.rb
 - lib/stackup/stack_watcher.rb
 - lib/stackup/version.rb
-- pkg/stackup-0.2.0.gem
-- pkg/stackup-0.3.0.gem
-- pkg/stackup-0.4.0.gem
 - spec/spec_helper.rb
 - spec/stackup/stack_spec.rb
 - spec/stackup/stack_watcher_spec.rb
 - stackup.gemspec
-- woollyams/parameters.json
-- woollyams/template.json
-- woollyams/template.yml
 homepage: https://github.com/realestate-com-au/stackup
 licenses:
 - MIT
@@ -146,4 +137,7 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manage CloudFormation stacks
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/stackup/stack_spec.rb
+- spec/stackup/stack_watcher_spec.rb

data/Gemfile.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    stackup (0.5.0)
-      aws-sdk (~> 2.0)
-      clamp (~> 1.0)
-      console_logger
-      multi_json
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    aws-sdk (2.1.27)
-      aws-sdk-resources (= 2.1.27)
-    aws-sdk-core (2.1.27)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.1.27)
-      aws-sdk-core (= 2.1.27)
-    byebug (6.0.2)
-    clamp (1.0.0)
-    console_logger (1.0.0)
-    diff-lcs (1.2.5)
-    jmespath (1.1.3)
-    multi_json (1.11.2)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.34.2)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug
-  rake (~> 10.0)
-  rspec (~> 3.3)
-  rubocop (~> 0.32)
-  stackup!
-
-BUNDLED WITH
-   1.10.6

data/doc/Stackup.html

@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>
-  Module: Stackup
-  
-    &mdash; Documentation by YARD 0.8.7.6
-  
-</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
-
-  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
-
-<script type="text/javascript" charset="utf-8">
-  hasFrames = window.top.frames.main ? true : false;
-  relpath = '';
-  framesUrl = "frames.html#!Stackup.html";
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div id="header">
-      <div id="menu">
-  
-    <a href="_index.html">Index (S)</a> &raquo;
-    
-    
-    <span class="title">Stackup</span>
-  
-
-  <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
-</div>
-
-      <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="class_list.html">
-      Class List
-    </a>
-  
-    <a class="full_list_link" id="method_list_link"
-        href="method_list.html">
-      Method List
-    </a>
-  
-    <a class="full_list_link" id="file_list_link"
-        href="file_list.html">
-      File List
-    </a>
-  
-</div>
-      <div class="clear"></div>
-    </div>
-
-    <iframe id="search_frame"></iframe>
-
-    <div id="content"><h1>Module: Stackup
-  
-  
-  
-</h1>
-
-<dl class="box">
-  
-  
-    
-      <dt class="r1">Extended by:</dt>
-      <dd class="r1">Forwardable</dd>
-      
-    
-  
-    
-  
-  
-  
-    <dt class="r2 last">Defined in:</dt>
-    <dd class="r2 last">lib/stackup.rb<span class="defines">,<br />
-  lib/stackup/stack.rb,<br /> lib/stackup/errors.rb,<br /> lib/stackup/service.rb,<br /> lib/stackup/stack_watcher.rb,<br /> lib/stackup/error_mapping_proxy.rb</span>
-</dd>
-  
-</dl>
-<div class="clear"></div>
-
-<h2>Overview</h2><div class="docstring">
-  <div class="discussion">
-    
-<p>Allow use of `Stackup.stacks` rather than `Stackup().stacks`</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><h2>Defined Under Namespace</h2>
-<p class="children">
-  
-    
-  
-    
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Stackup/ErrorMappingProxy.html" title="Stackup::ErrorMappingProxy (class)">ErrorMappingProxy</a></span>, <span class='object_link'><a href="Stackup/InvalidStateError.html" title="Stackup::InvalidStateError (class)">InvalidStateError</a></span>, <span class='object_link'><a href="Stackup/NoSuchStack.html" title="Stackup::NoSuchStack (class)">NoSuchStack</a></span>, <span class='object_link'><a href="Stackup/NoUpdateRequired.html" title="Stackup::NoUpdateRequired (class)">NoUpdateRequired</a></span>, <span class='object_link'><a href="Stackup/Service.html" title="Stackup::Service (class)">Service</a></span>, <span class='object_link'><a href="Stackup/ServiceError.html" title="Stackup::ServiceError (class)">ServiceError</a></span>, <span class='object_link'><a href="Stackup/Stack.html" title="Stackup::Stack (class)">Stack</a></span>, <span class='object_link'><a href="Stackup/StackUpdateError.html" title="Stackup::StackUpdateError (class)">StackUpdateError</a></span>, <span class='object_link'><a href="Stackup/StackWatcher.html" title="Stackup::StackWatcher (class)">StackWatcher</a></span>
-    
-  
-</p>
-
-
-
-
-
-
-
-  
-    <h2>
-      Class Method Summary
-      <small>(<a href="#" class="summary_toggle">collapse</a>)</small>
-    </h2>
-
-    <ul class="summary">
-      
-        <li class="public ">
-  <span class="summary_signature">
-    
-      <a href="#service-class_method" title="service (class method)">+ (Object) <strong>service</strong>(client = {}) </a>
-    
-
-    
-  </span>
-  
-  
-  
-  
-  
-  
-  
-
-  
-    <span class="summary_desc"><div class='inline'></div></span>
-  
-</li>
-
-      
-    </ul>
-  
-
-
-  
-
-  <div id="class_method_details" class="method_details_list">
-    <h2>Class Method Details</h2>
-
-    
-      <div class="method_details first">
-  <h3 class="signature first" id="service-class_method">
-  
-    + (<tt>Object</tt>) <strong>service</strong>(client = {}) 
-  
-
-  
-
-  
-</h3><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-11
-12
-13</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/stackup.rb', line 11</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_service'>service</span><span class='lparen'>(</span><span class='id identifier rubyid_client'>client</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
-  <span class='const'>Stackup</span><span class='op'>::</span><span class='const'>Service</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_client'>client</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
-</div>
-    
-  </div>
-
-</div>
-
-    <div id="footer">
-  Generated on Fri Oct  9 11:23:11 2015 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.2.2).
-</div>
-
-  </body>
-</html>