mappru 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2863ef4f96c705e0456fed60c95340f14ac98a
-  data.tar.gz: 782fbb40ac0429950b62978c469818dfbbd67216
+  metadata.gz: 4dc8eb3b82ed3ed02195af6fd449f315b525b164
+  data.tar.gz: 643e6d69321a42e687cd9fd3704966d849c10ec9
 SHA512:
-  metadata.gz: 6d5719b27e17b0b5f079daacf39af19b7659ab68e60a95ab30b7ab0a71d2a1321ee5214c300194af00677968874d7a2b5e2a5efd0aae9730538b3825480fb20a
-  data.tar.gz: e1118fa5356b82b3fb5f6ebd63a9982bf72865f9f93ec6037459f5806b9835409ca016f25888d2afbb881a0d1d4b3bdb77d6fc278ef44f9458020f17890ace99
+  metadata.gz: 88a107a38dc9bf505e63f42808855288c78244f9ae829a1ab3a232c2a8d14d4a101cc528e0b24279915daf1a38c2960060e174660598d327ee09cd78f5413681
+  data.tar.gz: 54464a727881e6682f86d151efc3e14ec1bdb285db3811c827753c4779f23550a95d2ba6a07dc7fac011ce48bd343a7293c81ba1c4e3aab193cb440f9ead2241

data/exe/mappru

@@ -91,13 +91,14 @@ def run_export(client, options)
     requires = []
 
     exported.each do |vpc_id, rts|
-      vpc_name = client.vpc_name_by_id(vpc_id) || vpc_id
-      vpc_dir = File.join(dir, vpc_name)
+      vpc_dir_basename = client.vpc_name_by_id(vpc_id) || vpc_id
+      vpc_dir_basename.gsub(/\s+/, '_')
+      vpc_dir = File.join(dir, vpc_dir_basename)
       FileUtils.mkdir_p(vpc_dir)
 
       rts.each do |rt_name, attrs|
-        filename = "#{rt_name}.rtbl"
-        requires << File.join(vpc_name, filename)
+        filename = "#{rt_name}.rtbl".gsub(/\s+/, '_')
+        requires << File.join(vpc_dir_basename, filename)
         rt_file = File.join(vpc_dir, filename)
 
         logger.info("  write `#{rt_file}`")

data/lib/mappru/driver.rb

@@ -70,7 +70,6 @@ class Mappru::Driver
     log(:info, "Update Route `#{vpc_id}` > `#{rt_name}` > `#{dest_cidr}`", color: :green)
     log(:info, diff(old_route, route, color: @options[:color]), color: false)
 
-
     unless @options[:dry_run]
       rt_id = rt_id_by_vpc_rt_name.fetch(vpc_id).fetch(rt_name)
       params = route.merge(route_table_id: rt_id, destination_cidr_block: dest_cidr)

data/lib/mappru/exporter.rb

@@ -55,7 +55,11 @@ class Mappru::Exporter
 
     # route -> (Array<Route>, nil)
     # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/RouteTable.html#routes-instance_method
-    rt.routes.reject(&:nil?).each {|route|
+    sorted_routes = rt.routes.reject(&:nil?).sort_by do |route|
+      IPAddr.new(route.destination_cidr_block).to_i
+    end
+
+    sorted_routes.each do |route|
       # Skip "local"
       next if route.gateway_id == 'local'
 
@@ -72,7 +76,7 @@ class Mappru::Exporter
       ].each {|k| hash[k] = route.send(k) }
 
       result[:routes] << hash
-    }
+    end
 
     result
   end

data/lib/mappru/version.rb

@@ -1,3 +1,3 @@
 module Mappru
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/mappru.rb

@@ -2,6 +2,7 @@ require 'aws-sdk'
 require 'diffy'
 require 'hash_modern_inspect'
 require 'hashie'
+require 'ipaddr'
 require 'logger'
 require 'pp'
 require 'singleton'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mappru
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - winebarrel