cfn-flow 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badcc4a2c292d0183d5af25a50c9fd8837c9d22f
-  data.tar.gz: e176fe7a536d22fda562e993d30f656aa142fa7d
+  metadata.gz: dc660f95c7b3db9463a85875e038d11df8529c2b
+  data.tar.gz: daf4c92f76fd32d889657202e9cff7fe06921e23
 SHA512:
-  metadata.gz: 488423d2988b714671702d0c27386aacdca6b63c890172f390d9300f28cd5334e99aa8279685b2a0dd2dc74d72c45096a23ed3fce136c645dbf1f3f698e02726
-  data.tar.gz: 7728d38cb7d74beaad45675d7df8d983f3d99763a1708164fa80244eb00f33d715cbb3cac096c1f864339260a4346b7bf9490820139ffe9c088f96f66d2563f7
+  metadata.gz: 4b64abbf2f0a958b7afacac581e3d10d0fe59b133700692024f33323f4de73010ea6608bab7fc5208ea6812cc7c1280ec97bd80f78cefb452c748a8a2d74a4bf
+  data.tar.gz: f6cf53f021602ef8906f20c82fd1dae26b8bfe0830c8e98821aae9675800f2ac2aedc039f8db046eba204b0217b951842a9fe023e64fec64991593eb993c134f

data/lib/cfn-flow/cli.rb

@@ -6,7 +6,7 @@ class CfnFlow::CLI < Thor
     method_option :from,       type: :string, desc: 'Local source directory for templates'
     method_option 'dev-name',  type: :string, desc: 'Personal development prefix'
     method_option :region,     type: :string, desc: 'AWS Region'
-    method_option :verbose, type: :boolean, desc: 'Verbose output', default: false
+    method_option :verbose,    type: :boolean, desc: 'Verbose output', default: false
   end
 
   no_commands do
@@ -31,7 +31,16 @@ class CfnFlow::CLI < Thor
       # Ensure region env var is set for AWS client
       ENV['AWS_REGION'] = options['region']
 
-      # TODO: validate required options are present
+      # validate required options are present
+      %w(region bucket to from).each do |arg|
+        unless options[arg]
+          raise Thor::RequiredArgumentMissingError.new("Missing required argument '#{arg}'")
+        end
+      end
+
+      unless options['dev-name'] || options['release']
+        raise Thor::RequiredArgumentMissingError.new("Missing either 'dev-name' or 'release' argument")
+      end
     end
 
     shared_options
@@ -61,12 +70,11 @@ class CfnFlow::CLI < Thor
     load_templates
     @templates.each do |t|
       begin
-        verbose "Validating #{t.from}... "
+        say "Validating #{t.from}... "
         t.validate!
-        verbose "valid."
+        say "valid."
       rescue Aws::CloudFormation::Errors::ValidationError
-        say "Error validating #{t.from}. Message:"
-        say $!.message
+        raise Thor::Error.new("Error validating #{t.from}. Message: #{$!.message}")
       end
     end
   end
@@ -75,11 +83,11 @@ class CfnFlow::CLI < Thor
   shared_options
   method_option :release, type: :string, lazy_default: CfnFlow::Git.sha, desc: 'Upload release'
   def upload
-    check_git_status if options['release']
+    CfnFlow::Git.check_status if options['release']
 
     validate
     @templates.each do |t|
-      verbose "Uploading #{t.from} to #{t.url}"
+      say "Uploading #{t.from} to #{t.url}"
       t.upload!
     end
 
@@ -94,7 +102,7 @@ class CfnFlow::CLI < Thor
   def prefix
     # Add the release or dev name to the prefix
     parts = []
-    parts << options['prefix'] unless options['prefix'].empty?
+    parts << options['prefix'] if options['prefix']
     if options['release']
       parts += [ 'release',  options['release'] ]
     else

data/lib/cfn-flow/template.rb

@@ -1,7 +1,10 @@
 class CfnFlow::Template
   attr_reader :from, :prefix, :bucket
-  def initialize(from:, prefix:, bucket:)
-    @from, @prefix, @bucket = from, prefix, bucket
+  def initialize(opts={})
+    unless [:from, :prefix, :bucket].all? {|arg| opts.key?(arg) }
+      raise ArgumentError.new("Must pass :from, :prefix, and :bucket")
+    end
+    @from, @prefix, @bucket = opts[:from], opts[:prefix], opts[:bucket]
   end
 
   def yaml?
