simple_deploy 0.7.6.beta.3 → 0.7.6.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05edf27f77f29c8d99c992b7736ba3393543e8a2
-  data.tar.gz: 51710aa5eac62c1943b959f4929962d53150c027
+  metadata.gz: ba2b65db7a2e3c10886e4079dae54dc98257537b
+  data.tar.gz: b1c674667745e75a61c59765a5d163983fec3adc
 SHA512:
-  metadata.gz: 38ecf0947147ad91ef5ba62d1ed7c8c077b14a10395e82f902e5817b07b5cf8eeb1bea171a90b71268a45059f98445b3216758faf12a93810796640c70b4a448
-  data.tar.gz: 21e5b0507a33b06b84d3a8ea21d50402c28d6f6c5ca8f062bd206b0c4a22b27e62c58433da27e579a1a0e5e0bbd29dd5d9e5009d2917787c5c184f6bc81cbd32
+  metadata.gz: 45b4a8a843efb68c83e5a56f4e9ca13e61dcbf0c86ae003505d8ebb56efb8e60a96cde3e5a7d7dd4ffdb6c20acac72f589b9c2938cd35ac1b42b1183fd04bf9b
+  data.tar.gz: 62daf2d2f6161076b20b6729d087496213d64c1c75935cad62fb5540a78212d3c56c7568569b2d3211ec0a17f43686376340ef2a18276d65ec7e60de6c1d8147

data/CHANGELOG.md

@@ -1,9 +1,11 @@
 ## HEAD:
 
+* Updated to latest fog 1.15
 * Added feature for issue 169 to remove values which are set to nil
 * Added feature for issue 191 to read in input stack for clone command
 * Fixed issue 176 where multiple deploys did not exit if first deploy failed
 * Fixed find_xml_file error when a blank exception is thrown from cloudformation.
+* Add 'envs' command as a shortcut for 'environments'
 
 ## v0.7.5 (07/02/13):
 

data/lib/simple_deploy/aws/cloud_formation/error.rb

@@ -1,5 +1,3 @@
-require 'xmlsimple'
-
 module SimpleDeploy
   class AWS
     class CloudFormation
@@ -11,28 +9,17 @@ module SimpleDeploy
         end
 
         def process
-          @logger.debug "Object type = #{@exception.class}"
-          if @exception.respond_to?(:response)
-            unless @exception.response.body.empty?
-              message = XmlSimple.xml_in @exception.response.body
-              message['Error'].first['Message'].each do |msg|
-                case msg
-                when 'No updates are to be performed.'
-                  @logger.info msg
-                when /Template requires parameter(.*)/
-                  @logger.error  msg
-                  raise Exceptions::CloudFormationError.new msg
-                when /^Stack:(.*) does not exist$/
-                  @logger.error msg
-                  raise Exceptions::UnknownStack.new msg
-                else
-                  @logger.error msg
-                  raise Exceptions::CloudFormationError.new msg
-                end
-              end
+          message = @exception.message
+          unless message.empty?
+            case message 
+            when 'No updates are to be performed.'
+              @logger.info message 
+            when /^Stack:(.*) does not exist$/
+              @logger.error message
+              raise Exceptions::UnknownStack.new message
             else
-              @logger.error "CloudFormation returned blank xml EXCEPTION => #{@exception.response.body}" 
-              raise Exceptions::CloudFormationError.new "Cloudformation returned blank xml"
+              @logger.error message
+              raise Exceptions::CloudFormationError.new message
             end
           else
             @logger.error "Unknown exception from cloudformation #{@exception.inspect}"

data/lib/simple_deploy/cli.rb

@@ -37,7 +37,7 @@ module SimpleDeploy
         CLI::Destroy.new.destroy
       when 'deploy'
         CLI::Deploy.new.deploy
