samovar 1.10.0 → 2.0.0

data/lib/samovar/options.rb

@@ -18,90 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'flags'
+require_relative 'option'
 
 module Samovar
-	class Option
-		def initialize(flags, description, key: nil, default: nil, value: nil, type: nil, &block)
-			@flags = Flags.new(flags)
-			@description = description
-			
-			if key
-				@key = key
-			else
-				@key = @flags.first.key
-			end
-			
-			@default = default
-			
-			# If the value is given, it overrides the user specified input.
-			@value = value
-			@value ||= true if @flags.boolean?
-			
-			@type = type
-			@block = block
-		end
-		
-		attr :flags
-		attr :description
-		attr :type
-		
-		attr :default
-		
-		attr :key
-		
-		def coerce_type(result)
-			if @type == Integer
-				Integer(result)
-			elsif @type == Float
-				Float(result)
-			elsif @type == Symbol
-				result.to_sym
-			elsif @type.respond_to? :call
-				@type.call(result)
-			elsif @type.respond_to? :new
-				@type.new(result)
-			end
-		end
-		
-		def coerce(result)
-			if @type
-				result = coerce_type(result)
-			end
-			
-			if @block
-				result = @block.call(result)
-			end
-			
-			return result
-		end
-		
-		def parse(input, default = @default)
-			if result = @flags.parse(input)
-				@value.nil? ? coerce(result) : @value
-			end || default
-		end
-		
-		def to_s
-			@flags
-		end
-		
-		def to_a
-			unless @default.nil?
-				[@flags, @description, "Default: #{@default}"]
-			else
-				[@flags, @description]
-			end
-		end
-	end
-	
 	class Options
 		def self.parse(*args, **options, &block)
 			options = self.new(*args, **options)
 			
 			options.instance_eval(&block) if block_given?
 			
-			return options
+			return options.freeze
 		end
 		
 		def initialize(title = "Options", key: :options)
@@ -116,13 +42,50 @@ module Samovar
 			@defaults = {}
 		end
 		
+		def initialize_dup(source)
+			super
+			
+			@ordered = @ordered.dup
+			@keyed = @keyed.dup
+			@defaults = @defaults.dup
+		end
+		
+		attr :title
+		attr :ordered
+		
 		attr :key
 		attr :defaults
 		
+		def freeze
+			return self if frozen?
+			
+			@ordered.freeze
+			@keyed.freeze
+			@defaults.freeze
+			
+			@ordered.each(&:freeze)
+			
+			super
+		end
+		
+		def each(&block)
+			@ordered.each(&block)
+		end
+		
+		def empty?
+			@ordered.empty?
+		end
+		
 		def option(*args, **options, &block)
 			self << Option.new(*args, **options, &block)
 		end
 		
+		def merge!(options)
+			options.each do |option|
+				self << option
+			end
+		end
+		
 		def << option
 			@ordered << option
 			option.flags.each do |flag|
@@ -138,7 +101,7 @@ module Samovar
 			end
 		end
 		
-		def parse(input, default)
+		def parse(input, parent = nil, default = nil)
 			values = (default || @defaults).dup
 			
 			while option = @keyed[input.first]

data/lib/samovar/output.rb

@@ -18,154 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'mapping/model'
-
-require 'event/terminal'
-
-module Samovar
-	module Output
-		class Header
-			def initialize(name, object)
-				@name = name
-				@object = object
-			end
-			
-			attr :name
-			attr :object
-			
-			def align(columns)
-				@object.command_line(@name)
-			end
-		end
-		
-		class Row < Array
-			def initialize(object)
-				@object = object
-				super object.to_a.collect(&:to_s)
-			end
-			
-			attr :object
-			
-			def align(columns)
-				self.collect.with_index do |value, index|
-					value.ljust(columns.widths[index])
-				end.join('  ')
-			end
-		end
-		
-		class Columns
-			def initialize(rows)
-				@rows = rows
-				@widths = calculate_widths(rows)
-			end
-			
-			attr :widths
-			
-			def calculate_widths(rows)
-				widths = []
-				
-				rows.each do |row|
-					row.each.with_index do |column, index|
-						(widths[index] ||= []) << column.size
-					end
-				end
-				
-				return widths.collect(&:max)
-			end
-		end
-		
-		class Rows
-			include Enumerable
-			
-			def initialize(level = 0)
-				@level = level
-				@rows = []
-			end
-			
-			attr :level
-			
-			def empty?
-				@rows.empty?
-			end
-			
-			def first
-				@rows.first
-			end
-			
-			def last
-				@rows.last
-			end
-			
-			def indentation
-				@indentation ||= "\t" * @level
-			end
-			
-			def each(ignore_nested: false, &block)
-				return to_enum(:each, ignore_nested: ignore_nested) unless block_given?
-				
-				@rows.each do |row|
-					if row.is_a?(self.class)
-						row.each(&block) unless ignore_nested
-					else
-						yield row, self
-					end
-				end
-			end
-			
-			def << object
-				@rows << Row.new(object)
-				
-				return self
-			end
-			
-			def columns
-				@columns ||= Columns.new(@rows.select{|row| row.is_a? Array})
-			end
-			
-			def nested(*args)
-				@rows << Header.new(*args)
-				
-				nested_rows = self.class.new(@level + 1)
-				
-				yield nested_rows
-				
-				@rows << nested_rows
-			end
-		end
-		
-		class DetailedFormatter < Mapping::Model
-			def self.print(rows, output)
-				self.new(rows, output).print
-			end
-			
-			def initialize(rows, output)
-				@rows = rows
-				@output = output
-				@width = 80
-				
-				@terminal = Event::Terminal.for(@output)
-				@terminal[:header] = @terminal.style(:blue, nil, :bright)
-				@terminal[:description] = @terminal.style(:blue)
-			end
-			
-			map(Header) do |header, rows|
-				@terminal.puts unless header == @rows.first
-				@terminal.puts "#{rows.indentation}#{header.object.command_line(header.name)}", style: :header
-				@terminal.puts "#{rows.indentation}\t#{header.object.description}", style: :description
-				@terminal.puts
-			end
-			
-			map(Row) do |row, rows|
-				@terminal.puts "#{rows.indentation}#{row.align(rows.columns)}"
-			end
-			
-			map(Rows) do |items|
-				items.collect{|row, rows| map(row, rows)}
-			end
-			
-			def print
-				map(@rows)
-			end
-		end
-	end
-end
+require_relative 'output/usage_formatter'

data/lib/samovar/{command/track_time.rb → output/columns.rb}

@@ -18,22 +18,27 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'time'
-
-require_relative 'terminal'
-
 module Samovar
-	class Command
-		def track_time
-			start_time = Time.now
+	module Output
+		class Columns
+			def initialize(rows)
+				@rows = rows
+				@widths = calculate_widths(rows)
+			end
 			
-			yield
-		ensure
-			end_time = Time.now
-			elapsed_time = end_time - start_time
+			attr :widths
 			
-			$stdout.flush
-			terminal.puts("Elapsed Time: %0.3fs" % elapsed_time, style: :summary)
+			def calculate_widths(rows)
+				widths = []
+				
+				rows.each do |row|
+					row.each.with_index do |column, index|
+						(widths[index] ||= []) << column.size
+					end
+				end
+				
+				return widths.collect(&:max)
+			end
 		end
 	end
 end

data/lib/samovar/{command/terminal.rb → output/header.rb}

@@ -18,14 +18,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'time'
-
 module Samovar
-	class Command
-		def terminal(output = $stderr)
-			Event::Terminal.for(output).tap do |terminal|
-				terminal[:command] = terminal.style(:blue)
-				terminal[:summary] = terminal.style(:magenta)
+	module Output
+		class Header
+			def initialize(name, object)
+				@name = name
+				@object = object
+			end
+			
+			attr :name
+			attr :object
+			
+			def align(columns)
+				@object.command_line(@name)
 			end
 		end
 	end

data/lib/samovar/output/row.rb

@@ -0,0 +1,38 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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.
+
+module Samovar
+	module Output
+		class Row < Array
+			def initialize(object)
+				@object = object
+				super object.to_a.collect(&:to_s)
+			end
+			
+			attr :object
+			
+			def align(columns)
+				self.collect.with_index do |value, index|
+					value.ljust(columns.widths[index])
+				end.join('  ')
+			end
+		end
+	end
+end

data/lib/samovar/output/rows.rb

@@ -0,0 +1,86 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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.
+
+require_relative 'header'
+require_relative 'columns'
+require_relative 'row'
+
+module Samovar
+	module Output
+		class Rows
+			include Enumerable
+			
+			def initialize(level = 0)
+				@level = level
+				@rows = []
+			end
+			
+			attr :level
+			
+			def empty?
+				@rows.empty?
+			end
+			
+			def first
+				@rows.first
+			end
+			
+			def last
+				@rows.last
+			end
+			
+			def indentation
+				@indentation ||= "\t" * @level
+			end
+			
+			def each(ignore_nested: false, &block)
+				return to_enum(:each, ignore_nested: ignore_nested) unless block_given?
+				
+				@rows.each do |row|
+					if row.is_a?(self.class)
+						row.each(&block) unless ignore_nested
+					else
+						yield row, self
+					end
+				end
+			end
+			
+			def << object
+				@rows << Row.new(object)
+				
+				return self
+			end
+			
+			def columns
+				@columns ||= Columns.new(@rows.select{|row| row.is_a? Array})
+			end
+			
+			def nested(*args)
+				@rows << Header.new(*args)
+				
+				nested_rows = self.class.new(@level + 1)
+				
+				yield nested_rows
+				
+				@rows << nested_rows
+			end
+		end
+	end
+end