cdncontrol 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2ZlOTNjMjAyYzc0ZDhlZmE3MTMzNDdkMjBmMzgyMmI2NzAyNGY0ZA==
+    YzZjMmE3NzM0NjU1NDc0YjgwMmJjMTQ0MzA3ZTMzOTQyMzM5YTc5Ng==
   data.tar.gz: !binary |-
-    NDc2OWY3OTk1YjJlM2E1NzM4ODA1NGUzMjM4ZGY1NTgwZDE1ODNjNw==
+    NTk1YTA3ODk1ZTE0YmFkZDhlMjViYzE5ZTEzNTQ2ZDU0NDU2NmFmNg==
 SHA512:
   metadata.gz: !binary |-
-    Y2ZlYTRlOWJmNWMyOTFlMDY3YzhjYzhmYjAzMGExYTAyYmYwYWNjN2JiZDgz
-    MTQzY2U1N2E2MmM3NDI2NzViM2UxNjVjYjdjNmM4NjVmMmYyYjNiMGY4ZWYy
-    OTFjY2MzM2E4NWY3Y2I3NThjOWYyZDRiNmQyNzkwYTgyZjQwMTc=
+    MTc1MGI1YTQ1OWY5OTYyNjUzOWY0ZjE4YTQ1MDg4ZGRiODRhZGYwZjIxNTQ2
+    YTc0MmJlNzJlOGExMzEzZWY4N2Y4YzQ1ZTA1OWVjZTdmMjUwOGQwN2I4NGFk
+    MDEyYzA4MjIyOTAxMTA4YzFlMTljZDU0NGMyNzg3ZjBiMjJiMDA=
   data.tar.gz: !binary |-
-    MjYwN2U0OTM3MDdkZDlkMGNmZGY5ZTAyY2UzMzY0ZTZiMzkxZDM2MmY3YjVi
-    NzYxYTZmYzlhOWY2ZGQ2NWIyNDk2ZTdjNjQ5OGNlNTgyNmU2ZGYzOTU5Yzc1
-    Y2EwMTY2MzNkODg4MTdiZmU5YTk4ZjI4MDFlMjQ3NjZiNTg5MjY=
+    ZmU3ODJiYmQ3M2Y3Y2JmNmU5NDYzZjUyMzZhZDI4YmUzY2Y5ZGZjNDQ5Y2Q5
+    Y2I5NzUzY2E4ZDkyNGQwMDJkN2NkMWY2ZTQwNTZlZGI4YjU0M2NiYzk4ZWRh
+    MDM0OWQ4MWRjMWFkNGE2MmJmZWNmZWM0NjU4ZjQ2MTBhOTVmNTQ=

data/bin/cdncontrol

@@ -1,91 +1,121 @@
 #!/usr/bin/env ruby
 
 require 'choice'
-require 'json'
 require 'yaml'
-require 'pp'
 require 'cdncontrol/trafficmanager'
 
-CONFIG = YAML.load_file("/usr/local/etc/cdncontrol.conf")
-
-# TODO: this should be dynamic
-VALID_PROVIDERS    = CONFIG["valid_providers"]
-VALID_MODES        = CONFIG["valid_modes"] || [ "always", "obey", "remove", "no" ]
-OUTPUT_PATH        = CONFIG["output_path"] || "/tmp"
-VALID_TARGETS   = CONFIG["targets"].keys
-options = { show: false, add: false, verbose: false }
-
-Choice.options do
-  header "Please specify the command in one of the following formats:"
-  header ""
-  header "cdncontrol -t TARGET --show"
-  header "cdncontrol -t TARGET --write"
-  header "cdncontrol -t TARGET -p PROVIDER -w WEIGHT"
-  header "cdncontrol -t TARGET -p PROVIDER -m MODE"
-  header ""
-  header "Specific options:"
-
-  option :target, :required => false do
-    short '-t'
-    long  '--target'
-    desc  "The configuration to work on (one of #{VALID_TARGETS.join(",")})"
-    validate  /^(#{VALID_TARGETS.join("|")})$/
-  end
-
-  option :provider, :required => false do
-    short '-p'
-    long  '--provider'
-    desc  "Provider to modify (one of #{VALID_PROVIDERS.join(",")})"
-    validate  /^(#{VALID_PROVIDERS.join("|")})$/
-  end
+def load_config(conf_file)
+  abort("Config file '#{conf_file}' not found!") unless File.exists? conf_file
+  return YAML.load_file(conf_file)
+end
 
-  option :weight, :required => false do
-    short '-w'
-    long  '--weight'
-    desc  'Weight of traffic to send to provider (value between 1 and 15)'
-    validate /^([1-9]|1[0-5])$/
-  end
+def validate_option(label, option, valid_options)
+  valid_choices = valid_options.join(', ')
+  return if option.nil?
+  abort "Invalid #{label} '#{option}' - choices are :#{valid_choices}" unless valid_options.include? option
+end
 
-  option :mode, :required => false do
-    short '-m'
-    long  '--mode'
-    desc  "Set the serve mode of the provider (one of #{VALID_MODES.join(",")})"
-    validate  /^(#{VALID_MODES.join("|")})$/
-  end
+def validate_options(config, options)
+  validate_option('provider', options[:provider], config.fetch('valid_providers', []))
+  validate_option('mode', options[:mode], config.fetch('valid_modes', ["always", "obey", "remove", "no"]))
+  validate_option('target', options[:target], config.fetch('targets', {}).keys)
 
-  option :show, :required => false do
-    short '-s'
-    long  '--show'
-    desc  'Show current provider ratios'
+  unless (options[:show] ||
+          options[:write] ||
+          (options[:provider] && options[:weight]) ||
+          (options[:provider] && options[:mode]))
+    Choice.help
   end
+  return options
+end
 
-  option :verbose, :required => false do
-    short '-v'
-    long  '--verbose'
-    desc  'Show me in excrutiating detail what is happening'
+def parse_options
+  Choice.options do
+    header "Please specify the command in one of the following formats:"
+    header ""
+    header "cdncontrol -t TARGET --show"
+    header "cdncontrol -t TARGET --write"
+    header "cdncontrol -t TARGET -p PROVIDER -w WEIGHT"
+    header "cdncontrol -t TARGET -p PROVIDER -m MODE"
+    header ""
+    header "Specific options:"
+
+    option :target, :required => true do
+      short '-t'
+      long  '--target'
+      desc  "The configuration to work on"
+    end
+
+    option :provider do
+      short '-p'
+      long  '--provider'
+      desc  "Provider to modify"
+    end
+
+    option :weight do
+      short '-w'
+      long  '--weight'
+      desc  'Weight of traffic to send to provider (value between 1 and 15)'
+      validate /^([1-9]|1[0-5])$/
+    end
+
+    option :mode do
+      short '-m'
+      long  '--mode'
+      desc  "Set the serve mode of the provider"
+    end
+
+    option :show do
+      short '-s'
+      long  '--show'
+      desc  'Show current provider ratios'
+    end
+
+    option :config do
+      short  '-c'
+      long  '--config'
+      desc  'Path to config file'
+      default '/usr/local/etc/cdncontrol.conf'
+    end
+
+    option :output_dir do
+      short  '-o'
+      long  '--output-dir'
+      desc  'Path to output directory'
+      default '/tmp'
+    end
+
+    option :verbose do
+      short '-v'
+      long  '--verbose'
+      desc  'Show me in excrutiating detail what is happening'
+    end
+
+    option :write do
+      long  '--write'
+      desc  'Dump all weights out to JSON files for the dashboard'
+    end
   end
 
-
-  option :write, :required => false do
-    long  '--write'
-    desc  'Dump all weights out to JSON files for the dashboard'
-  end
+  options = {
+    :provider  => Choice['provider'],
+    :target    => Choice['target'],
+    :mode      => Choice['mode'],
+    :weight    => Choice['weight'],
+    :show      => Choice['show'],
+    :verbose   => Choice['verbose'],
+    :write     => Choice['write'],
+    :config    => Choice['config'],
+    :output_dir  => Choice['output_dir'],
+  }
+  return options
 end
 
-options[:provider] = Choice.choices[:provider] unless !Choice.choices[:provider]
-options[:target] = Choice.choices[:target] unless !Choice.choices[:target]
-options[:mode] = Choice.choices[:mode] unless !Choice.choices[:mode]
-options[:weight] = Choice.choices[:weight] unless !Choice.choices[:weight]
-options[:show] = Choice.choices[:show] unless !Choice.choices[:show]
-options[:verbose] = Choice.choices[:verbose] unless !Choice.choices[:verbose]
-options[:write] = Choice.choices[:write] unless !Choice.choices[:write]
-
-unless (options.has_key?(:target) && options[:show]) ||
-    (options.has_key?(:target) && options.has_key?(:write)) ||
-    (options.has_key?(:target) && options.has_key?(:provider) && options.has_key?(:weight)) ||
-    (options.has_key?(:target) && options.has_key?(:provider) && options.has_key?(:mode))
-  Choice.help
-end
+
+# parse options and validate them
+options = parse_options
+config = load_config(options[:config])
+validate_options(config, options)
 
 # trap SIGINT and return a clean exit message rather than stack trace
 Signal.trap('INT') {
@@ -93,36 +123,31 @@ Signal.trap('INT') {
   exit
 }
 
-## action starts here
+# action starts here
 
-target = CONFIG['targets'][options[:target]]
+target = config['targets'][options[:target]]
 
-tm = CDNControl::TrafficManager.new(CONFIG,target, options[:verbose])
+tm = CDNControl::TrafficManager.new(config, target, options[:verbose])
 
-if options[:show]
-  tm.show_balance
-end
+tm.show_balance if options[:show]
 
-if options[:write]
-  tm.dump_weights(options[:target],OUTPUT_PATH)
-end
+tm.dump_weights(options[:target], options[:output_dir]) if options[:write]
 
-if options.has_key?(:provider) && options.has_key?(:weight)
+if options[:provider] && options[:weight]
   tm.show_balance("CURRENT LIVE WEIGHTS")
   tm.set_weight(options[:provider], options[:weight])
   tm.show_balance("NODE WEIGHTS AFTER CHANGE")
-  tm.dump_weights(options[:target],OUTPUT_PATH)
-
+  tm.dump_weights(options[:target], options[:output_dir])
 end
 
-if options.has_key?(:provider) && options.has_key?(:mode)
+if options[:provider] && options[:mode]
   tm.show_balance("CURRENT SERVE MODES AND WEIGHTS")
   tm.set_serve_mode(options[:provider], options[:mode])
   tm.show_balance("NODE SERVE MODES AFTER CHANGE")
-  tm.dump_weights(options[:target],OUTPUT_PATH)
+  tm.dump_weights(options[:target], options[:output_dir])
 end
 
 # display a nag if configured
-if options[:show] != true && CONFIG['targets'][options[:target]].has_key?('nag')
-  puts "** NOTE: #{CONFIG['targets'][options[:target]]['nag']}"
+if !options[:show] && target.has_key?('nag')
+  puts "** NOTE: #{target['nag']}"
 end

data/cdncontrol.gemspec

@@ -2,12 +2,13 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'cdn_control'
-  gem.version       = '0.0.9'
+  gem.version       = '0.0.10'
   gem.authors       = ["Jon Cowie", "Marcus Barczak"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/etsy/cdncontrol'
   gem.summary       = "Tool for managing multiple CDN balances on Dyn's GSLB"
   gem.description   = "Tool for managing multiple CDN balances on Dyn's GSLB"
+  gem.license = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/cdncontrol/trafficmanager.rb

@@ -120,7 +120,7 @@ module CDNControl
 
           # Make a thread-local connection to dyn, so that we open many
           # connections at once.
-          dyn_conn = DynectRest.new('etsy', @config['username'], @config['password'], @zone)
+          dyn_conn = DynectRest.new(@config['organization'], @config['username'], @config['password'], @zone)
           pool = dyn_conn.get(path)
 
           pool.each do |address|
@@ -294,4 +294,4 @@ module CDNControl
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdncontrol
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jon Cowie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynect_rest
@@ -70,7 +70,8 @@ files:
 - cdncontrol.gemspec
 - lib/cdncontrol/trafficmanager.rb
 homepage: https://github.com/etsy/cdncontrol
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []