openvpn_configurator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c1f39eb5fb9575fbd0cf3f65c293b2c85ba65773c840f6cf19a0c3a54c9f79
-  data.tar.gz: 88f0572ff291a1b5ec27d8bb66654a6671b4d54b2974ffdfc9d5d8f6265bf0cf
+  metadata.gz: c073a1db1e11279b2e6680209b50073208acb115ec7b43de8a3ea1fd0c85eea0
+  data.tar.gz: 02d6751e13f0aea73b77ddf980a7664a0ea80077e8871a7632d50806da41aec6
 SHA512:
-  metadata.gz: 14e4908a7f2b7f5d497e341fb429267cc5d33363514cf89c4ffde4411871864c37b4895006d514fb375a76f0c07352476b4d0f8284c05b92d1971c946bb72724
-  data.tar.gz: fc5de4cd52c552cdf919f0804d832004a0ff9d291efcacc1fa3a1c497e3be92388d84d5dd33dbd2f62c98648e271b7f5f4e3656767f0f32877691f532b6bf633
+  metadata.gz: bdc38e52cc7d0b04297972b2cd408fc0e765c778de8910f651ed17c3a1d437f9f1dabe1743b531d64ba75b5a9840837fb866a599015b2ebfb69004df9fe89536
+  data.tar.gz: 6781c969fe4866a5688a3dbed5af5fd306a5afb1230ffec5c96afd9cab514e134dbf05218dc1fadc3272ffefcc49604c7e538ef8bd499bfa77d7a6a8ec06dc7e

data/CHANGELOG.md

@@ -4,10 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2020-10-12
+## Added
+- Push group name onto pruned route comments.
+
+## Fixed
+- Improperly embed comments inside "push" directives in server mode.
+
 ## [1.1.0] - 2020-10-12
 ### Added
-- Support for `--client` option
-- Automatic pruning of overlapping/duplicate routes
+- Support for `--client` option.
+- Automatic pruning of overlapping/duplicate routes.
 
 ## [1.0.0] - 2020-04-28
 

data/lib/openvpn_configurator/route_gatherer.rb

@@ -99,8 +99,8 @@ module OpenVPNConfigurator
 
 		# @return [Hash<String, Array<NetAddr::IPv4Net, NetAddr::IPv6Net>]
 		def reduce_routes(routes)
-			seen_v4 = []
-			seen_v6 = []
+			seen_v4 = {}
+			seen_v6 = {}
 			reduction = false
 			result = {}
 			routes.each_pair do |name, entries|
@@ -115,12 +115,20 @@ module OpenVPNConfigurator
 							nil
 					end
 					if seen
-						covered = seen.find { |s| [1, 0].include? s.rel(entry) }
+						covered = nil
+						seen.each_pair do |seen_name, seen_entries|
+							found_entry = seen_entries.find { |s| [1, 0].include? s.rel(entry) }
+							if found_entry
+								covered = [seen_name, found_entry]
+								break
+							end
+						end
 						if covered
 							reduction = true
-							result[name].push Comment.new("Route #{entry} already covered by route #{covered}")
+							result[name].push Comment.new("Route #{entry} already covered by route #{covered[1]} (#{covered[0]})")
 						else
-							seen.push entry
+							seen[name] ||= []
+							seen[name].push entry
 							result[name].push entry
 						end
 					else
@@ -168,15 +176,15 @@ module OpenVPNConfigurator
 				routes[source].sort_by(&:to_s).each do |route|
 					directive = case route
 						when NetAddr::IPv4Net
-							format 'route%s%s', directive_indent, route.extended
+							format '%sroute%s%s%s', prefix, directive_indent, route.extended, postfix
 						when NetAddr::IPv6Net
-							format 'route-ipv6%s%s', directive_indent, route.to_s
+							format '%sroute-ipv6%s%s%s', prefix, directive_indent, route.to_s, postfix
 						when Comment
 							format '# %s', route.to_s
 						else
 							raise "Only supporting IPv4 and IPv6 networks presently, got #{route.inspect} instead"
 					end
-					result << format("%s%s%s", prefix, directive, postfix)
+					result << directive
 				end
 				result << ''
 			end

data/lib/openvpn_configurator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenVPNConfigurator
-	VERSION = '1.1.0'
+	VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvpn_configurator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aaron Ten Clay