apollo-crawler 0.0.41 → 0.0.42

data/bin/apollo-crawler

@@ -35,6 +35,7 @@ module Crawler
 		@optparser = nil
 		@plugins = nil
 		@formatters = nil
+		@formatter = nil
 
 		# Initializer - Constructor
 		def initialize
@@ -67,6 +68,10 @@ module Crawler
 					@options[:run_all] = true
 				end	
 
+				opts.on('-f', '--format [NAME]', "Formatter used") do |name|
+					@options[:formatter] = name
+				end
+
 				opts.on('-g', '--generate [NAME]', "Generate scaffold for new plugin") do |name|
 					@options[:generate_plugin] = name
 				end
@@ -85,6 +90,10 @@ module Crawler
 
 				opts.on('-l', '--list-plugins', 'List of plugins') do
 					@options[:list_plugins] = true
+				end
+
+				opts.on(nil, '--list-formatters', 'List of formatters available') do
+					@options[:list_formatters] = true
 				end				
 			end
 		end
@@ -263,6 +272,32 @@ module Crawler
 				register_formatters(dir)
 			end
 
+			# Set default formatter here
+			formatter_name = "json"
+			if(@options[:formatter])
+				formatter_name = @options[:formatter]
+			end
+
+			
+			# Look for specified formatter
+			f = @formatters.select { |k, v|
+				k.downcase == formatter_name.downcase
+			}
+
+			if(f)
+				@formatter = f[f.keys[0]] 
+			end
+
+			if(@options[:list_formatters])
+				headings = ['name', 'class']
+				rows = @formatters
+
+				table = Terminal::Table.new :headings => headings, :rows => rows
+				
+				puts table
+				return
+			end
+
 			if(@options[:list_plugins])
 				headings = ['name', 'class']
 				rows = @plugins
@@ -301,8 +336,11 @@ module Crawler
 					next
 				end
 
-				puts Apollo::Crawler::Formatters::Json.format(res)
+				# puts Apollo::Crawler::Formatters::Json.format(res)
 				# puts Apollo::Crawler::Formatters::Plain.format(res)
+				# puts Apollo::Crawler::Formatters::Table.format(res)
+
+				puts @formatter.format(res)
 			end
 		end
 	end

data/lib/apollo_crawler.rb

@@ -5,7 +5,9 @@ require 'apollo_crawler/formatter'
 require 'apollo_crawler/plugin'
 
 # Formatters
+require 'apollo_crawler/formatters/formatter_json'
 require 'apollo_crawler/formatters/formatter_plain'
+require 'apollo_crawler/formatters/formatter_table'
 
 # Plugins
 require 'apollo_crawler/plugins/alexa_com/alexa'

data/lib/apollo_crawler/formatters/formatter_json.rb

@@ -7,7 +7,7 @@ module Apollo
 		module Formatters
 			class Json < Formatter
 				def format(obj)
-					return Plain.format(obj)
+					return Json.format(obj)
 				end
 
 				def self.format(obj)

data/lib/apollo_crawler/formatters/formatter_table.rb

@@ -0,0 +1,20 @@
+require 'terminal-table'
+
+require File.join(File.dirname(__FILE__), '..', 'formatter') 
+
+module Apollo
+	module Crawler
+		module Formatters
+			class Table < Formatter
+				def format(obj)
+					return Table.format(obj)
+				end
+
+				def self.format(obj)
+					table = Terminal::Table.new :rows => obj[:data]
+					return table
+				end
+			end
+		end # Formatters
+	end # Crawler
+end # Apollo

data/lib/apollo_crawler/version.rb

@@ -1,5 +1,5 @@
 module Apollo
 	module Crawler
-		VERSION = '0.0.41'
+		VERSION = '0.0.42'
 	end # Crawler
 end # Apollo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-crawler
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -228,6 +228,7 @@ extra_rdoc_files: []
 files:
 - ./lib/apollo_crawler/formatters/formatter_plain.rb
 - ./lib/apollo_crawler/formatters/formatter_json.rb
+- ./lib/apollo_crawler/formatters/formatter_table.rb
 - ./lib/apollo_crawler/version.rb
 - ./lib/apollo_crawler/crawler.rb
 - ./lib/apollo_crawler/formatter.rb