-      when 'environments'
+      when 'environments', 'envs'
         CLI::Environments.new.environments
       when 'events'
         CLI::Events.new.show

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.7.6.beta.3"
+  VERSION = "0.7.6.beta.5"
 end

data/simple_deploy.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "capistrano", "= 2.13.5"
   s.add_runtime_dependency "esbit", "~> 0.0.4"
   s.add_runtime_dependency "trollop", "= 2.0"
-  s.add_runtime_dependency "fog", "= 1.10.0"
-  s.add_runtime_dependency "xml-simple", "= 1.1.2"
+  s.add_runtime_dependency "fog", "= 1.15.0"
 end

data/spec/aws/cloud_formation/error_spec.rb

@@ -7,20 +7,17 @@ describe SimpleDeploy::AWS::CloudFormation::Error do
   include_context 'double stubbed logger'
 
   before do
-    @exception_stub1 = stub 'Excon::Response'
-    @exception_stub1.stub(:response).and_return(@exception_stub1)
-    @exception_stub1.stub(:body).and_return('<opt><Error><Message>No updates are to be performed.</Message></Error></opt>')
-
-    @exception_stub2 = stub 'Excon::Response'
-    @exception_stub2.stub(:response).and_return(@exception_stub2)
-    @exception_stub2.stub(:body).and_return('<opt><Error><Message>Oops.</Message></Error></opt>')
-    @exception_stub3 = stub 'Excon::Response'
-    @exception_stub3.stub(:response).and_return(@exception_stub3)
-    @exception_stub3.stub(:body).and_return('<opt><Error><Message>Stack:test does not exist</Message></Error></opt>')
-
-    @exception_stub4 = stub 'Excon::Response'
-    @exception_stub4.stub(:response).and_return(@exception_stub4)
-    @exception_stub4.stub(:body).and_return('')
+    @exception_stub1 = stub 'Fog::AWS::CloudFormation'
+    @exception_stub1.stub(:message).and_return("No updates are to be performed.")
+
+    @exception_stub2 = stub 'Fog::AWS::CloudFormation'
+    @exception_stub2.stub(:message).and_return("Oops.")
+
+    @exception_stub3 = stub 'Fog::AWS::CloudFormation'
+    @exception_stub3.stub(:message).and_return("Stack:test does not exist")
+
+    @exception_stub4 = stub 'Fog::AWS::CloudFormation::'
+    @exception_stub4.stub(:message).and_return('')
   end
 
   describe 'process' do
@@ -34,7 +31,7 @@ describe SimpleDeploy::AWS::CloudFormation::Error do
       expect { error.process }.to raise_error SimpleDeploy::Exceptions::CloudFormationError
     end
 
-    it 'should re-raise unkonwn errors as SimpleDeploy::CloudFormationError' do
+    it 'should re-raise unknown errors as SimpleDeploy::CloudFormationError' do
       error = SimpleDeploy::AWS::CloudFormation::Error.new :exception => @exception_stub2
 
       lambda { error.process }.should raise_error SimpleDeploy::Exceptions::CloudFormationError

data/spec/cli_spec.rb

@@ -11,5 +11,27 @@ describe SimpleDeploy do
     SimpleDeploy::CLI.start
   end
 
+  describe 'environments' do
+    let(:env) { mock('env').tap { |m| m.should_receive(:environments) } }
+
+    before do
+      ARGV.stub :shift => 'environments'
+      SimpleDeploy::CLI::Environments.stub :new => env
+    end
+
+    it 'calls the correct command' do
+      SimpleDeploy::CLI.start
+    end
+
+    context 'envs' do
+      before { ARGV.stub :shift => 'envs'}
+
+      it 'calls the correct command' do
+        SimpleDeploy::CLI.start
+      end
+    end
+
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.6.beta.3
+  version: 0.7.6.beta.5
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -128,28 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
-- !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.15.0
 description: Opinionated gem for Managing AWS Cloud Formation stacks and deploying
   updates to Instances.
 email: