samovar 1.10.0 → 2.0.0

data/spec/samovar/one_spec.rb

@@ -0,0 +1,49 @@
+# 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.
+
+require 'samovar/many'
+
+RSpec.describe Samovar::One do
+	let(:default) {"1"}
+	let(:input) {["2", "3", "4"]}
+	
+	subject{described_class.new(:thing, "a thing", default: default)}
+	
+	it "has string representation" do
+		expect(subject.to_s).to be == "<thing>"
+	end
+	
+	it "should have default" do
+		expect(subject.default).to be == default
+	end
+	
+	it "should use default" do
+		expect(subject.parse([])).to be == default
+	end
+	
+	it "should use specified default" do
+		expect(subject.parse([], nil, "2")).to be == "2"
+	end
+	
+	it "should not use default if input specified" do
+		expect(subject.parse(input)).to be == "2"
+		expect(input).to be == ["3", "4"]
+	end
+end

data/spec/samovar/options_spec.rb

@@ -1,3 +1,22 @@
+# 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.
 
 RSpec.describe Samovar::Options do
 	subject(:options) do
@@ -10,17 +29,17 @@ RSpec.describe Samovar::Options do
 	end
 	
 	it "should set defaults" do
-		values = options.parse([], nil)
+		values = options.parse([], nil, nil)
 		expect(values).to be == {x: 2}
 	end
 	
 	it "should preserve current values" do
-		values = options.parse([], {x: 1, y: 2, z: 3})
+		values = options.parse([], nil, {x: 1, y: 2, z: 3})
 		expect(values).to be == {x: 1, y: 2, z: 3}
 	end
 	
 	it "should update specified values" do
-		values = options.parse(['-x', 10], {x: 1, y: 2, z: 3})
+		values = options.parse(['-x', 10], nil, {x: 1, y: 2, z: 3})
 		expect(values).to be == {x: 10, y: 2, z: 3}
 	end
 	

data/spec/samovar/split_spec.rb

@@ -0,0 +1,49 @@
+# 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.
+
+require 'samovar/split'
+
+RSpec.describe Samovar::Split do
+	let(:default) {["1", "2", "3"]}
+	let(:input) {["2", "--", "3"]}
+	
+	subject{described_class.new(:arguments, "arguments", default: default)}
+	
+	it "has string representation" do
+		expect(subject.to_s).to be == "-- <arguments...>"
+	end
+	
+	it "should have default" do
+		expect(subject.default).to be == default
+	end
+	
+	it "should use default" do
+		expect(subject.parse([])).to be == default
+	end
+	
+	it "should use specified default" do
+		expect(subject.parse([], nil, ["2"])).to be == ["2"]
+	end
+	
+	it "should not use default if input specified" do
+		expect(subject.parse(input)).to be == ["3"]
+		expect(input).to be == ["2"]
+	end
+end

data/spec/samovar/table_spec.rb

@@ -0,0 +1,40 @@
+# 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.
+
+require 'samovar/table'
+require 'samovar/options'
+
+RSpec.describe Samovar::Table do
+	let(:parent) {described_class.new}
+	subject{described_class.new(parent)}
+	
+	it "can merge options" do
+		parent << Samovar::Options.parse
+		subject << Samovar::Options.parse do
+			option "--help"
+		end
+		
+		subject.merged
+		parent.merged
+		
+		expect(parent[:options]).to be_empty
+	end
+	
+end

data/spec/spec_helper.rb

@@ -1,6 +1,24 @@
+# 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.
 
 require 'covered/rspec'
-require "samovar"
 
 RSpec.configure do |config|
 	config.disable_monkey_patching!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping
@@ -109,25 +109,32 @@ files:
 - Rakefile
 - lib/samovar.rb
 - lib/samovar/command.rb
-- lib/samovar/command/system.rb
-- lib/samovar/command/terminal.rb
-- lib/samovar/command/track_time.rb
+- lib/samovar/error.rb
 - lib/samovar/failure.rb
 - lib/samovar/flags.rb
 - lib/samovar/many.rb
 - lib/samovar/nested.rb
 - lib/samovar/one.rb
+- lib/samovar/option.rb
 - lib/samovar/options.rb
 - lib/samovar/output.rb
-- lib/samovar/output/line_wrapper.rb
+- lib/samovar/output/columns.rb
+- lib/samovar/output/header.rb
+- lib/samovar/output/row.rb
+- lib/samovar/output/rows.rb
+- lib/samovar/output/usage_formatter.rb
 - lib/samovar/split.rb
 - lib/samovar/table.rb
 - lib/samovar/version.rb
 - samovar.gemspec
 - spec/samovar/coerce_spec.rb
 - spec/samovar/command_spec.rb
+- spec/samovar/many_spec.rb
 - spec/samovar/nested_spec.rb
+- spec/samovar/one_spec.rb
 - spec/samovar/options_spec.rb
+- spec/samovar/split_spec.rb
+- spec/samovar/table_spec.rb
 - spec/spec_helper.rb
 - teapot.png
 homepage: https://github.com/ioquatix/samovar
@@ -157,6 +164,10 @@ summary: Samovar is a flexible option parser excellent support for sub-commands
 test_files:
 - spec/samovar/coerce_spec.rb
 - spec/samovar/command_spec.rb
+- spec/samovar/many_spec.rb
 - spec/samovar/nested_spec.rb
+- spec/samovar/one_spec.rb
 - spec/samovar/options_spec.rb
+- spec/samovar/split_spec.rb
+- spec/samovar/table_spec.rb
 - spec/spec_helper.rb

data/lib/samovar/output/line_wrapper.rb

@@ -1,87 +0,0 @@
-# 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.
-
-module Samovar
-	module Output
-		# This is an incomplete implementation of an automatic line wrapping output buffer which handles any kind of output, provided it has special wrapping markers.
-		class LineWrapping
-			MARKER = "\e[0;0m".freeze
-			
-			def initialize(output, wrapping_width = 80, minimum_width = 20)
-				@output = output
-				@wrapping_width = wrapping_width
-				@minimum_width = minimum_width
-			end
-			
-			ESCAPE_SEQUENCE = /(.*?)(\e\[.*?m|$)/
-			
-			def printable_width(text)
-				text.size
-			end
-			
-			def wrap(line)
-				wrapping_offset = nil
-				offset = 0
-				buffer = String.new
-				lines = []
-				prefix = nil
-				
-				line.scan(ESCAPE_SEQUENCE) do |text, escape_sequence|
-					width = printable_width(text)
-					next_offset = offset + printable_width
-					
-					if next_offset > @wrapping_width
-						if wrapping_offset
-							text_wrap_offset = @wrapping_width - offset
-							
-							# This text flows past the end of the line and we have a valid wrapping offset. We need to wrap this text.
-							if best_split_index = text.rindex(/\s/, text_wrap_offset) and best_split_index >= @minimum_width
-								# We have enough space to wrap.
-								buffer << text[0...best_split_index]
-								lines << buffer
-								buffer = String.new()
-							else
-								# In this case we can't really wrap on the current line. We fall back to letting the terminal wrap.
-								return line
-							end
-						else
-							# We don't have a specific wrapping offset, and the text flows longer than the wrapping width. We can't do anything - let the terminal wrap.
-							return line
-						end
-					else
-						buffer << text << escape_sequence
-					end
-					
-					offset = next_offset
-					
-					if wrapping_offset.nil? and offset < @wrapping_width and escape_sequence == MARKER
-						wrapping_offset = offset
-					end
-				end
-			end
-			
-			def puts(*lines)
-				lines = lines.flat_map{|line| wrap(line)}
-				
-				@output.puts(*lines)
-			end
-		end
-	end
-end