vzcdn 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17369072c6982f75c6051118810f9a5a2ff1360f
-  data.tar.gz: 5b5b170030343d0c6cef577dec0e4749a80d5641
+  metadata.gz: ec9cdba53621f9be97fde6eb72d0e923aa06db61
+  data.tar.gz: 0931da14e4d50284cf5daa83cc269c0bf308ca37
 SHA512:
-  metadata.gz: 87b87d36051c63cb48c92824bae3f2993040f17ba15b02acd0740621c2a49c9b4cc67c38ddff91f16da1c7c5b535c6a6e3f7bcf908edfb397fe0cd7cc2734ac2
-  data.tar.gz: a66b939d4ffdf552500f46546e960a5bb9b621909a9f77400be7756a377036ea5739a9f612d754e51dd281e2a379e6d986aecbed28e70df161df870de38fc3b7
+  metadata.gz: b9f20a06c369095c0cea23437d3321b936a0f6b72799f618bc1c1a699bc7a8aeeb224a0bb29eb4547488fc582054aea3e5751504a19783603294ba999fa96621
+  data.tar.gz: 05a60fe2606d87fea0d542647e8c4b518d3f4f90fdcb23f0872b27c9ecf50e40cdf1bdc09b9190976aa22f0af596ae80824d498d93c0a995d370a9a131eb6ad4

data/README.md

@@ -2,6 +2,11 @@
 
 Commandline UI for Edgecast API
 
+##RELEASE NOTES
+2014/04/09      0.1.4
+1. Bug fix for "ec zone <id> pull"
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/ec

@@ -3,6 +3,8 @@
 require 'vzcdn'
 require 'vzcdn/version'
 
+$debug = false
+
 if ARGV[0] == "-v"
   puts "vzcdn version:" + Vzcdn::VERSION
   exit
@@ -11,8 +13,6 @@ end
 if ARGV[0] == "-d"
   $debug = true
   ARGV.shift
-else
-  $debug = false
 end
 
 args = []
