zaws 0.0.2 → 0.0.3

data/Gemfile.lock

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

data/feature/route_table/route_table.feature

@@ -30,7 +30,7 @@ Feature: Route Table
      """
       {	"return": "true" }
      """
-    When I run `bundle exec zaws route_table declare my_route_table --region us-west-1 --vpcid my_vpc_id`
+    When I run `bundle exec zaws route_table declare my_route_table my_vpc_id --region us-west-1`
 	Then the output should contain "Route table created with external id: my_route_table.\n" 
  
   Scenario: Declare route table by external id, but DO NOT create it because it exists
@@ -38,7 +38,7 @@ Feature: Route Table
      """
       {	"RouteTables": [ { "VpcId":"my_vpc_id","RouteTableId":"rtb-XXXXXXX" } ] }
      """
-    When I run `bundle exec zaws route_table declare my_route_table --region us-west-1 --vpcid my_vpc_id`
+    When I run `bundle exec zaws route_table declare my_route_table my_vpc_id --region us-west-1`
 	Then the output should contain "Route table exists already. Skipping Creation.\n" 
 
   Scenario: Delete a route table in a vpc, but skip it cause it does not exist
@@ -66,7 +66,7 @@ Feature: Route Table
      """
       {	"RouteTables": [ { "VpcId":"my_vpc_id","RouteTableId":"rtb-XXXXXXX" } ] }
      """
-    When I run `bundle exec zaws route_table declare my_route_table --region us-west-1 --vpcid my_vpc_id --nagios`
+    When I run `bundle exec zaws route_table declare my_route_table my_vpc_id --region us-west-1 --nagios`
 	Then the output should contain "OK: Route table exists.\n"
     And the exit status should be 0
 		
@@ -75,7 +75,7 @@ Feature: Route Table
      """
       {	"RouteTables": [ ] }
      """
-    When I run `bundle exec zaws route_table declare my_route_table --region us-west-1 --vpcid my_vpc_id --nagios`
+    When I run `bundle exec zaws route_table declare my_route_table my_vpc_id --region us-west-1 --nagios`
 	Then the output should contain "CRITICAL: Route table does not exist.\n"
     And the exit status should be 2
 
@@ -85,7 +85,7 @@ Feature: Route Table
       {	"RouteTables": [ { "VpcId":"my_vpc_id","RouteTableId":"rtb-XXXXXXX" } ] }
      """
     Given an empty file named "undo.sh.1" 
-    When I run `bundle exec zaws route_table declare my_route_table --region us-west-1 --vpcid my_vpc_id --undofile undo.sh.1`
+    When I run `bundle exec zaws route_table declare my_route_table my_vpc_id --region us-west-1 --undofile undo.sh.1`
 	Then the output should contain "Route table exists already. Skipping Creation.\n"
 	And the file "undo.sh.1" should contain "zaws route_table delete my_route_table --region us-west-1 --vpcid my_vpc_id $XTRA_OPTS"
 

data/feature/subnet/subnet.feature

@@ -6,7 +6,7 @@ Feature: Subnet
      """
       {	"Subnets": [] }
      """
-    When I run `bundle exec zaws subnet exists --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id`
+    When I run `bundle exec zaws subnet exists my_cidr_block my_vpc_id --region us-west-1`
     Then the output should contain "false\n" 
 
   Scenario: Determine a subnet has been created in vpc
@@ -14,7 +14,7 @@ Feature: Subnet
      """
 		{ "Subnets": [ { "SubnetId" : "X" } ] }
      """
-    When I run `bundle exec zaws subnet exists --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id`
+    When I run `bundle exec zaws subnet exists my_cidr_block my_vpc_id --region us-west-1`
     Then the output should contain "true\n" 
 
   Scenario: Declare a subnet but do not create it if it exists
@@ -22,8 +22,9 @@ Feature: Subnet
      """
 		{ "Subnets": [ { "SubnetId" : "X" } ] }
      """
-    When I run `bundle exec zaws subnet declare --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id --availabilityzone us-west-1a`
+    When I run `bundle exec zaws subnet declare my_cidr_block us-west-1a my_vpc_id --region us-west-1`
     Then the output should contain "No action needed. Subnet exists already.\n" 
+    And the exit status should be 0
 
   Scenario: Declare a subnet and create it 
     Given I double `aws --output json --region us-west-1 ec2 describe-subnets --filter 'Name=vpc-id,Values=my_vpc_id' 'Name=cidr,Values=my_cidr_block'` with stdout: 
@@ -34,15 +35,16 @@ Feature: Subnet
      """
        { "Subnet": { "State": "available" } }        
      """
-    When I run `bundle exec zaws subnet declare --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id --availabilityzone us-west-1a`
-    Then the output should contain "Subnet created.\n" 
+    When I run `bundle exec zaws subnet declare my_cidr_block us-west-1a my_vpc_id --region us-west-1`
+    Then the output should contain "Subnet created.\n"
+    And the exit status should be 0
 
    Scenario: Delete a subnet, but skip it cause it does not exist
     Given I double `aws --output json --region us-west-1 ec2 describe-subnets --filter 'Name=vpc-id,Values=my_vpc_id' 'Name=cidr,Values=my_cidr_block'` with stdout: 
      """
 		{ "Subnets": [] }
      """
-    When I run `bundle exec zaws subnet delete  --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id`
+    When I run `bundle exec zaws subnet delete my_cidr_block my_vpc_id --region us-west-1`
     Then the output should contain "Subnet does not exist. Skipping deletion.\n" 
 
    Scenario: Delete a subnet
@@ -54,7 +56,7 @@ Feature: Subnet
      """
        { "return": "true" }         
      """
-    When I run `bundle exec zaws subnet delete --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id`
+    When I run `bundle exec zaws subnet delete my_cidr_block my_vpc_id --region us-west-1`
     Then the output should contain "Subnet deleted.\n" 
 
    Scenario: Perform a nagios check, with the result indicatin OK (exit 0), indicating declaring a subnet requires no action because it exists.
@@ -62,7 +64,7 @@ Feature: Subnet
      """
 		{ "Subnets": [ { "SubnetId" : "X" } ] }
      """
-    When I run `bundle exec zaws subnet declare --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id --availabilityzone us-west-1a --nagios`
+    When I run `bundle exec zaws subnet declare my_cidr_block us-west-1a my_vpc_id --region us-west-1 --nagios`
 	Then the output should contain "OK: Subnet Exists.\n"
     And the exit status should be 0
 		
@@ -71,7 +73,7 @@ Feature: Subnet
      """
 		{ "Subnets": [] }
      """
-    When I run `bundle exec zaws subnet declare --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id --availabilityzone us-west-1a --nagios`
+    When I run `bundle exec zaws subnet declare my_cidr_block us-west-1a my_vpc_id --region us-west-1 --nagios`
 	Then the output should contain "CRITICAL: Subnet Does Not Exist.\n"
     And the exit status should be 2
 
@@ -85,8 +87,8 @@ Feature: Subnet
        { "Subnet": { "State": "available" } }        
      """
 	Given an empty file named "undo.sh.1" 