@@ -51,11 +54,11 @@ class CfnFlow::Template
 
   private
   def cfn
-    @cfn ||= Aws::CloudFormation::Client.new
+    Thread.current[:aws_cfn_client] ||= Aws::CloudFormation::Client.new
   end
 
   def s3_object
-    @s3_object ||= Aws::S3::Object.new(bucket, key)
+    Thread.current[:aws_s3_object] ||= Aws::S3::Object.new(bucket, key)
   end
 
 end

data/spec/cfn-flow_cli_spec.rb

@@ -0,0 +1,30 @@
+require_relative 'helper'
+
+describe 'CfnFlow::CLI' do
+  let(:cli) { CfnFlow::CLI }
+
+  before do
+    ENV.update({
+      'CFN_FLOW_BUCKET' => 'test-bucket',
+      'CFN_FLOW_FROM' => 'spec/data',
+      'CFN_FLOW_TO'   => 'test'
+    })
+  end
+
+  describe '#validate' do
+    it('succeeds') {
+      capture { cli.start %w[validate] }
+    }
+
+    it('can fail') {
+      (Thread.current[:aws_cfn_client] = Aws::CloudFormation::Client.new).
+      stub_responses(:validate_template, 'ValidationError')
+
+      out = capture(:stderr) { cli.start %w(validate) }
+
+      Thread.current[:aws_cfn_client] = nil
+      out.include?("Error validating").must_equal true
+    }
+  end
+
+end

data/spec/cfn-flow_template_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative 'helper'
 
 describe 'CfnFlow::Template' do
 

data/spec/helper.rb

@@ -0,0 +1,38 @@
+require "rubygems"
+require "bundler/setup"
+require "minitest/autorun"
+require "minitest/pride"
+
+begin
+  require 'pry'
+rescue LoadError
+  # NBD.
+end
+
+require "cfn-flow"
+
+Aws.config[:stub_responses] = true
+ENV['AWS_REGION'] = 'us-east-1'
+ENV['AWS_ACCESS_KEY_ID'] = 'test-key'
+ENV['AWS_SECRET_ACCESS_KEY'] = 'test-secret'
+ENV['CFN_FLOW_DEV_NAME'] = 'cfn-flow-specs'
+
+class Minitest::Spec
+  # From http://git.io/bcfh
+  def capture(stream = :stdout)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+
+  # Reset env between tests
+  before { @orig_env = ENV.to_hash }
+  after  { ENV.clear; ENV.update(@orig_env) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-flow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.20.pre
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.20.pre
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -109,11 +109,12 @@ files:
 - lib/cfn-flow/cli.rb
 - lib/cfn-flow/git.rb
 - lib/cfn-flow/template.rb
+- spec/cfn-flow_cli_spec.rb
 - spec/cfn-flow_template_spec.rb
 - spec/data/cfn-flow.yml
 - spec/data/sqs.template
 - spec/data/sqs.yml
-- spec/spec_helper.rb
+- spec/helper.rb
 homepage: http://github.com/kickstarter/cfn-flow
 licenses:
 - MIT
@@ -140,8 +141,9 @@ signing_key:
 specification_version: 4
 summary: A CLI for CloudFormation templates
 test_files:
+- spec/cfn-flow_cli_spec.rb
 - spec/cfn-flow_template_spec.rb
 - spec/data/cfn-flow.yml
 - spec/data/sqs.template
 - spec/data/sqs.yml
-- spec/spec_helper.rb
+- spec/helper.rb

data/spec/spec_helper.rb

@@ -1,17 +0,0 @@
-require "rubygems"
-require "bundler/setup"
-require "minitest/autorun"
-require "minitest/pride"
-
-begin
-  require 'pry'
-rescue LoadError
-  # NBD.
-end
-
-require "cfn-flow"
-
-Aws.config[:stub_responses] = true
-ENV['AWS_REGION'] = 'us-east-1'
-ENV['AWS_ACCESS_KEY_ID'] = 'test-key'
-ENV['AWS_SECRET_ACCESS_KEY'] = 'test-secret'