vzcdn 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c4b114ae9aa0f8eb6b7a62d71ad699ce670de7
-  data.tar.gz: 43df82ae708930fc0f98995b066339aa9ff7866a
+  metadata.gz: 7308b4c03e37ceb4e8929e429f5ea3cdf4b5a879
+  data.tar.gz: 76b3478d0d082d625bbd17e43aa0c86dfda8ee18
 SHA512:
-  metadata.gz: fca53d416484d65fd293e8d2dd894cc255b8604022da1b1b83cd2c9294f6bc81dd1f85093bcefb19d20a5a9c26a0d31751d27d92647f852ddfb5d04f274ce155
-  data.tar.gz: cbd0784e1a74d2240dc41d4fc7e5fef3c39cb68e86c3c9e2fdd0a2512a7b7a655d2589167f0fc4b500d92133108de948cbc13847e40d0857c82cd7bb5ee694d9
+  metadata.gz: 6b241986733b7fd7b4be2823a01269aaae95a6e161714783ceb8349ac084a8284dd1b0a0861739e4e3e61afa7278a88d3da230bcecca79df8d9122fb87ec1e3c
+  data.tar.gz: 097f7f170f2a0bb6a41d6c838058c69c72522db5cd560ab42d1ee22a39c0a26f969653c250881db92901443d746f1aa0798b6285f66947ad149fc4232ce03cc9

data/README.md

@@ -3,6 +3,8 @@
 Commandline UI for Edgecast API
 
 ##RELEASE NOTES
+2014/05/15      0.2.2
+ * Bug fix: pull command would fail if zones directory does not exists.
 
 2014/05/12      0.2.1
  * CSV format support (ec zone <zname> print -t csv)

data/lib/vzcdn/version.rb

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

data/lib/zone.rb

@@ -215,7 +215,7 @@ class Zone < Command
       r = '.*\.(' + id + ')'
     end
     regex = Regexp.new(r)
-    Dir.new(user_file(ZONEDIR)).each { |file|
+    Dir.new(user_file(ZONEDIR, '.')).each { |file|
       if (m = file.full_match(regex))
         @zone_file = user_file(ZONEDIR, file)
         @zone_id = m[1]

data/test/test_clui.rb

@@ -6,10 +6,12 @@ require 'tempfile'
 
 bin_dir = File.expand_path '../bin'
 lib_dir = File.expand_path '../lib'
+test_dir = File.expand_path '.'
 $ruby_command = "ruby -I" + lib_dir + " " + bin_dir + "/ec "
+$debug = 0
 
-test_directory = Dir.mktmpdir "steve"
-Dir.chdir test_directory
+# test_directory = Dir.mktmpdir "steve"
+# Dir.chdir test_directory
 
 class TestClui < MiniTest::Unit::TestCase
   @@config_init = false
@@ -28,7 +30,7 @@ class TestClui < MiniTest::Unit::TestCase
       `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(File.exist?(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
@@ -51,6 +53,7 @@ class TestClui < MiniTest::Unit::TestCase
   end
 
   def call_ec_io(rest)
+    success = nil
     out, err = capture_subprocess_io do
       success = call_ec(rest)
     end
@@ -58,9 +61,14 @@ class TestClui < MiniTest::Unit::TestCase
   end
 
   def assert_ec_output(rest, expected_out)
-    out, err, rc = call_ec_io(rest)
+    out, err, success = call_ec_io(rest)
     assert success, "'" + rest + "' failed"
-    assert_equal expected_out, out.chomp, "'" + rest + "' failed"
+    if (expected_out.class == Regexp)
+      assert_match expected_out, out.chomp, "'" + rest + "' failed"
+    else
+      assert_equal expected_out, out.chomp, "'" + rest + "' failed"
+    end
+      
     assert_equal '', err.chomp, "'" + rest + "' printed to stderr:" + err
   end
 
@@ -85,7 +93,7 @@ class TestClui < MiniTest::Unit::TestCase
     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"
+    assert File.exist?(zone_file zone), "file  #{zone_file zone} not created"
     File.delete(zone_file zone)
   end
 
@@ -94,12 +102,20 @@ class TestClui < MiniTest::Unit::TestCase
     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"
+    assert File.exist?(zone_file zone), "file  #{zone_file zone} not created"
     File.delete(zone_file zone)
   end
+
+  def test_print_zone
+    get_zones
+    zone = @@zones.sample
+    name = zone["DomainName"]
+    assert_ec_output("zone #{name} pull", /saved locally/)    
+  end
+  
 end
 
 rc = (Test::Unit::Runner.new.run(ARGV) || true)
-FileUtils.remove_entry test_directory
+# 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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Steve Preston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client