samovar 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5439e3891e6619b96a1c07a1e47da8566e670c21fc5d8cbb083cc256c302cbb3
-  data.tar.gz: e6a3830369c9f274e1e968205e2b172bbfefec4c1c9780637e2bdd9d8e22a252
+  metadata.gz: 6e30e7064ff47b5ddb9d3461d291513e310fe7000d96abf00c473447d76c4f17
+  data.tar.gz: 3ec1e17b743863c3df573f959450922c9aec4fcedbf4fe8a690657effcc643f6
 SHA512:
-  metadata.gz: 3555993209a03ec7ed58c015391675a5ba4b04552b2a5e82116590431afffd435f77bf64155cfff5ca5cb177c4f6ea744f85e11a93647fc379cc51b131fbf155
-  data.tar.gz: ca79ebbc4254117b212ff5274a6d5bcd685ee599f4125f031dffdbbec81d5122fe2b1e0b63cb586580d4c429a5c4513104fd55a9ecbdf3ffd2c76165f7bd565c
+  metadata.gz: 16adeb378b0451726310d57f76b7223c37a51a43fbf21d1348c3d309b94ae1b99fb943736362c3c66f0b1c651630982f9a5eba5b32bfb8202c0704370e67a6cc
+  data.tar.gz: b9bbcfbdc77d330992c47eebfdb10c612d57f140ef0b6e8f97204e3d67d2ccf2f020313cdf54c816122cebb279c82a315db40820d60ef74f41de118c7f5d4873

data/lib/samovar/command.rb

@@ -46,6 +46,11 @@ module Samovar
 		end
 		
 		def self.append(row)
+			if method_defined?(row.key, false)
+				warning "Method for key #{row.key} is already defined!", caller
+				# raise ArgumentError, "Method for key #{row.key} is already defined!"
+			end
+			
 			attr_accessor(row.key) if row.respond_to?(:key)
 			
 			self.table << row

data/lib/samovar/flags.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2023, by Samuel Williams.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module Samovar
 	class Flags
 		def initialize(text)
 			@text = text
 			
-			@ordered = text.split(/\s+\|\s+/).map{|part| Flag.new(part)}
+			@ordered = text.split(/\s+\|\s+/).map{|part| Flag.parse(part)}
 		end
 		
 		def each(&block)
@@ -21,7 +21,7 @@ module Samovar
 		
 		# Whether or not this flag should have a true/false value if not specified otherwise.
 		def boolean?
-			@ordered.count == 1 and @ordered.first.value.nil?
+			@ordered.count == 1 and @ordered.first.boolean?
 		end
 		
 		def count
@@ -29,12 +29,13 @@ module Samovar
 		end
 		
 		def to_s
-			'[' + @ordered.join(' | ') + ']'
+			"[#{@ordered.join(' | ')}]"
 		end
 		
 		def parse(input)
 			@ordered.each do |flag|
-				if result = flag.parse(input)
+				result = flag.parse(input)
+				if result != nil
 					return result
 				end
 			end
@@ -44,45 +45,93 @@ module Samovar
 	end
 	
 	class Flag
-		def initialize(text)
-			@text = text
-			
+		def self.parse(text)
 			if text =~ /(.*?)\s(\<.*?\>)/
-				@prefix = $1
-				@value = $2
+				ValueFlag.new(text, $1, $2)
+			elsif text =~ /--\[no\]-(.*?)$/
+				BooleanFlag.new(text, "--#{$1}")
 			else
-				@prefix = @text
-				@value = nil
+				ValueFlag.new(text, text, nil)
 			end
-			
-			*@alternatives, @prefix = @prefix.split('/')
+		end
+		
+		def initialize(text, prefix, alternatives = nil)
+			@text = text
+			@prefix = prefix
+			@alternatives = alternatives
 		end
 		
 		attr :text
 		attr :prefix
 		attr :alternatives
-		attr :value
 		
 		def to_s
 			@text
 		end
 		
-		def prefix?(token)
-			@prefix == token or @alternatives.include?(token)
-		end
-		
 		def key
 			@key ||= @prefix.sub(/^-*/, '').gsub('-', '_').to_sym
 		end
 		
+		def boolean?
+			false
+		end
+	end
+	
+	class ValueFlag < Flag
+		def initialize(text, prefix, value)
+			super(text, prefix)
+			
+			@value = value
+			
+			*@alternatives, @prefix = @prefix.split('/')
+		end
+		
+		attr :alternatives
+		attr :value
+		
+		def boolean?
+			@value.nil?
+		end
+		
+		def prefix?(token)
+			@prefix == token or @alternatives.include?(token)
+		end
+		
 		def parse(input)
 			if prefix?(input.first)
 				if @value
-					input.shift(2).last
+					return input.shift(2).last
 				else
-					input.shift; key
+					input.shift
+					return key
 				end
 			end
 		end
 	end
+	
+	class BooleanFlag < Flag
+		def initialize(text, prefix, value = nil)
+			super(text, prefix)
+			
+			@value = value
+			
+			@negated = @prefix.sub(/^--/, '--no-')
+			@alternatives = [@negated]
+		end
+		
+		def prefix?(token)
+			@prefix == token or @negated == token
+		end
+		
+		def parse(input)
+			if input.first == @prefix
+				input.shift
+				return true
+			elsif input.first == @negated
+				input.shift
+				return false
+			end
+		end
+	end
 end

data/lib/samovar/option.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'flags'
 
@@ -66,7 +66,8 @@ module Samovar
 		end
 		
 		def parse(input, parent = nil, default = nil)
-			if result = @flags.parse(input)
+			result = @flags.parse(input)
+			if result != nil
 				@value.nil? ? coerce(result) : @value
 			elsif default ||= @default
 				return default

data/lib/samovar/options.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2023, by Samuel Williams.
+# Copyright, 2016-2024, by Samuel Williams.
 
 require_relative 'option'
 
@@ -90,7 +90,9 @@ module Samovar
 			values = (default || @defaults).dup
 			
 			while option = @keyed[input.first]
-				if result = option.parse(input)
+				prefix = input.first
+				result = option.parse(input)
+				if result != nil
 					values[option.key] = result
 				end
 			end

data/lib/samovar/table.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2023, by Samuel Williams.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module Samovar
 	class Table
@@ -76,8 +76,9 @@ module Samovar
 				
 				current = parent.send(key)
 				
-				if result = row.parse(input, parent, current)
-					parent.send("#{row.key}=", result)
+				result = row.parse(input, parent, current)
+				if result != nil
+					parent.public_send("#{row.key}=", result)
 				end
 			end
 		end

data/lib/samovar/version.rb

@@ -5,5 +5,5 @@
 # Copyright, 2018, by Gabriel Mazetto.
 
 module Samovar
-	VERSION = "2.2.0"
+	VERSION = "2.3.0"
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2016-2023, by Samuel Williams.  
+Copyright, 2016-2024, by Samuel Williams.  
 Copyright, 2018, by Gabriel Mazetto.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/readme.md

@@ -188,7 +188,7 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 
 ### Contributor Covenant
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
 
 ## Future Work
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -68,48 +68,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 executables: []
@@ -150,14 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Samovar is a flexible option parser excellent support for sub-commands and