formatron 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c3e003d264eb6297b6b16c9f36efb5460f8150
-  data.tar.gz: 461f5a1a714234cddff9b75a699ea7d49eb0dae6
+  metadata.gz: 53582a32e61c5a984b2ce3a963398f7b6ac4ffd8
+  data.tar.gz: 42a7c9b8047d9b58ad96ed6754e3c4441140b9ce
 SHA512:
-  metadata.gz: 3d7645c1fb2cc2472010f5d18cac8a41b429cda33f7715e2e92a96383edf3b6b28bd810a3c3b5be32d36256b622358164dcd7375bbf604ce99688999c5d2f541
-  data.tar.gz: 7ac788337cbf9f577b38f91c9da1ff3772a35e4aac6c7ddc87a74e08d0e134803e69763026f99732e1f17763250e68928bb8b2f000f1522035857cc19c88d308
+  metadata.gz: bdec0b8c3ac59c8e2c717fd0da9f8a4d661c4a2fdeec56150d9f75c35d3d856daa211e4730af30ab83554803888f56454656386f17e2623930e584e8f86847ce
+  data.tar.gz: c077d7d087c9a13d2c01ca5fb77fe90a9efb4505e97424a5d6b167c77b4fc8f6577c0f71cf31210da16c8b6b7c4b5bfbf18dac8131232af484f23543942d4f38

data/lib/formatron/aws.rb

@@ -64,6 +64,13 @@ class Formatron
       )
     end
 
+    def file_exists?(bucket:, key:)
+      @s3_client.list_objects(
+        bucket: bucket,
+        prefix: key
+      ).contents.length > 0
+    end
+
     def delete_file(bucket:, key:)
       @s3_client.delete_object(
         bucket: bucket,

data/lib/formatron/cloud_formation.rb

@@ -31,13 +31,24 @@ class Formatron
       aws.delete_stack stack_name: stack_name
     end
 
-    def self.outputs(aws:, name:, target:)
-      stack_name = _stack_name name, target
-      Formatron::LOG.info do
-        "Query CloudFormation stack outputs: #{stack_name}"
+    # rubocop:disable Metrics/MethodLength
+    def self.outputs(aws:, bucket:, name:, target:)
+      if S3::CloudFormationTemplate.exists?(
+        aws: aws,
+        bucket: bucket,
+        name: name,
+        target: target
+      )
+        stack_name = _stack_name name, target
+        Formatron::LOG.info do
+          "Query CloudFormation stack outputs: #{stack_name}"
+        end
+        aws.stack_outputs stack_name: stack_name
+      else
+        {}
       end
-      aws.stack_outputs stack_name: stack_name
     end
+    # rubocop:enable Metrics/MethodLength
 
     def self.stack_ready!(aws:, name:, target:)
       aws.stack_ready! stack_name: _stack_name(name, target)

data/lib/formatron/external/outputs.rb

@@ -12,10 +12,11 @@ class Formatron
         @hash = {}
       end
 
-      def merge(dependency:, configuration:)
+      def merge(bucket:, dependency:, configuration:)
         @hash.merge! configuration
         @hash.merge! CloudFormation.outputs(
           aws: @aws,
+          bucket: bucket,
           name: dependency,
           target: @target
         )

data/lib/formatron/external.rb

@@ -41,6 +41,7 @@ class Formatron
       @config.deep_merge! configuration[CONFIG_KEY]
       @config.deep_merge! @local_config
       @outputs.merge(
+        bucket: bucket,
         dependency: dependency,
         configuration: configuration[OUTPUTS_KEY]
       )

data/lib/formatron/s3/cloud_formation_template.rb

@@ -30,6 +30,18 @@ class Formatron
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/ParameterLists
 
+      def self.exists?(aws:, bucket:, name:, target:)
+        key = Path.key(
+          name: name,
+          target: target,
+          sub_key: FILE_NAME
+        )
+        aws.file_exists?(
+          bucket: bucket,
+          key: key
+        )
+      end
+
       # rubocop:disable Metrics/MethodLength
       def self.destroy(aws:, bucket:, name:, target:)
         key = Path.key(

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/formatron.rb

@@ -136,8 +136,13 @@ class Formatron
   def deploy
     _deploy_configuration
     _deploy_chef_server_certs
-    _deploy_template
-    _deploy_stack
+    if @cloud_formation_template[:Resources].empty?
+      _destroy_template
+      _destroy_stack
+    else
+      _deploy_template
+      _deploy_stack
+    end
   end
 
   def provision

data/support/s3_list_objects_response.rb

@@ -0,0 +1,21 @@
+class Formatron
+  module Support
+    # Stub S3 list_objects response class
+    class S3ListObjectsResponse
+      attr_reader :contents
+
+      # Stub S3 get_object response.body class
+      class Contents
+        attr_reader :key
+
+        def initialize(key)
+          @key = key
+        end
+      end
+
+      def initialize(keys)
+        @contents = keys.map { |key| Contents.new(key) }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -391,6 +391,7 @@ files:
 - support/dsl_test.rb
 - support/route53_get_hosted_zone_response.rb
 - support/s3_get_object_response.rb
+- support/s3_list_objects_response.rb
 - support/template_test.rb
 homepage: https://github.com/pghalliday/formatron
 licenses: