iosparse 0.0.4 → 0.0.5

data/iosparse.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iosparse"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Mizrahi"]
-  s.date = "2013-05-01"
+  s.date = "2013-05-02"
   s.description = "Parse Cisco IOS configurations"
   s.email = "codemunchies@gmail.com"
   s.files = ["lib/iosparse.rb", "iosparse.gemspec", "Gemfile", "README.md"]
@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/codemunchies/iosparse"
   s.rubygems_version = "1.8.25"
   s.summary = "Parse Cisco IOS configurations"
+  s.license = "GPL-3"
 end
 

data/lib/iosparse.rb

@@ -7,11 +7,18 @@ class IOSParse
 		# Store all blocks in the configuration
 		@blocks = Array.new
 		# Load the file
-		config = File.open(filename, 'r')
-		# Stream IO.read the file and scan for blocks, lines inbetween "!"
-		IO.read(config).scan(/(^[^!]+)/).each do |block|
-			# Push the blocks to the @blocks array
-			@blocks << block
+		begin
+			config = File.open(filename, 'r')
+			# Stream IO.read the file and scan for blocks, lines inbetween "!"
+			IO.read(config).scan(/(^[^!]+)/).each do |block|
+				# Push the blocks to the @blocks array
+				@blocks << block
+			end
+		rescue
+			# TODO: raise an error here 'bad file or path'
+		ensure
+			# Make sure we close the file
+			config.close
 		end
 	end
 
@@ -68,7 +75,7 @@ class IOSParse
 	#
 	# Find all object-groups
 	#
-	def object_group
+	def object_groups
 		# Regex to parse out object-groups
 		group = /object-group[\s\S]+/
 		# Call find_blocks() passing regex, parent name, and parse boolean
@@ -85,7 +92,7 @@ class IOSParse
 		output = Array.new
 		@blocks.each do |block|
 			# Use regex to filter via scan() and flatten then push to array
-			output << block.to_s.scan(filter).flatten if block.to_s.include?(parent)
+			output << normalize_block(block.to_s.scan(filter).flatten) if block.to_s.include?(parent)
 		end
 		# Some parents are not within "!" blocks and require some extra work
 		if parse == true then
@@ -107,7 +114,7 @@ class IOSParse
 			block.to_s.match(filter).to_s.split('\n').each do |line|
 				# Skip unless the parent is in the line
 				next unless line.match(filter)
-				# Push matches to array
+				# Push matches to array and normalize the matched lines
 				output << normalize_line(line.match(filter))
 			end
 		end
@@ -152,22 +159,19 @@ class IOSParse
 
 	#
 	# Normalize block to standardize returned arrays
+	# All new line characters should be '\n'
 	#
-	def normalize_block(block)
-		# Array to store normalized data
-		output = Array.new
-		block.each do |data|
-			# Normalize data
-			output << "[\"#{data}\\\\n\"]"
-		end
-		# Return the normalized array
-		output
+	def normalize_block(data)
+		# Return normalized data
+		data.to_s.gsub("\\\\n", '\n') if data.to_s.include?('\\\\n')
 	end
 
 	#
 	# Normalize line to standardize returned arrays
+	# All new line characters should be '\n'
+	#
 	def normalize_line(data)
 		# Return normalized data
-		"[\"#{data}\\\\n\"]"
+		"[\"#{data}\\n\"]" unless data.to_s.include?('\n')
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iosparse
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Parse Cisco IOS configurations
 email: codemunchies@gmail.com
@@ -22,7 +22,8 @@ files:
 - Gemfile
 - README.md
 homepage: http://github.com/codemunchies/iosparse
-licenses: []
+licenses:
+- GPL-3
 post_install_message: 
 rdoc_options: []
 require_paths: