murk 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2247482aa4d6ed38433679cd568f70457fc63c81
-  data.tar.gz: 4100a310b8976d9eeb258aef8d40c3313dfa61e0
+  metadata.gz: dbda2fa6488d386467884cb50954b160cc0f2508
+  data.tar.gz: 2443ef53391f7aeee901c03a2e4803ce55486898
 SHA512:
-  metadata.gz: 533dbd5ae7aa608caef79914cdfbecb6cfafad57b3b94873c895b1c3e9db4638d91fa20317438c08fd0027eded58ec6dc180a10a0bfc6d6cb657c5463c074a7d
-  data.tar.gz: 4f077a7711537ab6c4d7a793d6f48ec35561da07d7c4c642e894b762c2036c5776736824f322d0ff639b20fe09e5e3f7a695b6880a988c86cb8b4dbd3934e6e3
+  metadata.gz: d4d3a042d530c0cb4d37f50deb2af4cc43e417770c95555dd9b1b391879f2f082c678ee4815b5715f6208cb044cd6713651508eb4544063edb2d29e737559840
+  data.tar.gz: 9dc0631bac304b7b2875c9132fb67ad149cc981d8ffe9c6c88d196ed5b3277b8ddb4c76cb6358d826abac4add633594ca2b46da897a44d343e3ff2033032b935

data/bin/murk

@@ -3,72 +3,42 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'logger'
-require 'optparse'
-require 'ostruct'
-
+require 'clamp'
 require 'murk'
 
-DEFAULT_CONFIG_FILE = './config/murk.rb'
-
-def change(options)
-  stack_name = ARGV[1]
-  stacks = Murk.load(options.file)
-  stack = stacks.find_by_name(stack_name, env: ENV['MURK_ENV'] || ENV['USER'])
-  if stack
-    yield stack
-  else
-    fail ArgumentError, 'No stack defined with name ' + stack_name
-  end
-rescue StandardError => e
-  fail_with_exception(e, options.debug)
-end
-
-def fail_with_usage(parser)
-  $stderr.puts parser
-  exit 1
-end
-
-def fail_with_exception(e, debug)
-  cause = e.cause || e
-  $stderr.puts e.message
-  $stderr.puts cause.message
-  if debug
-    $stderr.puts cause.backtrace
-  end
-  exit 2
-end
-
-options = OpenStruct.new
-options.file = DEFAULT_CONFIG_FILE
-options.debug = false
-
-parser = OptionParser.new do |p|
-  p.banner = 'Usage: stack [options] [ create | delete ] STACK'
-
-  p.on('-f', '--file FILE', 'Stack configuration file') do |file|
-    options.file = file
+Clamp do
+
+  subcommand 'create', 'Create a stack' do
+    option "--stack", "STACK", "Stack name to create", required: true, attribute_name: :stack_name
+    option "--env", "ENV", "Name  of the environment", required: true
+    option "--file", "CONFIG_FILE", "Config file", default: "./config/murk.rb"
+    option "--wait", :flag, 'Wait for the stack to be created'
+    parameter "USER", "Name your stack"
+
+    def execute
+      stack = Murk.load(file, user).find_by_name(stack_name, env: env)
+      stack.create_or_update
+      if wait?
+        stack.wait(:stack_create_complete) { print "." }
+        puts 'done!'
+      end
+    end
   end
 
-  p.on('-d', '--debug', 'Show extra debugging output') do |debug|
-    options.debug = debug
-    Murk.logger.level = Logger::DEBUG
+  subcommand 'delete', 'Delete a stack' do
+    option "--stack", "STACK", "Stack name to delete", required: true, attribute_name: :stack_name
+    option "--env", "ENV", "Name  of the environment", required: true
+    option "--file", "CONFIG_FILE", "Config file", default: "./config/murk.rb"
+    option "--wait", :flag, 'Wait for the stack to be deleted'
+    parameter "USER", "Name of your stack"
+
+    def execute
+      stack = Murk.load(file, user).find_by_name(stack_name, env: env)
+      stack.delete
+      if wait?
+        stack.wait(:stack_delete_complete) { print "." }
+        puts 'done!'
+      end
+    end
   end
 end
-
-begin
-  parser.parse!(ARGV)
-rescue OptionParser::ParseError
-  fail_with_usage(parser)
-end
-
-fail_with_usage(parser) unless ARGV.length >= 2
-
-if ARGV[0] == 'create'
-  change(options) { |stack| stack.create_or_update }
-elsif ARGV[0] == 'delete'
-  change(options) { |stack| stack.delete }
-else
-  fail_with_usage(parser)
-end
-
-exit 0

data/lib/aws/extensions/cloudformation.rb

@@ -0,0 +1,16 @@
+module Aws
+  module CloudFormation
+    class Client
+
+      def wait_forever(state, stack_name)
+        wait_until(state, stack_name) do |w|
+          # disable max attempts
+          w.max_attempts = nil
+          w.before_wait do |attempts, response|
+            yield attempts, response if block_given?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/murk.rb

@@ -16,10 +16,10 @@ module Murk
     @options ||= DEFAULT_OPTIONS
   end
 
-  def self.load(file)
+  def self.load(file, user)
     self.config_file = file
     config = File.read(config_file)
-    builder = Murk::Builder::MurkBuilder.new
+    builder = Murk::Builder::MurkBuilder.new user
     builder.instance_eval(config)
     builder.build
   end

data/lib/murk/aws.rb

@@ -1,4 +1,5 @@
 require 'aws-sdk'
+require 'aws/extensions/cloudformation'
 
 module Murk
   module AWS

data/lib/murk/builder/murk_builder.rb

@@ -1,13 +1,13 @@
-
 module Murk
   module Builder
 
     class MurkBuilder
 
-      def initialize
+      def initialize user
         @options_builder = OptionsBuilder.new
         @stack_builders = []
         @current_env = nil
+        @user = user
       end
 
       def options(&block)
@@ -23,7 +23,7 @@ module Murk
       end
 
       def stack(name, &block)
-        stack_builder = StackBuilder.new(name, env: @current_env)
+        stack_builder = StackBuilder.new(name, user: @user, env: @current_env)
         stack_builder.instance_eval(&block)
         @stack_builders << stack_builder
         self
@@ -33,6 +33,7 @@ module Murk
         Murk.configure(@options_builder.build)
 
         stack_collection = Murk::Model::StackCollection.new
+
         @stack_builders.each do |builder|
           stack_collection.add(builder.build)
         end
@@ -40,6 +41,5 @@ module Murk
       end
 
     end
-
   end
 end

data/lib/murk/builder/parameters_builder.rb

@@ -6,8 +6,9 @@ module Murk
 
     class ParametersBuilder
 
-      def initialize(env: nil)
+      def initialize(env: nil, user: nil)
         @env = env
+        @user = user
         @parameters = []
       end
 
@@ -23,7 +24,7 @@ module Murk
         if args.length > 0
           @parameters << Murk::Model::SimpleStackParameter.new(method_sym, args[0], env: @env)
         else
-          @parameters << Murk::Model::ReferenceStackParameter.new(method_sym, block, env: @env)
+          @parameters << Murk::Model::ReferenceStackParameter.new(method_sym, block, env: @env, user: @user)
         end
       end
 

data/lib/murk/builder/stack_builder.rb

@@ -4,14 +4,16 @@ module Murk
 
     class StackBuilder
 
-      def initialize(stack_name, env: nil)
+      def initialize(stack_name, user:, env:)
         @stack_name = stack_name
         @env = env
-        @parameters_builder = ParametersBuilder.new(env: @env)
+        @user = user
+        @parameters_builder = ParametersBuilder.new(env: @env, user: user)
       end
 
       def build
-        stack = Murk::Model::Stack.new(@stack_name, env: @env)
+        stack = Murk::Model::Stack.new(@stack_name, env: @env, user: @user)
+
         if @template_filename
           stack.template_filename = @template_filename
         end

data/lib/murk/model/stack.rb

@@ -9,12 +9,13 @@ module Murk
       include Murk
       include Murk::AWS
 
-      attr_reader :name, :env, :template
+      attr_reader :name, :env, :template, :user
 
-      def initialize(name, env: nil, template_filename: name + '.json')
+      def initialize(name, env:, user:, template_filename: name + '.json')
         @name = name
         @env = env
         @template = Template.new(template_filename)
+        @user = user
         @parameters = []
       end
 
@@ -54,15 +55,16 @@ module Murk
         end
       end
 
+      def wait state
+        cloudformation.wait_forever(:stack_create_complete, stack_name: qualified_name) { yield if block_given? }
+      end
+
       def qualified_name
         qualified_name = ''
         if Murk.options[:stack_prefix]
           qualified_name += Murk.options[:stack_prefix] + '-'
         end
-        if @env
-          qualified_name += @env + '-'
-        end
-        qualified_name + @name
+        qualified_name + "#{@env}-#{@user}-#{@name}"
       end
 
       def output(key)

data/lib/murk/model/stack_parameter.rb

@@ -26,9 +26,10 @@ module Murk
 
       attr_reader :key, :block
 
-      def initialize(key, block, env: nil)
+      def initialize(key, block, env: nil, user: nil)
         @key = key
         @block = block
+        @user = user
         @env = env
       end
 
@@ -36,13 +37,8 @@ module Murk
         instance_eval(&@block)
       end
 
-      def env(name)
-        @env = name
-        self
-      end
-
       def stack(name)
-        Stack.new(name, env: @env)
+        Stack.new(name, env: @env, user: @user)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: murk
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Cam Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api_cache
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/murk
+- lib/aws/extensions/cloudformation.rb
 - lib/murk.rb
 - lib/murk/aws.rb
 - lib/murk/builder/murk_builder.rb