cloudformer 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a3ea4d7e5a5d60b004184dea02fa6f7b59647a5
-  data.tar.gz: a8a98dabb72b72f68f4fdb2cd0596acd8472af97
+  metadata.gz: b9c98549041a2396decdcfb5088092fb9247d240
+  data.tar.gz: 2a77a8e0d924a973f71b2e94199868154bbf0af8
 SHA512:
-  metadata.gz: e612cfe8276f8a1a7e50a73bc900a7801de0a35f35341d57806bc566efcd497feca88ffbc3e0a43ad5bae5e5aab12c28f41080057d69629a6a4d98c375936b34
-  data.tar.gz: 7678c2787bcc2c423285c0261a9293f8bc4f368a4e78a57b96697cea5eefb4d8e27832a018e717e6f8e5f1b475ddf52b1627278ab2f7e2be3e605c6e6f2736fa
+  metadata.gz: dbafea82432445daebcdff073bd747265cee7505dd5b7db7fbbf72b6e6f64f22d6d997256dee25ad9a1bfe5c6952965d84233212f74c2095b780304da7d678b8
+  data.tar.gz: 398746d059addfd5bb3f5b8c3b3aa906176dd4d014b4b169d2ca5c320a48ba7cfdcc45e70a0c95c5a30720d83438fd7b339a653407f93903b6418e63fdd3321d

data/cloudformer.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "debugger"
   spec.add_development_dependency "rspec"
   spec.add_dependency "rake"
   spec.add_dependency "aws-sdk"

data/lib/cloudformer/stack.rb

@@ -19,27 +19,36 @@ class Stack
     return stack.exists?
   end
 
-  def apply(template_file, parameters, disable_rollback=false, capabilities=[])
-    template = File.read(template_file)
+  def apply(template_file, parameters, disable_rollback=false, capabilities=[], notify=[])
+    if ( template_file =~ /^https:\/\/s3\S+\.amazonaws\.com\/(.*)/ )
+      template = template_file
+    else
+      template = File.read(template_file)
+    end
     validation = validate(template)
     unless validation["valid"]
       puts "Unable to update - #{validation["response"][:code]} - #{validation["response"][:message]}"
-      return false
+      return false
     end
     pending_operations = false
-    if deployed
-      pending_operations = update(template, parameters, capabilities)
-    else
-      pending_operations = create(template, parameters, disable_rollback, capabilities)
+    begin
+      if deployed
+        pending_operations = update(template, parameters, capabilities)
+      else
+        pending_operations = create(template, parameters, disable_rollback, capabilities, notify)
+      end
+    rescue ::AWS::CloudFormation::Errors::ValidationError => e
+      puts e.message
+      return false
     end
     wait_until_end if pending_operations
-    return deploy_succeded?
-  end
-
-  def deploy_succeded?
-    return true unless FAILURE_STATES.include?(stack.status)
-    puts "Unable to deploy template. Check log for more information."
-    false
+    return deploy_succeded?
+  end
+
+  def deploy_succeded?
+    return true unless FAILURE_STATES.include?(stack.status)
+    puts "Unable to deploy template. Check log for more information."
+    false
   end
 
   def stop_instances
@@ -143,19 +152,13 @@ class Stack
       :capabilities => capabilities
     })
     return true
-  rescue ::AWS::CloudFormation::Errors::ValidationError => e
-    puts e.message
-    return false
   end
 
-  def create(template, parameters, disable_rollback, capabilities)
+  def create(template, parameters, disable_rollback, capabilities, notify)
     puts "Initializing stack creation..."
-    @cf.stacks.create(name, template, :parameters => parameters, :disable_rollback => disable_rollback, :capabilities => capabilities)
+    @cf.stacks.create(name, template, :parameters => parameters, :disable_rollback => disable_rollback, :capabilities => capabilities, :notify => notify)
     sleep 10
     return true
-  rescue ::AWS::CloudFormation::Errors::ValidationError => e
-    puts e.message
-    return false
   end
 
   def update_instances(action)
@@ -175,3 +178,4 @@ class Stack
     end
   end
 end
+

data/lib/cloudformer/tasks.rb

@@ -13,7 +13,7 @@ module Cloudformer
      end
    end
 
-   attr_accessor :template, :parameters, :disable_rollback, :retry_delete, :capabilities
+   attr_accessor :template, :parameters, :disable_rollback, :retry_delete, :capabilities, :notify
 
    private
    def define_tasks
@@ -35,15 +35,15 @@ module Cloudformer
         if retry_delete
           @stack.delete
         end
-       exit 1 unless @stack.apply(template, parameters, disable_rollback, capabilities)
+       exit 1 unless @stack.apply(template, parameters, disable_rollback, capabilities, notify)
      end
    end
-
+
    def define_delete_task
      desc "Delete stack from CloudFormation"
      task :delete do
       begin
-        exit 1 unless @stack.delete
+        exit 1 unless @stack.delete
       rescue
         puts "Stack deleted successfully."
       end
@@ -55,27 +55,27 @@ module Cloudformer
     task :force_delete do
       begin
         @stack.stop_instances
-        exit 1 unless @stack.delete
+        exit 1 unless @stack.delete
       rescue => e
         puts "Stack delete message - #{e.message}"
       end
     end
    end
-
+
    def define_status_task
      desc "Get the deployed app status."
      task :status do
-      @stack.status
+      @stack.status
      end
    end
-
+
    def define_events_task
      desc "Get the recent events from the stack."
      task :events do
        @stack.events
      end
    end
-
+
    def define_outputs_task
      desc "Get the outputs of stack."
      task :outputs do

data/lib/cloudformer/version.rb

@@ -1,3 +1,3 @@
 module Cloudformer
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/stack_spec.rb

@@ -39,4 +39,18 @@ describe Stack do
       @stack.deployed.should_not be
     end
   end
+
+  describe "when stack operation throws ValidationError" do
+    before :each do
+      @stack = Stack.new("stack")
+      @cf_stack.should_receive(:exists?).and_return(true)
+      File.should_receive(:read).and_return("template")
+      @cf.should_receive(:validate_template).and_return({"valid" => true})
+      @cf_stack.should_receive(:update).and_raise(AWS::CloudFormation::Errors::ValidationError)
+    end
+
+    it "apply should return false to signal the error" do
+      @stack.apply(nil, nil).should be_false
+    end
+  end
 end

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cloudformer
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Arvind Kunday
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Cloudformation tasks for apply(create/update), delete, recreate on stack
@@ -88,7 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,12 +97,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []