switches.rb 0.10.3 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b9c36e31d7118656c21aabaf9ba11bbce49bf412c8162bc846b498e2df4436
-  data.tar.gz: 9e80ffa19bdba18e233a545823feda717cc929d894520c25e6c4c47727725a79
+  metadata.gz: 073acfd47105841bff0a6643eebf2a8f1af398224feac75af268715a7dc666fa
+  data.tar.gz: ed0d87dd771ff98dbf4da3f8622fc6c6622ad78a630ec3c1f1108b07416c89cf
 SHA512:
-  metadata.gz: 17a0546157353bbbd9de4a0139097cff70d4551c528e1203749c7bafe0195c4553ead66fd229082e6bc9b02eb43d9cacaaed3927279640608dca6bdfcb178c13
-  data.tar.gz: 07cd0a479fe6e0ec7887e01e5b96652d1ba80d3062fc76d43e3433990751b806236ce9902531c7b8dc750560fb320c96ba39445d02c6a8fcf7fe03afef9e04f2
+  metadata.gz: 5f4d4da5a5632926928b9bb357d1bad5bfc7e34f4e727d59887cd0ead5b7fd0b01c1de5468f563cea9137ca0bc730715026624b85ee71a7bd176ac3fe78193b6
+  data.tar.gz: 15d4316951b1ddb6e7bb5647e90964b1df3720d7b43d3313034a99f134d41008e91711f7c603654c64b9aba3a43c4e9daa6507333ee6f6a9ee7bbe3001498e8b

data/CHANGELOG

@@ -1,5 +1,24 @@
 # CHANGELOG
 
+## 20260816
+
+0.10.5: Specify and document that a multi-word switch may be supplied hyphenated, and name that form when it is missing.
+
+1. + spec/all.rb: multi-word switches, in both their underscored and their hyphenated form, for a boolean, an optional argument (#set), a required argument (#set!) and a required switch (#required); that either form counts as supplied for a required switch; and that the setting is named for the symbol declared whichever form was supplied. This behaviour is OptionParser's rather than this library's — a long switch is filed under a lookup key with its underscores turned to hyphens, and whatever is supplied is converted the same way before the lookup, so --update_template and --update-template have always been the one switch. It went untested and undocumented here, which left it resting upon an implementation detail of a library this one only wraps. The specs now pin it, and would fail here rather than in a caller's script were it ever to change.
+2. ~ lib/Switches.rb: the missing-switch message names the hyphenated form, so a switch declared :access_token is reported as --access-token, in place of the --access_token built from the symbol verbatim. Cosmetic, and it says the form to prefer at a command line.
+3. ~ lib/Switches.rb: + Switches#switch_string, which builds the switch string for an attribute, in place of the identical construction #on_args and #check_required_switches each carried.
+4. ~ README.md: + a multi-word switch to the Usage section, and + a note recording where the behaviour comes from, that the setting is named for the symbol declared, and that declaring the attribute hyphenated buys nothing and costs the accessor.
+
+0.10.4: Declare ostruct as a runtime dependency, in place of installing it at require time.
+
+1. ~ lib/Switches.rb: require 'ostruct', in place of the require_gem 'ostruct' introduced in 0.10.0. require_gem rescues the LoadError and shells out to gem install, so the dependency went unannounced and was satisfied silently into whatever GEM_HOME was set — which, under a Homebrew formula's wrapper, means the program installing a gem into its own keg. A library should announce what it needs and fail loudly without it.
+2. ~ switches.rb.gemspec: + s.dependencies = ['ostruct'], declared as data via a dependencies= setter added to the local Gem::Specification reopening, alongside the development_dependencies= setter added in 0.10.3.
+3. - lib/Kernel/require_gem.rb and - lib/Thoran/Kernel/RequireGem/require_gem.rb, vendored in 0.10.0 for the require above and with no remaining user.
+4. ~ Gemfile: - gem 'ostruct', which the gemspec now supplies.
+5. ~ spec/all.rb: the gemspec spec asserted that no runtime dependencies were declared, and now asserts that ostruct is the only one.
+6. ~ lib/Switches.rb: the header's Dependencies section names ostruct, since the Standard Ruby Library no longer covers it.
+7. ~ .gitignore: + a header, + .claude, ~ /tmp/ to tmp/, and - /test/tmp/, which tmp/ now covers.
+
 ## 20260812
 
 0.10.3: Move the version into a constant, and add the standard version and gemspec tests.

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# ostruct is no longer a default gem as of Ruby 4.0, so it must be provided
-# explicitly under bundler.
-gem 'ostruct'

data/README.md

@@ -135,6 +135,12 @@ switches = Switches.new do |s|
   s.set(:a){'This is the -a switch.'}
 end
 
+# With a multi-word switch, which may be supplied in either its underscored or its hyphenated form
+switches = Switches.new do |s|
+  s.boolean(:update_template)
+end
+# --update_template and --update-template both set it, and the setting remains #update_template?
+
 # With a banner
 switches = Switches.new do |s|
   s.banner = 'Here is a banner for the switches.'
@@ -189,6 +195,7 @@ switches.class # => Hash
 - A `Switches` instance can't define a method whose name matches an `OptionParser` method, since such calls are forwarded to the underlying `OptionParser` instance.
 - There is a clear demarcation between whether a switch's argument is required and whether the switch itself is required.
 - The bang interface methods (for example `set!` and `required!`) modify the switch in place with a required argument, rather than relying on a default or a value set elsewhere and later.
+- A long switch whose name carries an underscore may be supplied in its hyphenated form as well, so `s.boolean(:update_template)` accepts both `--update_template` and `--update-template`. This comes from `OptionParser`, which files a long switch under a lookup key with its underscores turned to hyphens and applies the same conversion to whatever is supplied, so the two forms are one switch rather than two. The setting is named for the symbol declared, and so remains `#update_template?` whichever form was supplied. Declaring the attribute hyphenated, as `:'update-template'`, buys nothing and costs the accessor, which would then be reachable only through `#send`.
 
 ## Contributing
 

data/lib/Switches/VERSION.rb

@@ -2,5 +2,5 @@
 # Switches::VERSION
 
 class Switches
-  VERSION = '0.10.3'
+  VERSION = '0.10.5'
 end

data/lib/Switches.rb

@@ -12,13 +12,12 @@
 # 2. Do away with optional arguments entirely.  Since when does anyone want to specify a non-boolean switch and then supply no arguments anyway?...  OK, maybe sometimes, but this is pretty obscure IMO.  OK, bad idea.  These can be used as action oriented sub-commands.  
 # 3. Allow for any one of the switches OpenStruct methods to assign values for any of the other associated methods, so as it is more than a read once switch and can be used for storage through out the application; although this might be stepping on Attributes.rb's toes?...  
 
-# Dependencies: 
-# 1. Standard Ruby Library.  
+# Dependencies:
+# 1. Standard Ruby Library.
+# 2. ostruct, which ceased to be a default gem as of Ruby 4.0 and so is declared in the gemspec.
 
 require 'optparse'
-require 'Kernel/require_gem'
-
-require_gem 'ostruct'
+require 'ostruct'
 
 require_relative './Switches/VERSION'
 
@@ -285,12 +284,17 @@ class Switches
     end
   end
   
+  def switch_string(attr)
+    attr = attr.to_s
+    "-#{attr.long_switch? ? '-' : ''}#{attr.delete('?')}"
+  end
+  
   def on_args(requires_argument, options, *attrs, &block)
     on_args = []
     attrs.collect{|e| e.to_s}.each do |attr|
       @defaults[attr] = options[:default] if options[:default]
       @castings[attr] = (options[:cast] || options[:type] || options[:class]) if (options[:cast] || options[:type] || options[:class])
-      on_args << "-#{attr.long_switch? ? '-' : ''}#{attr.to_s.delete('?')}"
+      on_args << switch_string(attr)
     end
     if requires_argument
       on_args << (on_args.pop + ' REQUIRED_ARGUMENT')
@@ -311,7 +315,7 @@ class Switches
     messages = []
     @required_switches.each do |required_switch|
       unless supplied_switches.include?(required_switch)
-        messages << "required switch, -#{required_switch.long_switch? ? '-' : ''}#{required_switch.to_s.delete('?')}, is missing"
+        messages << "required switch, #{switch_string(required_switch).tr('_', '-')}, is missing"
       end
     end
     unless messages.empty?

data/spec/all.rb

@@ -164,6 +164,89 @@ describe Switches do
     end
   end
 
+  describe "multi-word switches" do
+    def build(switches_string = '')
+      ARGV.clear
+      switches_string.split.each{|a| ARGV << a}
+      Switches.new do |s|
+        s.boolean :update_template
+        s.set :access_token
+      end
+    end
+
+    it "sets a boolean switch supplied in its underscored form" do
+      expect(build('--update_template').update_template?).to eq(true)
+    end
+
+    it "sets a boolean switch supplied in its hyphenated form" do
+      expect(build('--update-template').update_template?).to eq(true)
+    end
+
+    it "sets a switch to the argument supplied in its underscored form" do
+      expect(build('--access_token abc123').access_token).to eq('abc123')
+    end
+
+    it "sets a switch to the argument supplied in its hyphenated form" do
+      expect(build('--access-token abc123').access_token).to eq('abc123')
+    end
+
+    it "names the setting for the symbol declared, whichever form is supplied" do
+      expect(build('--update-template --access-token abc123').to_h).to eq({update_template?: true, access_token: 'abc123'})
+    end
+  end
+
+  describe "multi-word switches with a required argument" do
+    def build(switches_string = '')
+      ARGV.clear
+      switches_string.split.each{|a| ARGV << a}
+      Switches.new do |s|
+        s.set! :access_token
+      end
+    end
+
+    it "sets the switch to the argument supplied in its underscored form" do
+      expect(build('--access_token abc123').access_token).to eq('abc123')
+    end
+
+    it "sets the switch to the argument supplied in its hyphenated form" do
+      expect(build('--access-token abc123').access_token).to eq('abc123')
+    end
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to the underscored form" do
+      expect{build('--access_token')}.to raise_error(OptionParser::MissingArgument)
+    end
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to the hyphenated form" do
+      expect{build('--access-token')}.to raise_error(OptionParser::MissingArgument)
+    end
+  end
+
+  describe "multi-word required switches" do
+    def build(switches_string = '')
+      ARGV.clear
+      switches_string.split.each{|a| ARGV << a}
+      Switches.new do |s|
+        s.required :access_token
+      end
+    end
+
+    it "counts the underscored form as supplied" do
+      expect(build('--access_token abc123').access_token).to eq('abc123')
+    end
+
+    it "counts the hyphenated form as supplied" do
+      expect(build('--access-token abc123').access_token).to eq('abc123')
+    end
+
+    it "raises RequiredSwitchMissing when neither form is supplied" do
+      expect{build}.to raise_error(RequiredSwitchMissing)
+    end
+
+    it "names the hyphenated form in the RequiredSwitchMissing message" do
+      expect{build}.to raise_error(RequiredSwitchMissing, /--access-token/)
+    end
+  end
+
   describe "#perform" do
     def build(switches_string = '', &block)
       ARGV.clear
@@ -257,8 +340,8 @@ describe 'switches.rb.gemspec' do
     expect(spec.version.to_s).to eq(Switches::VERSION)
   end
 
-  it "declares no runtime dependencies" do
-    expect(spec.runtime_dependencies.map(&:name).sort).to eq([])
+  it "declares ostruct as its only runtime dependency" do
+    expect(spec.runtime_dependencies.map(&:name).sort).to eq(%w{ostruct})
   end
 
   it "declares its development dependencies" do

data/switches.rb.gemspec

@@ -1,13 +1,17 @@
 require_relative './lib/Switches/VERSION'
 
 class Gem::Specification
+  def dependencies=(gems)
+    gems.each{|gem| add_dependency(*gem)}
+  end
+
   def development_dependencies=(gems)
     gems.each{|gem| add_development_dependency(*gem)}
   end
 end
 
 Gem::Specification.new do |s|
-  s.name = 'switches.rb' # I would have preferred 'switches', but there's a gem with the name of switches.
+  s.name = 'switches.rb'
   s.version = Switches::VERSION
 
   s.summary = "The easiest way to provide switches to a Ruby program."
@@ -19,11 +23,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.required_ruby_version = ">= 2.7.0"
-
-  s.development_dependencies = [
-    'rake',
-    'rspec'
-  ]
+  s.require_paths = ['lib']
 
   s.files = [
     'CHANGELOG',
@@ -36,7 +36,14 @@ Gem::Specification.new do |s|
     Dir['spec/**/*.rb'],
   ].flatten
 
-  s.require_paths = ['lib']
+  s.dependencies = [
+    'ostruct'
+  ]
+
+  s.development_dependencies = [
+    'rake',
+    'rspec'
+  ]
 
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/thoran/switches/issues",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switches.rb
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.5
 platform: ruby
 authors:
 - thoran
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -49,10 +63,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/Kernel/require_gem.rb
 - lib/Switches.rb
 - lib/Switches/VERSION.rb
-- lib/Thoran/Kernel/RequireGem/require_gem.rb
 - spec/all.rb
 - switches.rb.gemspec
 homepage: https://github.com/thoran/switches

data/lib/Kernel/require_gem.rb

@@ -1,7 +0,0 @@
-# Kernel/require_gem.rb
-# Kernel#require_gem
-
-# 20240613
-# 0.0.0
-
-require 'Thoran/Kernel/RequireGem/require_gem'

data/lib/Thoran/Kernel/RequireGem/require_gem.rb

@@ -1,27 +0,0 @@
-# Thoran/Kernel/RequireGem/require_gem.rb
-# Thoran::Kernel::RequireGem#require_gem.rb
-
-# 20240613
-# 0.0.0
-
-module Thoran
-  module Kernel
-    module RequireGem
-
-      def require_gem(load_string, gem_name: nil)
-        require load_string
-      rescue LoadError
-        if gem_name
-          system("gem install #{gem_name}")
-        else
-          system("gem install #{load_string}")
-        end
-        Gem.clear_paths
-        require load_string
-      end
-
-    end
-  end
-end
-
-Kernel.include(Thoran::Kernel::RequireGem)