@@ -22,12 +22,14 @@ ARGV.each { |arg|
 
 begin
   VzcdnApp.invoke(args)
+  exit 0
 rescue Exception => e
   if e.class != SystemExit
     puts "ERROR:" + e.message
     if $debug
       raise e
     else
+      exit 1
     end
   end
 end

data/bin/vzcdn

@@ -3,6 +3,8 @@
 require 'vzcdn'
 require 'vzcdn/version'
 
+$debug = false
+
 if ARGV[0] == "-v"
   puts "vzcdn version:" + Vzcdn::VERSION
   exit
@@ -11,8 +13,6 @@ end
 if ARGV[0] == "-d"
   $debug = true
   ARGV.shift
-else
-  $debug = false
 end
 
 args = []
@@ -22,12 +22,14 @@ ARGV.each { |arg|
 
 begin
   VzcdnApp.invoke(args)
+  exit 0
 rescue Exception => e
   if e.class != SystemExit
     puts "ERROR:" + e.message
     if $debug
       raise e
     else
+      exit 1
     end
   end
 end

data/lib/cloptions.rb

@@ -0,0 +1,103 @@
+class ClOptions
+  def initialize(obj, options)
+    @obj = obj
+    @options = options
+  end
+
+  def handle_options(name, value)
+    puts "inside handle_options, name is " + name.to_s + ", value is " + value.to_s
+    took_value = false
+    valid = false
+    @options.each{|option|
+      if (option[:long_name] == name) || (option[:short_name] == name)
+        valid = true
+        if (option[:takes_value]) && (value == nil)
+          raise "option " + name + " requires value"
+          break
+        elsif option[:takes_value]
+          @obj.send(option[:method], value)
+          took_value = true
+        else
+          @obj.send(option[:method])
+        end
+        break
+      end
+    }
+    raise "Invalid option: " + name if !valid
+    took_value
+  end
+
+  def parse_longname(arg, m)
+    long_name = arg[m.begin(1)...m.end(1)]
+    option_value = nil
+    if arg[m.end(1)] == '='
+      option_value = arg[m.end(1)+1...arg.length]
+    end
+    return long_name, option_value
+  end
+
+  def parse_shortname (arg)
+    short_name = arg[1]
+    option_value = nil
+    if arg[2] == '='
+      option_value = arg[3...arg.length]
+    elsif arg.length > 2
+      short_name = arg[1...arg.length]
+    end
+    return short_name, option_value
+  end
+
+  def handle(args)
+    @args = [ ]
+    i = 0
+    while i < args.length
+      arg = args[i]
+      
+      if arg == '--'
+        @args.concat args[i+1...args.length]
+        break
+      elsif m = arg.match(/\A--([a-z]+(-[a-z]+)*)/)
+        long_name, option_value = parse_longname(arg, m)
+        next_captured = false # next argument may be options argument
+        if (option_value == nil) && (i+1 < args.length)
+          option_value = args[i+1] 
+          next_captured = true
+        end
+        took_value = handle_options long_name, option_value
+        i += 1 if took_value && next_captured 
+      elsif arg[0] == '-' 
+        short_name, option_value = parse_shortname(arg)
+        next_captured = false # next argument may be options argument
+        if (option_value == nil) && (i+1 < args.length)
+          option_value = args[i+1] 
+          next_captured = true
+        end
+        took_value = handle_options short_name, option_value
+        i += 1 if took_value && next_captured 
+      else
+        @args << arg
+      end
+      i += 1
+    end
+    @args
+  end
+end
+
+def parse_option(arg)
+  
+end
+
+options = [ { short_name: 'd', long_name: 'debug', method: :set_debug, takes_value: false},
+            { short_name: 'o', long_name: 'output-file', method: :set_output, takes_value: true}]
+
+$debug=false
+def set_debug
+  $debug = true
+end
+def set_output(file_name)
+  puts "file name = " + file_name
+end
+opts = ClOptions.new(self, options)
+args = opts.handle(ARGV)
+puts "args are:" + args.to_s
+puts "$debug = " + $debug.to_s

data/lib/command_proc.rb

@@ -11,6 +11,10 @@ module CommandProc
     base.init_instances
   end
 
+  def getopt(obj, args, options)
+    
+  end
+
   module ClassMethods
     def init_instances
       class_eval <<-CODE
@@ -47,7 +51,7 @@ module CommandProc
         command = args.shift
         instance.send(command, args)
       else
-        puts "argument '" + command + "' not recognized as command"
+        raise("argument '" + command + "' not recognized as command")
       end
     end
     

data/lib/vzcdn/version.rb

@@ -1,3 +1,3 @@
 module Vzcdn
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/zone.rb

@@ -99,7 +99,7 @@ class Zone
     else
       name = @zname
     end
-    name = name.sub(/\.\Z/, "")
+    name = name.sub(/\.\Z/, "") if ! name.nil?
     return id, name
   end
 
@@ -124,7 +124,6 @@ class Zone
       end
       if (zone.nil?)
         zone = Route.do.get_zone(id, name)
-        File.open("orig.zone", "w").write(JSON.pretty_generate zone)
         Route.do.translate_zone(zone)
       end
     end

data/test/test_clui.rb

@@ -4,19 +4,38 @@ require 'test/unit'
 require 'tmpdir'
 require 'tempfile'
 
-class TestClui < Test::Unit::TestCase
-  def test_config
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir)
-      `ec config init BED3 e22db149-7369-4d7b-9c53-38d38746ccea`
-      assert(File.directory?(".vdms.d"), "missing .vdms.d directory")
-      assert(File.exists?(".vdms.d/config"), "missing config file")
-      assert_equal("BED3", `ec config get acct-num`.chomp, "get account-num failed")
+bin_dir = File.expand_path '../bin'
+lib_dir = File.expand_path '../lib'
+$ruby_command = "ruby -I" + lib_dir + " " + bin_dir + "/ec "
+
+test_directory = Dir.mktmpdir "steve"
+Dir.chdir test_directory
+
+class TestClui < MiniTest::Unit::TestCase
+  @@config_init = false
+  @@zones = nil
+  @@config_dir = ".vdms.d"
+
+  def setup
+    first_test unless @@config_init
+  end
+
+  def first_test
+    @@config_init = true
+    `ec config init BED3 e22db149-7369-4d7b-9c53-38d38746ccea`
+    if ENV["HTTP_PROXY"]
+      proxy = "http://" + ENV["HTTP_PROXY"]
+      `ec config set proxy #{proxy}`
     end
+    assert(File.directory?(@@config_dir), "missing " + @@config_dir + " directory")
+    assert(File.exists?(File.join(@@config_dir, "config")), "missing config file")
+    assert_equal("BED3", `ec config get acct-num`.chomp, "get account-num failed")
+    @@route = Route.do
   end
+
   def ctest_availables
-    route = Route.new
-    puts "zone types:" + route.get_available_zone_types.to_s
+    @@route.get_available_zone_types
+    
     puts "record types:" + route.get_available_record_types.to_s
     puts "zone status:" + route.get_available_zone_statuses.to_s
     puts "route groups:" + route.get_available_route_groups.to_s
@@ -25,4 +44,62 @@ class TestClui < Test::Unit::TestCase
     puts "hc types:" + route.get_available_health_check_types.to_s
     puts "hc reints:" + route.get_available_health_check_reintegration_methods.to_s
   end
+
+  def call_ec(rest)
+    command = $ruby_command + rest
+    system(command)
+  end
+
+  def call_ec_io(rest)
+    out, err = capture_subprocess_io do
+      success = call_ec(rest)
+    end
+    return out, err, success
+  end
+
+  def assert_ec_output(rest, expected_out)
+    out, err, rc = call_ec_io(rest)
+    assert success, "'" + rest + "' failed"
+    assert_equal expected_out, out.chomp, "'" + rest + "' failed"
+    assert_equal '', err.chomp, "'" + rest + "' printed to stderr:" + err
+  end
+
+  def test_config
+    assert call_ec("config set myname 'my strange value'"), "'config set' failed"
+    assert_ec_output("config get myname", 'my strange value')
+    assert call_ec("config delete myname"), "'config delete myname' failed"
+    assert_ec_output("config get myname", '')
+  end
+
+  def get_zones
+    @@zones = @@route.get_all_zones unless @@zones
+  end
+
+  def zone_file(zone)
+    File.join(@@config_dir, "zones",
+              zone["DomainName"].sub(/\.\Z/, '') + '.' + zone["ZoneId"].to_s)
+  end
+
+  def test_pull_id
+    get_zones
+    zone = @@zones.sample
+    id = zone["ZoneId"].to_s
+    assert call_ec("zone #{id} pull"), "unable to pull zone #{id}"
+    assert File.exists?(zone_file zone), "file  #{zone_file zone} not created"
+    File.delete(zone_file zone)
+  end
+
+  def test_pull_name
+    get_zones
+    zone = @@zones.sample
+    name = zone["DomainName"]
+    assert call_ec("zone #{name} pull"), "unable to pull zone #{name}"
+    assert File.exists?(zone_file zone), "file  #{zone_file zone} not created"
+    File.delete(zone_file zone)
+  end
 end
+
+rc = (Test::Unit::Runner.new.run(ARGV) || true)
+FileUtils.remove_entry test_directory
+
+exit rc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzcdn
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Steve Preston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -72,6 +72,7 @@ files:
 - bin/ec
 - bin/vzcdn
 - lib/args.rb
+- lib/cloptions.rb
 - lib/clui_config.rb
 - lib/command_proc.rb
 - lib/common.rb