kumogata 0.5.2 → 0.5.3

data/spec/kumogata_validate_spec.rb

@@ -23,7 +23,7 @@ end
     run_client(:validate, :template => template) do |client, cf|
       json = eval_template(template, :add_encryption_password_for_validation => true).to_json
 
-      cf.should_receive(:validate_template).with(json) {
+      expect(cf).to receive(:validate_template).with(json) {
         {}
       }
     end
@@ -54,7 +54,7 @@ end
       run_client(:validate, :template => template) do |client, cf|
         json = eval_template(template, :add_encryption_password_for_validation => true).to_json
 
-        cf.should_receive(:validate_template).with(json) {
+        expect(cf).to receive(:validate_template).with(json) {
           {
             :code => 'CODE',
             :message => 'MESSAGE'
@@ -92,7 +92,7 @@ end
       add_encryption_password_for_validation(template)
       json = template.to_json
 
-      cf.should_receive(:validate_template) {
+      expect(cf).to receive(:validate_template) {
         {}
       }
     end
@@ -127,7 +127,7 @@ end
         add_encryption_password_for_validation(template)
         json = template.to_json
 
-        cf.should_receive(:validate_template).with(json) {
+        expect(cf).to receive(:validate_template).with(json) {
           {
             :code => 'CODE',
             :message => 'MESSAGE'
@@ -136,4 +136,55 @@ end
       end
     }.to raise_error('CODE: MESSAGE')
   end
+
+  it 'validate Ruby template (without verbose option)' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    result = {"parameters"=>
+               [{"no_echo"=>false,
+                 "parameter_key"=>"SSHLocation",
+                 "description"=>
+                  "The IP address range that can be used to SSH to the EC2 instances",
+                 "default_value"=>"0.0.0.0/0"},
+                {"no_echo"=>false,
+                 "parameter_key"=>"XXXXXXXXXXXXXXXX",
+                 "default_value"=>"(XXXXXXXXXXXXXXXX)"},
+                {"no_echo"=>false,
+                 "parameter_key"=>"InstanceType",
+                 "description"=>"WebServer EC2 instance type",
+                 "default_value"=>"m1.small"},
+                {"no_echo"=>false,
+                 "parameter_key"=>"KeyName",
+                 "description"=>
+                  "Name of an existing EC2 KeyPair to enable SSH access to the instance"}],
+              "capabilities"=>[],
+              "description"=>"'test CloudFormation Template\n",
+              "response_metadata"=>{"request_id"=>"XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"}}
+
+    expect(Kumogata.logger).to receive(:info).with('Template validated successfully')
+    expect(Kumogata.logger).to receive(:info).with(JSON.pretty_generate(result))
+
+    run_client(:validate, :template => template, :options => {:verbose => true}) do |client, cf|
+      json = eval_template(template, :add_encryption_password_for_validation => true).to_json
+      expect(cf).to receive(:validate_template).with(json) { result }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk