infoblocks 0.0.2 → 0.1.0

data/.gitignore

@@ -2,3 +2,5 @@ Gemfile.lock
 infoblocks.cfg
 results.html
 pkg
+test/toy.rb
+*.swp

data/bin/infoblocks

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 require 'gli'
-require 'infoblocks'
+require 'highline/import'
 require 'infoblox'
+require 'infoblocks'
 
 include GLI::App
 
@@ -18,7 +19,7 @@ flag [:user,:u]
 
 desc 'Password for Infoblox WAPI'
 arg_name '<password>'
-flag [:pass,:p]
+flag [:pass,:p], :mask => true
 
 desc 'Host or base URL for Infoblox WAPI'
 arg_name '<hostname>'
@@ -31,14 +32,27 @@ command :host do |c|
   c.desc 'Adds host object'
   c.arg_name '<hostname> <ip_address>'
   c.command :add do |subadd|
+
+    subadd.switch [:dns], :desc => 'Enables/Disables DNS for this record.', :default_value => true, :negatable => true
+    subadd.flag [:dhcpmac,:m], :desc => 'Mac address to enable DHCP.', :must_match => /^((\h{2}([:-]|$)){6})|(\h{12})$/
+    subadd.flag [:aliases,:a], :desc => 'List of CNAMES for this record.', :type => Array
+
     subadd.action do |global_options,options,args|
       raise ArgumentError, "Invalid arguments" if args.length != 2
 
+      # the [0] on [:dhcpmac] is to deal with a bug in gli returning an array with :must_match option
+      ipv4addr = { :ipv4addr => args[1] }
+      ipv4addr.merge!({
+                  :mac => options[:dhcpmac][0].scan(/\h{2}/).join(':'),   # infoblox only takes : seperated macs
+                  :configure_for_dhcp => true
+               }) unless options[:dhcpmac].nil?
+
       hostobj = Infoblox::Host.new({
                   :connection => @connection,
                   :name => args[0],
-                  :ipv4addrs => [{ :ipv4addr => args[1] }],
-                  :configure_for_dns => true,
+                  :ipv4addrs => [ipv4addr],
+                  :configure_for_dns => options[:dns],
+                  :aliases => options[:aliases],
                   :view => options[:view]
                 })  
       hostobj.post
@@ -90,9 +104,10 @@ command :search do |c|
 end
 
 pre do |global,command,options,args|
-  [:user,:pass,:host].each do |required|
+  [:user,:host].each do |required|
      raise ArgumentError, "Missing #{required} argument." unless global[required]
   end
+  global[:pass] ||= ask("Password:") { |q| q.echo = false }
   @connection = Infoblox::Connection.new(:username => global[:user], :password => global[:pass], :host => global[:host])
   true
 end

data/infoblocks.gemspec

@@ -22,5 +22,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rdoc')
   s.add_development_dependency('aruba')
   s.add_runtime_dependency('gli','2.9.0')
-  s.add_runtime_dependency('infoblox','0.2.6')
+  s.add_runtime_dependency('infoblox','0.2.11')
+  s.add_runtime_dependency('highline','1.6.21')
 end

data/lib/infoblocks/version.rb

@@ -1,3 +1,3 @@
 module Infoblocks
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infoblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.11
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.21
 description: A frontend built in GLI that uses the Infoblox gem to make WAPI calls
   against any infoblox device.
 email: srees@enova.com