zaws 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zaws (0.0.4)
+    zaws (0.0.5)
       json (~> 1.5.0)
       mixlib-shellout (~> 1.1.0)
       netaddr (~> 1.5.0)

data/README.md

@@ -1,4 +1,7 @@
 [![Build Status](https://travis-ci.org/zynxhealth/zaws.svg?branch=master)](https://travis-ci.org/zynxhealth/zaws)     [![Coverage Status](https://coveralls.io/repos/zynxhealth/zaws/badge.png?branch=master)](https://coveralls.io/r/zynxhealth/zaws?branch=master) [![Gem Version](https://badge.fury.io/rb/zaws.svg)](http://badge.fury.io/rb/zaws)
+
+* For some reason the Coverage is flip floppping between 99% and mid 80%s, this looks like an issue with picking up some results. The 99% value is more accurate.
+
 # zaws
 
 Zynx AWS Automation Tool

data/feature/elasticip/elasticip.feature

@@ -37,11 +37,11 @@ Feature: Elasticip
      """
 	 {  "PublicIp": "198.51.100.0", "Domain": "vpc", "AllocationId": "eipalloc-abcd1234",  "AllocationId":"eipalloc-abcd1234" }
 	 """
-	 And I double `aws --region us-west-1 ec2 associate-address --instance-id i-abc1234 --public-ip 198.51.100.0 --allocation-id eipalloc-abcd1234` with stdout:
+	 And I double `aws --region us-west-1 ec2 associate-address --instance-id i-abc1234 --allocation-id eipalloc-abcd1234` with stdout:
      """
 	 {  "return": "true" }
 	 """
-    When I run `bundle exec zaws elasticip declare my_instance --region us-west-1 --vpcid my_vpc_id`
+    When I run `bundle exec zaws elasticip declare my_instance --region us-west-1 --vpcid my_vpc_id --verbose`
 	Then the output should contain "New elastic ip associated to instance.\n" 
 
   Scenario: Declare elasticip for an instance by external id, Skip creation
@@ -65,15 +65,15 @@ Feature: Elasticip
      """
 	 {  "Addresses": [ { "InstanceId" : "i-abc1234", "PublicIp": "198.51.100.0", "Domain": "vpc", "AssociationId":"eipassoc-abcd1234", "AllocationId":"eipalloc-abcd1234"} ] }
 	 """
-    And I double `aws --region us-west-1 ec2 disassociate-address --public-ip 198.51.100.0 --association-id eipassoc-abcd1234` with stdout:
+    And I double `aws --region us-west-1 ec2 disassociate-address --association-id eipassoc-abcd1234` with stdout:
      """
 	 {  "return": "true" }
 	 """
-    And I double `aws --region us-west-1 ec2 release-address --public-ip 198.51.100.0 --allocation-id eipalloc-abcd1234` with stdout:
+    And I double `aws --region us-west-1 ec2 release-address --allocation-id eipalloc-abcd1234` with stdout:
      """
 	 {  "return": "true" }
 	 """
-    When I run `bundle exec zaws elasticip release my_instance --region us-west-1 --vpcid my_vpc_id`
+    When I run `bundle exec zaws elasticip release my_instance --region us-west-1 --vpcid my_vpc_id --verbose`
 	Then the output should contain "Deleted elasticip.\n" 
 
   Scenario: Delete, skip
@@ -125,12 +125,12 @@ Feature: Elasticip
      """
 	 {  "PublicIp": "198.51.100.0", "Domain": "vpc", "AllocationId": "eipalloc-abcd1234", "AllocationId":"eipalloc-abcd1234" }
 	 """
-	And I double `aws --region us-west-1 ec2 associate-address --instance-id i-abc1234 --public-ip 198.51.100.0 --allocation-id eipalloc-abcd1234` with stdout:
+	And I double `aws --region us-west-1 ec2 associate-address --instance-id i-abc1234 --allocation-id eipalloc-abcd1234` with stdout:
      """
 	 {  "return": "true" }
 	 """
     Given an empty file named "undo.sh.1" 
-	When I run `bundle exec zaws elasticip declare my_instance --region us-west-1 --vpcid my_vpc_id --undofile undo.sh.1`
+	When I run `bundle exec zaws elasticip declare my_instance --region us-west-1 --vpcid my_vpc_id --undofile undo.sh.1 --verbose`
 	Then the output should contain "New elastic ip associated to instance.\n" 
 	And the file "undo.sh.1" should contain "zaws elasticip release my_instance --region us-west-1 --vpcid my_vpc_id $XTRA_OPTS"
 

data/feature/security_group/security_group.feature

@@ -46,7 +46,7 @@ Feature: Security Group
      """
 	 {	"SecurityGroups": [ { "GroupName": "my_security_group_name","GroupId": "sg-abcd1234" } ] }
      """
-    And I double `aws --region us-west-1 ec2 delete-security-group --group-ids sg-abcd1234` with stdout:
+    And I double `aws --region us-west-1 ec2 delete-security-group --group-id sg-abcd1234` with stdout:
      """
        { "return": "true" }         
      """

data/feature/version.feature

@@ -3,4 +3,4 @@ Feature: Version
     
   Scenario: Get zaws version  
     When I run `bundle exec zaws version`
-    Then the output should contain "zaws version 0.0.4"
+    Then the output should contain "zaws version 0.0.5"

data/lib/zaws/ec2/elasticip.rb

@@ -27,14 +27,10 @@ module ZAWS
 		val,instance_id,sgroups=@aws.ec2.compute.exists(region,nil,verbose,vpcid,externalid)
 		if val
 		  addresses=JSON.parse(view(region,'json',nil,verbose,vpcid,instance_id))
-		  verbose.puts addresses if verbose
 		  addressassoc=(addresses["Addresses"] and (addresses["Addresses"].count == 1))
 		  associationid= (addressassoc and addresses["Addresses"][0]["AssociationId"]) ? addresses["Addresses"][0]["AssociationId"]:nil
 		  allocationid= (addressassoc and addresses["Addresses"][0]["AllocationId"]) ? addresses["Addresses"][0]["AllocationId"]:nil
 		  ip= (addressassoc and addresses["Addresses"][0]["PublicIp"]) ? addresses["Addresses"][0]["PublicIp"]:nil
-		  verbose.puts "addressassoc=#{addressassoc}" if verbose
-		  verbose.puts "associationid=#{associationid}" if verbose
-		  verbose.puts "allocationid=#{allocationid}" if verbose
 		  textout.puts addressassoc if textout
 		  return addressassoc,instance_id,associationid,allocationid,ip
 		else
@@ -53,7 +49,7 @@ module ZAWS
 		  comline="aws --region #{region} ec2 allocate-address --domain vpc"
 		  allocation=JSON.parse(@shellout.cli(comline,verbose))
 		  if allocation["AllocationId"]
-			comline="aws --region #{region} ec2 associate-address --instance-id #{instance_id} --public-ip #{allocation["PublicIp"]} --allocation-id #{allocation["AllocationId"]}"
+			comline="aws --region #{region} ec2 associate-address --instance-id #{instance_id} --allocation-id #{allocation["AllocationId"]}"
 			association=JSON.parse(@shellout.cli(comline,verbose))
 			textout.puts "New elastic ip associated to instance." if association["return"] == "true"
 		  end
@@ -65,12 +61,10 @@ module ZAWS
 	  def release(region,externalid,textout=nil,verbose=nil,vpcid=nil)
 		elasticip_exists,instance_id,association_id,allocation_id,ip=assoc_exists(region,externalid,nil,verbose,vpcid)
 		if elasticip_exists and association_id and allocation_id
-		  verbose = $stdout
-		  comline="aws --region #{region} ec2 disassociate-address --public-ip #{ip} --association-id #{association_id}"
-		  verbose.puts comline if verbose
+		  comline="aws --region #{region} ec2 disassociate-address --association-id #{association_id}"
 		  disassociation=JSON.parse(@shellout.cli(comline,verbose))
 		  if disassociation["return"]=="true"
-			comline="aws --region #{region} ec2 release-address --public-ip #{ip} --allocation-id #{allocation_id}"
+			comline="aws --region #{region} ec2 release-address --allocation-id #{allocation_id}"
 			release=JSON.parse(@shellout.cli(comline,verbose))
 			textout.puts "Deleted elasticip." if release["return"] == "true"
 		  end

data/lib/zaws/ec2/security_group.rb

@@ -64,7 +64,7 @@ module ZAWS
 	  def delete(region,textout=nil,verbose=nil,vpcid,groupname)
 		groupid=id_by_name(region,nil,nil,vpcid,groupname)
 		if groupid 
-		  comline="aws --region #{region} ec2 delete-security-group --group-ids #{groupid}"
+		  comline="aws --region #{region} ec2 delete-security-group --group-id #{groupid}"
 		  sgroup=JSON.parse(@shellout.cli(comline,verbose))
 		  textout.puts "Security Group deleted." if sgroup["return"] == "true"
 		else

data/lib/zaws/helper/shell.rb

@@ -6,7 +6,7 @@ module ZAWS
 
 	  def cli(command,output=nil)
 		output.puts ZAWS::Helper::Output.colorize(command,AWS_consts::COLOR_BLUE) if output
-        list = Mixlib::ShellOut.new(command)
+        list = Mixlib::ShellOut.new(command, :timeout => 30)
 		list.run_command
 		list.error!
 		return list.stdout

data/lib/zaws/version.rb

@@ -1,3 +1,3 @@
 module ZAWS
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaws
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2074333485879354907
+      hash: 860318831124502265
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2074333485879354907
+      hash: 860318831124502265
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24