gestio2masq 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 707eadd9d456b66e766ecf4fb7da5d743a023146
-  data.tar.gz: f306bbc0ea0066890c8135e0fe5d4854f5f3122f
+  metadata.gz: 8dfd30c9c5e99572bd37dc0794a998ba179f0b9d
+  data.tar.gz: fcc607f12edb58b03154303ce321e8ab20547e1a
 SHA512:
-  metadata.gz: f6e86eec27212da9bbeefbda1707dd1ba5dfc7684ff7ab0b2d374be41f61388d722e74fd827207988c2b4ce053c2800ca7ffade309ff526cf5663f1404b595e5
-  data.tar.gz: 3099a094533267bbc5c90f04e4dcfce76234b8525544a489ac74a3c7b6995a9fd75ce22a01a7d36bb2c4424d38302f5aab6344f834af9eb9f8462e39cdb50f41
+  metadata.gz: 93397dc8926c166729e80814d63eec42139100738431a99c326dec49fab9794a7d7560ce33738219195202bc5fbd64b94bc69ae92a399e626380bbf008223d7d
+  data.tar.gz: 996de291df6f8ee269f843a29c3fd63e471e20e18886d10734a24090cac549c053824e934652f54421b46ac93708cf17c196dd8f9218a31955791b8693ceaa5f

data/README.md

@@ -1,8 +1,9 @@
 # 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.
+gestio2masq generates [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) configuration files from [GestióIP](http://www.gestioip.net/) mysql databases.
+Or at least, it does this for *me*.  YMMV.
+
 
 
 ## Installation & Configuration
@@ -116,6 +117,10 @@ dhcp-hostsfile=/etc/dnsmasq-dhcp-hosts.conf
         -e, --help            Show this message
 
 
+## IRC
+
+**\#gestio2masq** on Freenode
+
 ## Contributing
 
 1. Fork it ( https://github.com/svdasein/gestio2masq/fork )

data/exe/gestio2masq

@@ -3,6 +3,7 @@ require 'mysql2'
 require 'ipaddress'
 require 'yaml'
 require 'trollop'
+require 'gestio2masq'
 
 defaults = {
     :config => '/etc/gestio2masq.conf',
@@ -13,6 +14,8 @@ defaults = {
 }
 
 opts = Trollop::options do
+  usage '[options]'
+  version %Q{Version #{Gestio2masq::VERSION}}
   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
@@ -27,10 +30,10 @@ config_file = opts[:config]||defaults[:config]
 config = nil
 if File.exist?(config_file)
   begin
-  	config = YAML.load(File.read(config_file))
+    config = YAML.load(File.read(config_file))
   rescue => detail
     puts detail.backtrace
-  	puts %Q(Error reading config from file #{config_file})
+    puts %Q(Error reading config from file #{config_file})
     exit(1)
   end
 end
@@ -71,6 +74,7 @@ nets_extra_data = mysql.query('select custom_net_column_entries.*,custom_net_col
 
 networks = Hash.new
 networks_data.each { |net|
+	# Merge custom network columns in with "regular" columns
 	nets_extra_data.select { |each| each[:net_id] == net[:red_num] } .each { |entry|
 		net[entry[:name].to_sym] = entry[:entry]
 	}
@@ -91,9 +95,11 @@ dhcp_hosts_entries = Array.new
 cnames_entries = Array.new
 hosts_data.each { |host|
 	host[:ipaddress] = IPAddress::IPv4.parse_u32(host[:ip].to_i)
+	# Merge custom host columns in with "regular" columns
 	hosts_extra_data.select { |each| each[:host_id] == host[:id] } .each { |entry|
 		host[entry[:name].to_sym] = entry[:entry]
 	}
+	# make hosts point to the network they belong to
 	host[:network] = networks[host[:red_num]]
 	if host[:hostname].size > 0
 		if host[:MAC]

data/gestio2masq.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gestio2masq/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "gestio2masq"
-  spec.version       = '0.1.3'
+  spec.version       = Gestio2masq::VERSION
   spec.authors       = ["svdasein"]
   spec.email         = ["svdasein@github"]
 
@@ -29,7 +30,7 @@ gestioip mysql database.}
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency 'trollop', '~> 2.1'
+  spec.add_runtime_dependency 'trollop', '~> 2.0'
   spec.add_runtime_dependency 'mysql2','~> 0.3'
   spec.add_runtime_dependency 'ipaddress','~> 0.8'
 end

data/lib/gestio2masq.rb

@@ -0,0 +1,5 @@
+require 'gestio2masq/version'
+
+module Gestio2masq
+
+end

data/lib/gestio2masq/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.4
+* Add license
+* readme updates
+* add to help text
+* add --version, module, etc
+
 0.1.3
 * Add gem runtime dep
 

data/lib/gestio2masq/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 David A. Parker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/gestio2masq/version.rb

@@ -0,0 +1,3 @@
+module Gestio2masq
+  VERSION='0.1.4'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gestio2masq
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - svdasein
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -98,8 +98,11 @@ files:
 - Rakefile
 - exe/gestio2masq
 - gestio2masq.gemspec
+- lib/gestio2masq.rb
 - lib/gestio2masq/CHANGELOG
+- lib/gestio2masq/LICENSE.txt
 - lib/gestio2masq/examples/gestio2masq.conf
+- lib/gestio2masq/version.rb
 homepage: http://github.com/svdasein/gestio2masq
 licenses:
 - MIT