-    When I run `bundle exec zaws subnet declare --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id --availabilityzone us-west-1a --undofile undo.sh.1`
+    When I run `bundle exec zaws subnet declare my_cidr_block us-west-1a my_vpc_id --region us-west-1 --undofile undo.sh.1`
     Then the output should contain "Subnet created.\n" 
-	And the file "undo.sh.1" should contain "zaws subnet delete --region us-west-1 --cidrblock my_cidr_block --vpcid my_vpc_id $XTRA_OPTS"
+	And the file "undo.sh.1" should contain "zaws subnet delete my_cidr_block my_vpc_id --region us-west-1 $XTRA_OPTS"
 
 

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.1"
+    Then the output should contain "zaws version 0.0.3"

data/lib/zaws/command/route_table.rb

@@ -21,13 +21,12 @@ module ZAWS
 		aws.ec2.route_table.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],externalid)
 	  end
 
-	  desc "declare EXTERNAL_ID","Declare a new route table by EXTERNAL_ID, but skip creating it if it exists."
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :default => nil
+	  desc "declare EXTERNAL_ID VPCID","Declare a new route table by EXTERNAL_ID in VPCID, but skip creating it if it exists."
       option :nagios, :type => :boolean, :desc => "Returns a nagios check result",  :aliases => :n, :default => false
 	  option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
-	  def declare(externalid) 
+	  def declare(externalid,vpcid) 
 		aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode = aws.ec2.route_table.declare(options[:region],options[:vpcid],externalid,options[:nagios],$stdout,(options[:verbose]?$stdout:nil),options[:undofile])
+		exitcode = aws.ec2.route_table.declare(options[:region],vpcid,externalid,options[:nagios],$stdout,(options[:verbose]?$stdout:nil),options[:undofile])
         exit exitcode
 	  end
 

data/lib/zaws/command/subnet.rb

@@ -14,52 +14,40 @@ module ZAWS
 		aws.ec2.subnet.view(options[:region],options[:viewtype],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid])
 	  end
 
-	  desc "id_subnet_by_ip","get subnet id by specifying ip address in subnet"
-	  option :privateip, :type => :string, :desc => "ip addresses", :banner => "<privateip>", :aliases => :p, :required => true
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :required => true
-	  def id_by_ip
+	  desc "id_by_ip PRIVATE_IP VPCID","get subnet id by specifying PRIVATE_IP address in subnet"
+	  def id_by_ip(privateip,vpcid)
         aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-	    aws.ec2.subnet.id_by_ip(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],options[:privateip])
+	    aws.ec2.subnet.id_by_ip(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,privateip)
 	  end
 
-	  desc "id_subnet_by_cidrblock","get subnet id by specifying cidrblock for subnet"
-	  option :cidrblock, :type => :string, :desc => "cidrblock", :banner => "<cidrblock>", :aliases => :c, :required => true
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :required => true
-	  def id_by_cidrblock
+	  desc "id_by_cidrblock CIDRBLOCK VPCID","get subnet id by specifying CIDRBLOCK for subnet"
+	  def id_by_cidrblock(cidrblock,vpcid)
         aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.id_by_cidrblock(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],options[:cidrblock])
+		aws.ec2.subnet.id_by_cidrblock(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
 	  end
 
-	  desc "exists","determine if a subnet exists."
-	  option :cidrblock, :type => :string, :desc => "cidrblock", :banner => "<cidrblock>", :aliases => :c, :required => true
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :required => true
-	  def exists 
+	  desc "exists CIDRBLOCK VPCID","Determine if a subnet exists by CIDRBLOCK."
+	  def exists(cidrblock,vpcid) 
         aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],options[:cidrblock])
+		aws.ec2.subnet.exists(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
 	  end
 
-	  desc "declare","create a subnet if it does not exist already"
-	  option :cidrblock, :type => :string, :desc => "cidrblock", :banner => "<cidrblock>", :aliases => :c, :required => true
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :required => true
-      option :availabilityzone, :type => :string, :desc => "AWS availability zone (eg us-west-1,us-west-2,...)", :banner => "<azone>",  :aliases => :a, :required => true
+	  desc "declare CIDRBLOCK AVAILABILITY_ZONE VPCID","Create a subnet if it does not exist already"
       option :availabilitytimeout, :type => :numeric, :desc => "AWS availability zone (eg us-west-1,us-west-2,...)", :banner => "<azone>",  :aliases => :t, :default => 30
       option :nagios, :type => :boolean, :desc => "Returns a nagios check result",  :aliases => :n, :default => false
       option :undofile, :type => :string, :desc => "File for undo commands", :banner => "<undofile>", :aliases => :f, :default => nil
-	  def declare 
+	  def declare(cidrblock,availabilityzone,vpcid)
         aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		exitcode=aws.ec2.subnet.declare(options[:region],options[:vpcid],options[:cidrblock],options[:availabilityzone],options[:availabilitytimeout],$stdout,(options[:verbose]?$stdout:nil),options[:nagios],options[:undofile])
+		exitcode=aws.ec2.subnet.declare(options[:region],vpcid,cidrblock,availabilityzone,options[:availabilitytimeout],$stdout,(options[:verbose]?$stdout:nil),options[:nagios],options[:undofile])
 		exit exitcode
 	  end
 
-	  desc "delete","delete a subnet if it exists already"
-	  option :cidrblock, :type => :string, :desc => "cidrblock", :banner => "<cidrblock>", :aliases => :c, :required => true
-	  option :vpcid, :type => :string, :desc => "AWS VPC id", :banner => "<vpcid>",  :aliases => :v, :required => true
-	  def delete 
+	  desc "delete CIDRBLOCK VPCID","Delete a subnet if it exists."
+	  def delete(cidrblock,vpcid)
         aws=(ZAWS::AWS.new(ZAWS::Helper::Shell.new))
-		aws.ec2.subnet.delete(options[:region],$stdout,(options[:verbose]?$stdout:nil),options[:vpcid],options[:cidrblock])
+		aws.ec2.subnet.delete(options[:region],$stdout,(options[:verbose]?$stdout:nil),vpcid,cidrblock)
 	  end
-
-
+	
 	end
   end
 end

data/lib/zaws/ec2/subnet.rb

@@ -50,7 +50,7 @@ module ZAWS
 
 	  def declare(region,vpcid,cidrblock,availabilityzone,statetimeout,textout=nil,verbose=nil,nagios=false,ufile=nil)
         if ufile
-          ZAWS::Helper::File.prepend("zaws subnet delete --region #{region} --cidrblock #{cidrblock} --vpcid #{vpcid} $XTRA_OPTS",'#Delete subnet',ufile)
+          ZAWS::Helper::File.prepend("zaws subnet delete #{cidrblock} #{vpcid} --region #{region} $XTRA_OPTS",'#Delete subnet',ufile)
 		end
 		if not exists(region,nil,verbose,vpcid,cidrblock) 
           if nagios
@@ -77,6 +77,7 @@ module ZAWS
 		  end
 		  textout.puts "No action needed. Subnet exists already."
 		end
+		return 0
 	  end
 
 	  def available(subnet,verbose)

data/lib/zaws/version.rb

@@ -1,3 +1,3 @@
 module ZAWS
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaws
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -302,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2786108246688246020
+      hash: 2757590543026909209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2786108246688246020
+      hash: 2757590543026909209
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24