stack_master 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c8551f813ec21a55926c685bf281cf9aae2f33
-  data.tar.gz: eabcb88f9bc07a017659ebac349e5a476aca605c
+  metadata.gz: 5a3ed3d56cf859f61ca5a72f89d42cfefea0cd0d
+  data.tar.gz: af141896b5817e2ff3a30b3811c3b3fedb1cade9
 SHA512:
-  metadata.gz: 2b3242170d4615b24c88b85f1bf948bd69c00eacb83bafb6120dd37b247928648e4f9f0890e0ba3516b4e5e10eaa7bfacb5d1806bc7c3771a53bd5d02a7cd187
-  data.tar.gz: 0466d851277d7ec84ff4d1d1ed619f078a08bd0da8de70aad2c5e020537faa99a2a7ab6fa6c5c7229504a9455b5d2db87b140e7438707bfda86d4f21ebda73dd
+  metadata.gz: 13e318d63d1a51aa9c379a571694cf43bc640aabc9e55d4cc0fb6570d0e44031609cd463fb655805620c39e60877d816d79a4ad6f1fbb909df652bdb27a3ebb1
+  data.tar.gz: 5fa3fad8464793c9d2d91738095e3e22e09d4029fcff28888f46f9fa30b92ff576761ad0db3df7ce74bc86d2c6237f9ff6813a2b9d81874008bc8659e99d691a

data/README.md

@@ -175,12 +175,12 @@ web_ami:
 stack_master help # Display up to date docs on the commands available
 stack_master init # Initialises a directory structure and stack_master.yml file
 stack_master list # Lists stack definitions
-stack_master apply [region-or-alias] [stack-name] # Create or update a stack
-stack_master diff [region-or-alias] [stack-name] # Display a stack tempalte and parameter diff
-stack_master delete [region-or-alias] [stack-name] # Delete a stack
-stack_master events [region-or-alias] [stack-name] # Display events for a stack
-stack_master outputs [region-or-alias] [stack-name] # Display outputs for a stack
-stack_master resources [region-or-alias] [stack-name] # Display outputs for a stack
+stack_master apply <region-or-alias> <stack-name> # Create or update a stack
+stack_master diff <region-or-alias> <stack-name> # Display a stack tempalte and parameter diff
+stack_master delete <region-or-alias> <stack-name> # Delete a stack
+stack_master events <region-or-alias> <stack-name> # Display events for a stack
+stack_master outputs <region-or-alias> <stack-name> # Display outputs for a stack
+stack_master resources <region-or-alias> <stack-name> # Display outputs for a stack
 stack_master status # Displays the status of each stack
 ```
 

data/lib/stack_master/commands/outputs.rb

@@ -11,6 +11,7 @@ module StackMaster
 
       def perform
         if stack
+          tp.set :max_width, 80
           tp stack.outputs, :output_key, :output_value, :description
         else
           StackMaster.stdout.puts "Stack doesn't exist"

data/lib/stack_master/commands/validate.rb

@@ -4,7 +4,7 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition)
+      def initialize(config, stack_definition, options = {})
         @config = config
         @stack_definition = stack_definition
       end

data/lib/stack_master/config.rb

@@ -4,8 +4,9 @@ require 'active_support/core_ext/object/deep_dup'
 module StackMaster
   class Config
     def self.load!(config_file = 'stack_master.yml')
-      config = YAML.load(File.read(config_file))
-      base_dir = File.dirname(File.expand_path(config_file))
+      resolved_config_file = search_up_and_chdir(config_file)
+      config = YAML.load(File.read(resolved_config_file))
+      base_dir = File.dirname(File.expand_path(resolved_config_file))
       new(config, base_dir)
     end
 
@@ -15,6 +16,19 @@ module StackMaster
                   :region_defaults,
                   :region_aliases
 
+    def self.search_up_and_chdir(config_file)
+      return config_file unless File.dirname(config_file) == "."
+
+      dir = Dir.pwd
+      parent_dir = File.expand_path("..", Dir.pwd)
+      while parent_dir != dir && !File.exists?(File.join(dir, config_file))
+        dir = parent_dir
+        parent_dir = File.expand_path("..", dir)
+      end
+
+      File.join(dir, config_file)
+    end
+
     def initialize(config, base_dir)
       @config = config
       @base_dir = base_dir

data/lib/stack_master/parameter_resolver.rb

@@ -16,7 +16,11 @@ module StackMaster
 
     def resolve
       @parameters.reduce({}) do |parameters, (key, value)|
-        parameters[key] = resolve_parameter_value(value)
+        begin
+          parameters[key] = resolve_parameter_value(value)
+        rescue InvalidParameter
+          raise InvalidParameter, "Unable to resolve parameter #{key.inspect} value causing error: #{$!.message}"
+        end
         parameters
       end
     end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/stack_master/commands/validate_spec.rb

@@ -1,9 +1,10 @@
 RSpec.describe StackMaster::Commands::Validate do
 
-  subject(:validate) { described_class.new(config, stack_definition) }
+  subject(:validate) { described_class.new(config, stack_definition, options) }
   let(:config) { instance_double(StackMaster::Config) }
   let(:region) { "us-east-1" }
   let(:stack_name) { "mystack" }
+  let(:options) { }
   let(:stack_definition) do
     StackMaster::StackDefinition.new(
       region: region,

data/spec/stack_master/config_spec.rb

@@ -15,6 +15,22 @@ RSpec.describe StackMaster::Config do
     )
   }
 
+  context ".load!" do
+    it "fails to load the config if no stack_master.yml in parent directories" do
+      expect { StackMaster::Config.load!('stack_master.yml') }.to raise_error Errno::ENOENT
+    end
+
+    it "searches up the tree for stack master yaml" do
+      begin
+        orig_dir = Dir.pwd
+        Dir.chdir './spec/fixtures/templates'
+        expect(StackMaster::Config.load!('stack_master.yml')).to_not be_nil
+      ensure
+        Dir.chdir orig_dir
+      end
+    end
+  end
+
   it 'returns an object that can find stack definitions' do
     stack = loaded_config.find_stack('us-east-1', 'myapp-vpc')
     expect(stack).to eq(myapp_vpc_definition)

data/stack_master.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "commander"
   spec.add_dependency "virtus"
-  spec.add_dependency "aws-sdk"
+  spec.add_dependency "aws-sdk", "~> 2.1"
   spec.add_dependency "diffy"
   spec.add_dependency "colorize"
   spec.add_dependency "activesupport"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,16 +155,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement