vzcdn 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908fd60bab73ffcb6b51ee5800cf18bc1f342497
-  data.tar.gz: e5977af1560fc83e7f2065c2665a70fc36faeec0
+  metadata.gz: 02c4b114ae9aa0f8eb6b7a62d71ad699ce670de7
+  data.tar.gz: 43df82ae708930fc0f98995b066339aa9ff7866a
 SHA512:
-  metadata.gz: 1157b4228fd58982be432b0a67f1a3c73ed1cd7850a2fd6f584afd305f2b935e68a375583879c4936ec1e18940267f567235cbae7d93f6c235e6bf01874304b1
-  data.tar.gz: f55a563fcb6999f967f4a14e3260635095275ec1191a734a23eb08c986e65e7a8978dffbc5e2de127bc5ca03870ef088036e02616e95aca68e8fdcabab93e166
+  metadata.gz: fca53d416484d65fd293e8d2dd894cc255b8604022da1b1b83cd2c9294f6bc81dd1f85093bcefb19d20a5a9c26a0d31751d27d92647f852ddfb5d04f274ce155
+  data.tar.gz: cbd0784e1a74d2240dc41d4fc7e5fef3c39cb68e86c3c9e2fdd0a2512a7b7a655d2589167f0fc4b500d92133108de948cbc13847e40d0857c82cd7bb5ee694d9

data/README.md

@@ -4,6 +4,11 @@ Commandline UI for Edgecast API
 
 ##RELEASE NOTES
 
+2014/05/12      0.2.1
+ * CSV format support (ec zone <zname> print -t csv)
+ * Column Customization (ec zone <zname> print -c DomainName,ZoneId)
+ * IP address validations, 'diff' command, bind-file-to-add-zone script etc
+ 
 2014/05/02      0.2.0
  * Add/Update/Delete for groups/records/health-checks in zone.
  * Zone-list with local status

data/lib/args.rb

@@ -88,7 +88,7 @@ class Arg
   def validate?(value, obj)
     vclass = @validator.class
     if vclass == Regexp
-      test = (value =~ @validator)
+      test = value.full_match(@validator)
       on_error = "Invalid Format for " + @name
     elsif vclass == Array
       test = @validator.include? value

data/lib/bind2zone.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -o pipefail
+if [ $# -ne 2 ]; then echo "Usage: $0 <bind file> <zone name>"; exit 1; fi
+bindfile=$1
+zonename=$2
+ec zone create $zonename Active
+if [ $? -eq 1 ]; then echo "Could not create zone."; exit 1; fi
+
+tmpDir=$(mktemp -d tmpXXXXXX)
+echo "tmpDir = $tmpDir"
+cat $bindfile | awk -F '\t' 'BEGIN { OFS = "|"} $3 == "IN" {print $4,$1,$5,$2}' | while read line
+do
+    name=$(echo $line | awk -F "|" '{print $2}')
+    args=$(echo $line | awk -F "|" '{print $1, $3, $4}')
+    #ec zone $zonename rec $rtype add $args
+    mkdir -p $tmpDir/$name
+    echo $args >> $tmpDir/$name/records
+done
+
+index=1
+find $tmpDir -name records | while read file
+do
+    recordCount=$(wc $file | awk '{ print $1 }')
+    rtype=$(cat $file | awk 'FNR == 1 {print $1}')
+    name=$(echo $file | awk -F "/" '{print $2}')
+#    echo "rtype=$rtype, name=$name, file=$file"
+    if [ $recordCount -eq 1 ]
+    then
+        args=$(cat $file | awk '{print $2, $3}' )
+        (ec zone $zonename rec $rtype add $name $args)
+    else
+        groupTtl=$(cat $file | awk 'FNR == 1 {print $3}')
+        (ec zone $zonename load add $name $groupTtl)
+        cat $file | while read line
+        do
+            rdata=$(echo $line | awk '{print $2}')
+            rtype=$(echo $line | awk '{print $1}')
+            (ec zone $zonename load $index group $rtype add 50 $rdata)
+        done
+        let "index = index + 1"
+    fi
+done
+# ec zone $zonename push
+rm -rf tmpDir

data/lib/cloptions.rb

@@ -4,6 +4,20 @@ class ClOptions
     @options = options
   end
 
+  def validate(value, option)
+    validator = option[:takes_value]
+    vclass = validator.class
+    if vclass == Regexp
+      if not value.full_match(validator)
+        raise "Invalid format for option --#{option[:long_name]}"
+      end
+    elsif vclass == Array
+      if not validator.include? value
+        raise "Invalid choice for option --#{option[:long_name]}, must be one of #{validator}"
+      end
+    end
+  end
+
   def handle_option(type, name, attached, nextarg)
     need_shift = false
     valid_option = false
@@ -14,6 +28,7 @@ class ClOptions
         if option[:takes_value]
           need_shift = attached.nil?
           if value
+            validate(value, option)
             @obj.send(option[:method], value)
           else
             return "value required for option"

data/lib/command.rb

@@ -79,10 +79,33 @@ class Command
     end
     puts "Options:"
     @options.each { | o |
-      puts "  -#{o[:short_name]} or --#{o[:long_name]}" + (o[:takes_value] ? " (takes value)" : "")
+      puts "  -#{o[:short_name]} or --#{o[:long_name]}" + option_help_string(o)
     }
   end
 
+  def option_help_string(option)
+    validator = option[:takes_value]
+    result = if validator
+      case [validator.class]
+      when [Array]
+        "one of #{validator}"
+      when [Regexp]
+        if option.has_key?(:regexp_description)
+          option[:regexp_description]
+        else
+          "(bug found no regexp_description)"
+        end
+      else
+        "(bug found unknown option validator class #{validator.class})"
+      end
+    end
+    if result && result.length > 0
+      "=<#{result}>"
+    else
+      ""
+    end
+  end
+
   def show_help_option
     show_help
     raise CancelExecution

data/lib/diff.rb

@@ -1,80 +1,84 @@
 require 'json'
+require_relative 'util'
 
 class Diff
-  def initialize(old, new)
-    @old = old
-    @new = new
-    @diffs = Hash.new([ ])   # entries will be "level" => [{ old: old_value, new: new_value, desc: description }, ...]
-  end
+  @@term_width = nil
 
-  def sprint_struct(struct)
-    if (struct.class == Array)
-      output = "[#{struct.length}]"
-    elsif (struct.class == Hash)
-      values = []
-      # print top level elements of hash
-      struct.keys.each { |key|
-        value = struct[key]
-        value = sprint_struct(value)
-        values << "#{key}=#{value}"
-      }
-      output = values.join(", ")
-    elsif (struct.nil?)
-        return "null"
+  def self.term_width
+    if @@term_width
+      @@term_width
     else
-      output = "#{struct}"
+      @@term_width, h = Util.detect_terminal_size
+      @@term_width
     end
-    output
   end
 
-  def add_diff(old, new, level)
-    diffs = @diffs[level].clone
-    diffs << {old: sprint_struct(old), new: sprint_struct(new)}
-    @diffs[level] = diffs
+  def self.separator(fill_char, label)
+    term_width = Diff.term_width
+    filler_width = (term_width - label.length - 2) / 2
+    filler = ''
+    (1..filler_width).each { |i| filler = filler + fill_char }
+    line = filler + ' ' + label + ' ' + filler
+    if line.length < term_width
+      line = line + fill_char
+    end
+    line
   end
 
-  def idiff(old, new, level)
-    if old.class != new.class
-      add_diff(old, new, level)
-      return
+  def self.diff(old, old_name, new, new_name)
+    if old == new
+      return true
     end
-    case [old.class]
-    when [Array]
-      num_to_check = [old.length, new.length].max
-      for i in 0...num_to_check
-        idiff(old[i], new[i], level + "[#{i+1}]")
-      end
-    when [Hash]
-      old.keys.each { |key|
-        idiff(old[key], new[key], level + ".#{key}")
-      }
-    else
-      if old != new
-        add_diff(old, new, level)
+    old_index = 0
+    new_index = 0
+    state = :matching
+    old_trigger_pulled = false
+    while old_index < old.length || new_index < new.length
+      old_line = old[old_index]
+      new_line = new[new_index]
+      case state
+      when :matching
+        if old_line == new_line
+          puts old_line
+          old_index += 1
+          new_index += 1
+        else
+          if old_line
+            state = :old
+            old_trigger_pulled = true
+          else
+            puts Diff.separator('>', new_name)
+            state = :old_eof
+          end
+        end
+      when :old
+        idx = new_line ? new[new_index..-1].find_index(old_line) : nil
+        if idx
+          idx += new_index
+          if idx > new_index
+            puts Diff.separator('>', new_name)
+          end
+          for i in new_index...idx
+            puts new[i]
+          end
+          puts Diff.separator('=', 'common')
+          new_index = idx
+          state = :matching
+        else
+          if old_trigger_pulled
+            puts Diff.separator('<', old_name)
+            old_trigger_pulled = false
+          end
+          puts old_line
+          old_index += 1
+        end
+      when :old_eof
+        if new_line
+          puts new_line
+          new_index += 1
+        end
       end
-    end  
-  end
-
-  def print_diffs
-    @diffs.each { |level, diffs|
-      puts "at level #{level}"
-      diffs.each { |diff|
-        puts "    old: #{diff[:old]} | new: #{diff[:new]}"
-      }
-    }
-  end
-
-  def run
-    idiff(@old, @new, "base")
-    print_diffs
+    end
+    false
   end
 end
-
-file1 = ARGV[0]
-file2 = ARGV[1]
-
-old = JSON.parse(File.open(file1).read)
-new = JSON.parse(File.open(file2).read)
-
-diff = Diff.new(old, new)
-diff.run

data/lib/mkbind.sh

@@ -45,7 +45,15 @@ while rtypes=$(ec zone $zname LoadBalancingGroups $lbgroup group | awk '{if (NR
 do
     echo ""
     echo ";-------------Load Balancing Group $lbgroup------------------"
-    records_subcommand="ec zone $zname LoadBalancingGroups $lbgroup group xyxyxy Record"
-    print_records
+    group_ttl=$(ec zone $zname LoadBalancingGroups $lbgroup print -cTTL -n)
+    group_name=$(ec zone $zname LoadBalancingGroups $lbgroup print -cName -n)
+    for rtype in $rtypes
+    do
+        rdatas=$(ec zone $zname LoadBalancingGroups $lbgroup group $rtype print -cRdata -n)
+        for rdata in $rdatas
+        do
+            echo "$group_name $group_ttl IN $rtype $rdata" | awk 'BEGIN {OFS="\t"} {print $1,$2,$3,$4,$5}'
+        done
+    done
     let "lbgroup = lbgroup + 1"
 done

data/lib/print.rb

@@ -1,3 +1,4 @@
+require 'csv'
 require_relative 'util'
 require_relative 'config_reader'
 
@@ -16,7 +17,7 @@ class TablePrint
     char_repeat(n, ' ')
   end
 
-  def initialize(sep_char, *titles)
+  def set_titles(sep_char, titles)
     @ncols = titles.length
     @lines = [ ]
     @width = nil
@@ -24,7 +25,7 @@ class TablePrint
     @lines << titles
   end
 
-  def append(*columns)
+  def append(columns)
     @lines << columns
   end
 
@@ -98,13 +99,10 @@ class TablePrint
     line
   end
 
-  def print_table_normally(maxwidth, header)
+  def print_table_normally(maxwidth)
     @lines.each_with_index { |line, lineno|
-      if lineno == 0 && ! header
-        next
-      end
       print_line_normally(maxwidth, line)
-      if lineno == 0 && header
+      if lineno == 0
         print_line_normally(maxwidth, generate_separator_line(maxwidth))
       end
     }
@@ -114,7 +112,7 @@ class TablePrint
     char_repeat(width, @sep_char)
   end
 
-  def print_staggered(maxwidth, term_width, header)
+  def print_staggered(maxwidth, term_width)
     minw = term_width
     maxwidth.each_with_index { |w, index|
       next if index == 0
@@ -124,9 +122,6 @@ class TablePrint
     @width = minw
     puts separator(term_width)
     @lines.each_with_index { |line, lineno|
-      if lineno == 0 && ! header
-        next
-      end
       output = ""
       cols_left = Array.new(@ncols, true)
       while column = next_unprinted_column(cols_left)
@@ -172,7 +167,7 @@ class TablePrint
     }
   end
 
-  def print_table(header = true)
+  def print_table
     return if @lines.nil?
     return if @ncols == 0
     if @ncols == 1
@@ -184,10 +179,10 @@ class TablePrint
     # will lines fit in terminal
     width_needed = maxwidth.reduce(:+) + (@ncols-1) * 2
     term_width, h = Util.detect_terminal_size
-    if (width_needed <= term_width) || (not header)
-      print_table_normally(maxwidth, header)
+    if (width_needed <= term_width)
+      print_table_normally(maxwidth)
     else
-      print_staggered(maxwidth, term_width, header)
+      print_staggered(maxwidth, term_width)
     end
   end
 
@@ -196,65 +191,79 @@ end
 class StructurePrint 
   include ConfigReader
 
-  def initialize(sep_char)
+  def initialize(sep_char, header=true, format=nil, columns_to_print=nil)
     @sep_char = sep_char
+    @header = header
+    @format = format
+    @rownum = 0
+    @columns_to_print = columns_to_print
+    
+  end
+
+  def indexes_from_column_names(names, struct)
+    result = [ ]
+    names.each  { |name|
+      index = struct.keys.index name
+      if index.is_a? Integer
+        result << index
+      else
+        raise "column (#{name}) not found"
+      end
+    }
+    result
   end
 
-  def get_indexes(level, key_array)
+  def get_indexes(level, struct)
+    result = (0...struct.keys.length).to_a
+    if @columns_to_print
+      if @columns_to_print == '*'
+        return result
+      end
+      column_names = @columns_to_print.split(',')
+      return indexes_from_column_names(column_names, struct)
+    end
     print_config_file = config_file("print.cfg")
     if File.exists? print_config_file
       level.gsub!(/\[\d*\]/, '')
       level_map = JSON.parse(File.open(print_config_file).read)
       if level_map.has_key? level
         column_names = level_map[level]
-        result = []
-        column_names.each { |name|
-          index = key_array.index name
-          result << index
-        }
-        return result
+        return indexes_from_column_names(column_names, struct)
       end
     end
-    (0...key_array.length).to_a
+    result
   end
 
   def extract_printed_columns(indexes, values, index_value, add_index = false)
     print_values = []
-    print_values << index_value.to_s if add_index
+    if add_index
+      print_values << index_value.to_s
+    end
     indexes.each { |index|
       print_values << values[index]
     }
     print_values
   end
 
-  def structure_print(struct, level, header = true)
-    istructure_print(struct, level, header)
+  def structure_print(struct, level)
+    if @header && @format.nil?
+      @table = TablePrint.new
+    end
     if $debug > 0
       puts "level = #{level}"
     end
-    @table.print_table(header) if @table
+    istructure_print(struct, level)
+    @table.print_table if @table
   end
 
-  def istructure_print(struct, level, header, add_index = false)
-    if (struct.class == Array)
-      struct.each_with_index { |elt, index|
-        istructure_print(elt, level, header, struct.length > 1)
-        header = false
-      }
-    elsif (struct.class == Hash)
-      # print top level elements of hash
-      indexes = get_indexes(level, struct.keys)
-      if @table.nil?
-        @table = TablePrint.new(@sep_char, *extract_printed_columns(indexes, struct.keys, "item", add_index))
-        @rownum = 0
-      end
+  def hash_element_array(hash)
       values = []
-      struct.keys.each { |key|
-        value = struct[key]
+      hash.keys.each { |key|
+        value = hash[key]
         if (value.nil?)
           value = "null"
         elsif (value.class == Array)
-          value = "[" + value.length.to_s + "]"
+          value = "[#{value.length}]"
         elsif (value.class == String)
         elsif (value.class == Fixnum)
           value = value.to_s
@@ -265,12 +274,44 @@ class StructurePrint
         elsif value.class == FalseClass
           value = "false"
         else
-          value = "<" + value.class.to_s + ">"
+          value = "<#{value.class}>"
         end
         values << value
       }
+    values
+  end
+
+  def print_values(values)
+    puts values.join("|")
+  end
+
+  def istructure_print(struct, level, add_index = false)
+    if (struct.class == Array)
+      struct.each_with_index { |elt, index|
+        istructure_print(elt, level, (struct.length > 1) && @columns_to_print.nil?)
+      }
+    elsif (struct.class == Hash)
+      # print top level elements of hash
+      if @titles.nil?
+        @titles = true
+        @indexes = get_indexes(level, struct)
+        titles = extract_printed_columns(@indexes, struct.keys, "item", add_index)
+        if @table
+          @table.set_titles(@sep_char, titles)
+        elsif @format == :csv && @header
+          puts titles.to_csv
+        end
+      end
+      values = hash_element_array(struct)
       @rownum += 1
-      @table.append(*extract_printed_columns(indexes, values, @rownum, add_index))
+      values_to_print = extract_printed_columns(@indexes, values, @rownum, add_index)
+      if @table
+        @table.append(values_to_print)
+      elsif @format == :csv
+        puts values_to_print.to_csv
+      else
+        puts values_to_print.join("|")
+      end
     else
       puts struct.to_s
     end

data/lib/route.rb

@@ -226,6 +226,7 @@ class Route
   end
 
   def xlate_name(symbol, name)
+    return nil if name.nil?
     get_available(symbol).each { |hash|
       if hash["Name"] == name
         return hash["Id"]

data/lib/vzcdn/version.rb

@@ -1,3 +1,3 @@
 module Vzcdn
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/zone.rb

@@ -7,6 +7,7 @@ require_relative 'zone_add'
 require_relative 'zone_update'
 require_relative 'zone_delete'
 require_relative 'zone_hc'
+require_relative 'zone_diff'
 
 ZONEDIR="zones"
 
@@ -49,7 +50,7 @@ class ZonePull < Command
   end
 
   def add_options 
-    add_option({ short_name: 'f', long_name: 'file', method: :save_zone_to_file, takes_value: true})
+    add_option({ short_name: 'f', long_name: 'file', method: :save_zone_to_file, takes_value: /.*/, regexp_description: "file name"})
   end
 
   def execute(args, rest)
@@ -73,20 +74,35 @@ class ZoneAudit< Command
 end
 
 class ZonePrint < Command
+  def init
+    @header = true
+    @format = nil
+  end
+
   def add_options 
-    add_option({ short_name: 'j', long_name: 'json', method: :set_format, takes_value: false})
+    add_option({ short_name: 'j', long_name: 'json', method: :set_format_json, takes_value: false})
+    add_option({ short_name: 't', long_name: 'type', method: :set_format, takes_value: ["csv", "json"]})
     add_option({ short_name: 'n', long_name: 'no-header', method: :unset_header, takes_value: false})
+    add_option({ short_name: 'c', long_name: 'columns', method: :set_columns, takes_value: /[[:alpha:],]+|\*/, regexp_description: "comma separated column names, or * for all columns"})
     # add_option({ short_name: 'f', long_name: 'force-online', method: :force_online, takes_value: false})
   end
 
   def unset_header
-    @no_header = true
+    @header = false
   end
 
-  def set_format
+  def set_format_json
     @format = :json
   end
 
+  def set_format(format)
+    @format = format.to_sym
+  end
+
+  def set_columns(column_list)
+    @columns = column_list
+  end
+
   def execute(args, rest)
     struct = @input["struct"]
     level = @input["level"]
@@ -94,7 +110,7 @@ class ZonePrint < Command
     if @format == :json
       puts JSON.pretty_generate(struct)
     else
-      StructurePrint.new(sep_char).structure_print(struct, level, (not @no_header))
+      StructurePrint.new(sep_char, @header, @format, @columns).structure_print(struct, level)
     end
   end
 end
@@ -147,6 +163,7 @@ class Zone < Command
     add_cmd(ZoneCreate, "create", "create new zone")
     add_cmd(ZoneDelete, "delete", "delete zone")
     add_cmd(ZoneSetHealthCheck, "sethc", "set health check for group member")
+    add_cmd(ZoneDiff, "diff", "show differences between (local, pulled, operational) versions of a zone")
     add_arg("zname", "name or id of zone", :alnum_not_command)
     add_arg("drill-down-param", "names of fields, or indexes of items, for drilling down", :alnum_not_command)
   end
@@ -158,6 +175,7 @@ class Zone < Command
     add_flow_from_usage("<zname> push")
     add_flow_from_usage("<zname> delete")
     add_flow_from_usage("<zname> audit")
+    add_flow_from_usage("<zname> diff")
     add_flow_from_usage("<zname> [<drill-down-param>...] add")
     add_flow_from_usage("<zname> [<drill-down-param>...] update")
     add_flow_from_usage("<zname> <drill-down-param>... delete")
@@ -213,7 +231,7 @@ class Zone < Command
           break
         elsif id && zonehash['ZoneId'].to_s == id
           name = zonehash_name
-          puts "set_zone_file, name = #{name}, id = #{id}"
+          dputs "set_zone_file, name = #{name}, id = #{id}"
           break
         end
       }
@@ -322,12 +340,45 @@ class Zone < Command
   end
 
   def write_zone_to_single_file(zone, filename)
+    validate_zone(zone)
     File.delete(filename) if File.exists?(filename)
     File.open(filename, "w") { |file|
       file.write(JSON.pretty_generate zone)
     }
   end
 
+  def validate_zone(zone)
+    validate_records(zone["Records"])
+    zone["LoadBalancingGroups"].each { |group|
+       validate_records(group["Group"])
+    }
+    zone["FailoverGroups"].each { |group|
+       validate_records(group["Group"])
+    }
+  end
+
+  def validate_records(group)
+    group.each { |rtype, value|
+      re = case rtype.to_s
+           when "A"
+             /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+           when "AAAA"
+             /^(((?=.*(::))(?!.*\3.+\3))\3?|[\dA-F]{1,4}:)([\dA-F]{1,4}(\3|:\b)|\2){5}(([\dA-F]{1,4}(\3|:\b|$)|\2){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})\z/i
+           when "CNAME"
+             /[a-zA-Z]/
+           else
+             /.*/
+           end
+      value.each { |record|
+        if not record["Rdata"] =~ re
+          raise "Rdata '#{record["Rdata"]}' in wrong format for type #{rtype}"
+          #load orignal zone
+          zone = get_zone()
+        end
+      }
+    }
+  end
+
   def write_zone_file(zone, save_backup_ok)
     write_zone_to_single_file(zone, @zone_file)
     audit

data/lib/zone_add.rb

@@ -1,7 +1,7 @@
 class ZoneAdd < Command
   def create_args
     # for level zone.Records.?
-    add_arg('name', 'Name of the node to which this record pertains', /[[:alnum:]]/)
+    add_arg('name', 'Name of the node to which this record pertains', /[[:alnum:]@]+/)
     add_arg('gname', 'Name of load balancing or failover group', /[[:alnum:]]+/)
     add_arg('rdata', 'Additional resource record data, such as IP Address', /.*/)
     add_arg('ttl', 'Time to live, in seconds', /\d+/)
@@ -75,7 +75,6 @@ class ZoneAdd < Command
       raise "should not happen"
     end
     struct << element
-    StructurePrint.new("-").structure_print(struct, level)
   end
 
   def execute(arghash, rest)
@@ -85,5 +84,6 @@ class ZoneAdd < Command
     @zone_struct = @input["toplevel"]
     add_at_level(struct, level, arghash)
     zone.write_zone_file(@zone_struct, false)
+    StructurePrint.new("-").structure_print(struct, level)
   end
 end

data/lib/zone_diff.rb

@@ -0,0 +1,57 @@
+require_relative 'diff'
+require_relative 'command'
+
+class ZoneDiff < Command
+  include ConfigReader
+
+  def init
+    @versions = ["o", "operational", "p", "pulled", "l", "local"]
+  end
+
+  def create_args
+    add_arg("version1", "one version of zone", @versions)
+    add_arg("version2", "one version of zone", @versions)
+  end
+
+  def create_flows
+    add_flow_from_usage("[version1='local'] [version2='pulled']")
+  end
+
+  def expand_version_name(version)
+    result = version
+    if (version.length == 1)
+      @versions.each { |version_name|
+        if version_name.length > 1 && version[0] == version_name[0]
+          result = version_name
+        end
+      }
+    end
+    result
+  end
+
+  def get_zone_version(version)
+    case version
+    when "operational"
+      zone = @zone.get_zone(true)
+      result = JSON.pretty_generate(zone).split("\n")
+    when "pulled"
+      filename = config_file(@zone.zone_file)
+      result = IO.readlines(filename).map(&:chomp)
+    when "local"
+      filename = @zone.zone_file
+      result = IO.readlines(filename).map(&:chomp)
+    end
+    result
+  end
+
+  def execute(arghash, rest)
+    version1 = expand_version_name(arghash["version1"])
+    version2 = expand_version_name(arghash["version2"])
+    @zone = @input['zone']
+    zone1 = get_zone_version(version1)
+    zone2 = get_zone_version(version2)
+    if Diff.diff(zone1, version1, zone2, version2)
+      puts "no difference between #{version1} and #{version2}"
+    end
+  end
+end

data/lib/zone_hc.rb

@@ -50,8 +50,8 @@ class ZoneSetHealthCheck < Command
         'IPVersion' => arghash['ip-version'],
         'PortNumber' => nil,
         'ReintegrationMethodId' => arghash['reintegration-method'],
-        'Status' => 0,
-        'StatusName' => '',
+        'Status' => 4,
+        'StatusName' => 'Unknown',
         'Uri' => arghash['uri']
       }
     else
@@ -66,13 +66,13 @@ class ZoneSetHealthCheck < Command
         'IPVersion' => nil,
         'PortNumber' => arghash['port'].to_i,
         'ReintegrationMethodId' => arghash['reintegration-method'],
-        'Status' => 0,
-        'StatusName' => '',
+        'Status' => 4,
+        'StatusName' => 'Unknown',
         'Uri' => ''
       }
     end
     struct['HealthCheck'] = hc
     StructurePrint.new("-").structure_print(struct['HealthCheck'], level+'.HealthCheck')
-    zone.write_zone_file(@zone_struct)
+    zone.write_zone_file(@zone_struct, false)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzcdn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Steve Preston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -73,6 +73,7 @@ files:
 - bin/vzcdn
 - lib/args.rb
 - lib/argtest.rb
+- lib/bind2zone.sh
 - lib/cloptions.rb
 - lib/clui_config.rb
 - lib/command.rb
@@ -98,6 +99,7 @@ files:
 - lib/zone.rb
 - lib/zone_add.rb
 - lib/zone_delete.rb
+- lib/zone_diff.rb
 - lib/zone_hc.rb
 - lib/zone_update.rb
 - pkg/vzcdn-0.0.1.gem