gestio2masq 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee63c9bc04ce277b3a8a20388b3127a18d12f66b
-  data.tar.gz: a2a5e7d0554110a056e6cd1dd03a83201837f59b
+  metadata.gz: 65088fa3e4ed65a2ce64d3dcf84d9cce96e409d8
+  data.tar.gz: 2f89247a9a85e2d09d1c91f831e5c62dea4610da
 SHA512:
-  metadata.gz: 87cb0c1c6f6ccaf2987d8704bc69d75e0eff99b1a06af9a7f9e7147b85c3fb275249a6cb30ad737f56cf4f4dc06b5711ad44123c9ec7fdeca4176d216ecd7d72
-  data.tar.gz: 23ce26dbd432af58f6a24a7364fdc4b31cfbcd4344db0eee084f0a43ccd36bf9062e95eecf3202aa452148ec24b13255873795e1286268e18fb6f40e27a58275
+  metadata.gz: c8359539bea228722fbfe131c4513cbfd7bc6c91b310b0955dca400ac9d297d1b050edd6fffc20983911c7862ec263c93de3b2f5ac7b8b1df43323f4ee917980
+  data.tar.gz: 4d5dc36294f46f5cf8000ff6aec95787963dfeef938e2a7ddc16a85c8bfdb060efa685dfdcc2e288bd917eb2c1f94bdcbece1c93d64d8883f95a6940cef8a174

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 gemspec
 gem "mysql2"
 gem "ipaddress"
+gem "trollop"

data/README.md

@@ -1,4 +1,5 @@
 # Gestio2masq
+[![Gem Version](https://badge.fury.io/rb/gestio2masq.svg)](http://badge.fury.io/rb/gestio2masq)
 
 gestio2masq generates dnsmasq configuration files from gestioip mysql databases. Or at least, it does this
   *for me*.  YMMV.

data/exe/gestio2masq

@@ -1,27 +1,58 @@
 #!/usr/bin/env ruby
 require 'mysql2'
 require 'ipaddress'
-require 'json'
+require 'yaml'
+require 'trollop'
 
-config_file = '/etc/gestio2masq.conf'
-begin
-	config = JSON.parse(File.read(config_file))
-rescue
-	puts %Q(Error reading config from file #{config_file})
-	exit(status=1)
+defaults = {
+    :config => '/etc/gestio2masq.conf',
+    :destdir => '/etc',
+    :sqlhost => 'localhost',
+    :database => 'gestioip',
+    :sqluser => 'root'
+}
+
+opts = Trollop::options do
+  opt :config,   'Config file path',  :short=>'c', :type=>:string
+  opt :destdir,  'Destination dir',   :short=>'t', :type=>:string
+  opt :sqlhost,  'Database host',     :short=>'h', :type=>:string
+  opt :database, 'Database name',     :short=>'d', :type=>:string
+  opt :sqluser,  'Database user',     :short=>'u', :type=>:string
+  opt :sqlpass,  'Database password', :short=>'p', :type=>:string
+end
+
+config_file = opts[:config]||defaults[:config]
+
+config = nil
+if File.exist?(config_file)
+  begin
+  	config = YAML.load(File.read(config_file))
+  rescue => detail
+    puts detail.backtrace
+  	puts %Q(Error reading config from file #{config_file})
+    exit(1)
+  end
+end
+
+if config.nil? or (config.class != Hash)
+  config = Hash.new
+else
+  # symbolize hash keys (json format compatibility)
+  config = Hash[config.map{|(k,v)| [k.to_sym,v]}]
 end
 
-dest_dir = config['destdir']
+# Precedence (low to high): defaults, config file, command line
+config = defaults.merge(config).merge(Hash(opts.select {|k,v| !v.nil?}))
 
 begin
 	mysql = Mysql2::Client.new(
-		 :host => config['sqlhost'],
-		 :username => config['sqluser'],
-		 :password => config['sqlpass'],
-		 :database => config['database']
+		 :host => config[:sqlhost],
+		 :username => config[:sqluser],
+		 :password => config[:sqlpass],
+		 :database => config[:database]
 	)
 rescue
-	puts %Q(Error connecting to database #{config['database']} on host #{config['sqlhost']} as #{config['sqluser']}.)
+	puts %Q(Error connecting to database #{config[:database]} on host #{config[:sqlhost]} as #{config[:sqluser]}.)
 	exit(status=1)
 end
 
@@ -83,18 +114,18 @@ hosts_data.each { |host|
 }
 puts "="*80
 puts "RANGES"
-File.new(%Q(#{dest_dir}/dnsmasq.d/ranges),'w').puts(ranges_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq.d/ranges),'w').puts(ranges_entries.join("\n"))
 puts(ranges_entries.join("\n"))
 puts "="*80
 puts "CNAMES"
-File.new(%Q(#{dest_dir}/dnsmasq.d/cnames),'w').puts(cnames_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq.d/cnames),'w').puts(cnames_entries.join("\n"))
 puts(cnames_entries.join("\n"))
 puts "="*80
 puts "DHCP HOSTS"
-File.new(%Q(#{dest_dir}/dnsmasq-dhcp-hosts.conf),'w').puts(dhcp_hosts_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq-dhcp-hosts.conf),'w').puts(dhcp_hosts_entries.join("\n"))
 puts(dhcp_hosts_entries.join("\n"))
 puts "="*80
 puts "HOSTS"
-File.new(%Q(#{dest_dir}/dnsmasq-hosts.conf),'w').puts(hosts_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq-hosts.conf),'w').puts(hosts_entries.join("\n"))
 puts(hosts_entries.join("\n"))
 

data/gestio2masq.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "gestio2masq"
-  spec.version       = '0.0.7'
+  spec.version       = '0.1.0'
   spec.authors       = ["svdasein"]
   spec.email         = ["svdasein@github"]
 
   spec.summary       = %q{Executable that generates DNSmasq conifguration files from Gestioip data}
-  spec.description   = %q{This gem provides a executable that generates dnsmasq dns and dhcp configuration from a gestioip\
-database.  Currently only mysql databases are supported}
+  spec.description   = %q{This gem provides an executable that generates dnsmasq dns and dhcp configuration from a
+gestioip mysql database.}
   spec.homepage      = "http://github.com/svdasein/gestio2masq"
   spec.license       = "MIT"
 

data/lib/gestio2masq/CHANGELOG

@@ -0,0 +1,35 @@
+0.1.0
+
+* Added defaults and command line options.
+
+defaults = {
+    :config => '/etc/gestio2masq.conf',
+    :destdir => '/etc',
+    :sqlhost => 'localhost',
+    :database => 'gestioip',
+    :sqluser => 'root'
+}
+
+
+gestio2masq --help
+Options:
+  -c, --config=<s>      Config file path
+  -t, --destdir=<s>     Destination dir
+  -h, --sqlhost=<s>     Database host
+  -d, --database=<s>    Database name
+  -u, --sqluser=<s>     Database user
+  -p, --sqlpass=<s>     Database password
+  -e, --help            Show this message
+
+
+Order of precedence, low to high:
+
+defaults
+config file values
+command line options
+
+
+* Changed config file format to YAML. Note that the JSON form will still work, but you should really
+  convert it to YAML.
+
+* got rid of dest_dir; just using config hash directly

data/lib/gestio2masq/examples/gestio2masq.conf

@@ -1,7 +1,7 @@
-{
-  "sqlhost":"<ipaddr>",
-  "sqluser":"<username>",
-  "sqlpass":"<password>",
-  "database":"gestioip",
-  "destdir":"/etc"
-}
+---
+:database: gestioip
+:sqlhost: <ipaddr>
+:sqluser: <username>
+:sqlpass: <password>
+:destdir: "/etc"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gestio2masq
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - svdasein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,8 +39,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 description: |-
-  This gem provides a executable that generates dnsmasq dns and dhcp configuration from a gestioip\
-  database.  Currently only mysql databases are supported
+  This gem provides an executable that generates dnsmasq dns and dhcp configuration from a
+  gestioip mysql database.
 email:
 - svdasein@github
 executables:
@@ -56,6 +56,7 @@ files:
 - Rakefile
 - exe/gestio2masq
 - gestio2masq.gemspec
+- lib/gestio2masq/CHANGELOG
 - lib/gestio2masq/examples/gestio2masq.conf
 homepage: http://github.com/svdasein/gestio2masq
 licenses: