mappru 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5864c5b6cc52cc629a4ae35a83f18f399ef296
-  data.tar.gz: 03d30ac958f959f74900786ac356cb2f1a3e97ab
+  metadata.gz: 91fb9f0fc2af0eb772f30a17cf48a9e369e0fbb9
+  data.tar.gz: 5c73c0ff7481a80f1306faaee92b1172da7e340a
 SHA512:
-  metadata.gz: 5ded9bd4f3118d025cb55b9dadf41b92c7fb045ca9004ef454a39444333e6f429e2dadc97460fb5be898e544291aa87a2767c0e46386012f26734f65f4286682
-  data.tar.gz: 38a59ce1b8050cfbeda278ce4092eaddefabb414fed9935a2a9cc04648947aecfdf7dad3ca462977a47a6c6e73ec7fce5304a58d5bed0248afd0cef99a0656f4
+  metadata.gz: a768ea8894402927fce8b21478ac9aad18b91da9a4477c3544204047e4e4b51a8571c12ddff7402e64bb42f363c3fe475d5fc92869271b6ba82ddc3258d15da7
+  data.tar.gz: 27749ece277cccf758eaec61efeab991527fc04f6bd9eb0a969ec8921c21dbc50e9b655119e743385ca36dd01aae4bbbe57aec25b0ab392c5e651ce673836b7f

data/.gitignore

@@ -9,4 +9,4 @@
 /tmp/
 test.rb
 RouteTable
-*.table
+*.rtbl

data/exe/mappru

@@ -77,81 +77,91 @@ rescue => e
   exit 1
 end
 
-def main(argv)
-  options = parse_options(argv)
-  client = Mappru::Client.new(options)
+def run_export(client, options)
   logger = Mappru::Logger.instance
+  exported = client.export
+  output = options[:output]
 
-  case options[:mode]
-  when :export
-    exported = client.export
-    output = options[:output]
-
-    if options[:split]
-      logger.info('Export Route Table')
+  if options[:split]
+    logger.info('Export Route Table')
 
-      output = DEFAULT_FILENAME if output == '-'
-      dir = File.dirname(output)
-      FileUtils.mkdir_p(dir)
-      requires = []
+    output = DEFAULT_FILENAME if output == '-'
+    dir = File.dirname(output)
+    FileUtils.mkdir_p(dir)
+    requires = []
 
-      exported.each do |vpc_id, rts|
-        vpc_dir = File.join(dir, vpc_id)
-        FileUtils.mkdir_p(vpc_id)
+    exported.each do |vpc_id, rts|
+      vpc_dir = File.join(dir, vpc_id)
+      FileUtils.mkdir_p(vpc_id)
 
-        rts.each do |rt_name, attrs|
-          filename = "#{rt_name}.table"
-          requires << File.join(vpc_id, filename)
-          rt_file = File.join(vpc_dir, filename)
+      rts.each do |rt_name, attrs|
+        filename = "#{rt_name}.rtbl"
+        requires << File.join(vpc_id, filename)
+        rt_file = File.join(vpc_dir, filename)
 
-          logger.info("  write `#{rt_file}`")
+        logger.info("  write `#{rt_file}`")
 
-          dsl = Mappru::DSL.convert({vpc_id => {rt_name => attrs}}, options)
+        dsl = Mappru::DSL.convert({vpc_id => {rt_name => attrs}}, options)
 
-          open(rt_file, 'wb') do |f|
-            f.puts MAGIC_COMMENT
-            f.puts dsl
-          end
+        open(rt_file, 'wb') do |f|
+          f.puts MAGIC_COMMENT
+          f.puts dsl
         end
       end
+    end
 
-      logger.info("  write `#{output}`")
+    logger.info("  write `#{output}`")
 
-      open(output, 'wb') do |f|
-        f.puts MAGIC_COMMENT
+    open(output, 'wb') do |f|
+      f.puts MAGIC_COMMENT
 
-        requires.each do |rt_file|
-          f.puts "require '#{rt_file}'"
-        end
+      requires.each do |rt_file|
+        f.puts "require '#{rt_file}'"
       end
+    end
+  else
+    dsl = Mappru::DSL.convert(exported, options)
+
+    if output == '-'
+      logger.info('# Export Route Table')
+      puts dsl
     else
-      dsl = Mappru::DSL.convert(exported, options)
-
-      if output == '-'
-        logger.info('# Export Route Table')
-        puts dsl
-      else
-        logger.info("Export Route Table to `#{output}`")
-        open(output, 'wb') do |f|
-          f.puts MAGIC_COMMENT
-          f.puts dsl
-        end
+      logger.info("Export Route Table to `#{output}`")
+      open(output, 'wb') do |f|
+        f.puts MAGIC_COMMENT
+        f.puts dsl
       end
     end
-  when :apply
-    file = options[:file]
+  end
+end
 
-    unless File.exist?(file)
-      raise "No RouteTable found (looking for: #{file})"
-    end
+def run_apply(client, options)
+  logger = Mappru::Logger.instance
+  file = options[:file]
+
+  unless File.exist?(file)
+    raise "No RouteTable found (looking for: #{file})"
+  end
+
+  message = "Apply `#{file}` to Route Table"
+  message << ' (dry-run)' if options[:dry_run]
+  logger.info(message)
 
-    message = "Apply `#{file}` to Route Table"
-    message << ' (dry-run)' if options[:dry_run]
-    logger.info(message)
+  updated = client.apply(file)
 
-    updated = client.apply(file)
+  logger.info('No change'.intense_blue) unless updated
+end
 
-    logger.info('No change'.intense_blue) unless updated
+def main(argv)
+  options = parse_options(argv)
+  client = Mappru::Client.new(options)
+  logger = Mappru::Logger.instance
+
+  case options[:mode]
+  when :export
+    run_export(client, options)
+  when :apply
+    run_apply(client, options)
   else
     raise "Unknown mode: #{options[:mode]}"
   end

data/lib/mappru/exporter.rb

@@ -26,7 +26,7 @@ class Mappru::Exporter
       next unless matched?(vpc_id, @options[:vpc_id])
 
       unless name
-        log(:warn, "No name Route Table can not manage: #{vpc_id}", color: :yellow)
+        log(:warn, "Cannot manage the nameless Route Table: #{vpc_id}", color: :yellow)
         next
       end
 

data/lib/mappru/version.rb

@@ -1,3 +1,3 @@
 module Mappru
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

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