switches.rb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d6b5c6bbad8c0a585b418ff83ad25394c9de5cbe1a37089484d8c5ca16ad2a
-  data.tar.gz: a5a3bda6bf97e2c8355c12e8113947a94523abe9f9e8d344f81fa3f6e4947d6f
+  metadata.gz: 8e900150793418981ab52b35828a2fc696a5e7b826d4eba77047d96cc7532dfe
+  data.tar.gz: f4e598c29f7dbaf2c61b8e685151732afba5770b94085cbe06a413f85151b692
 SHA512:
-  metadata.gz: fdb9781dc62a69ec53edb7e2d95ed7f83edc62079512e632af30a49a258831e1b35be02d8e81b74372664cf99d1e724f5f7b3747946dbdd76e5014bd863fae47
-  data.tar.gz: 5e7bca50700640d86c65c65355ffefa83480641fc7492141046f83d923403b0ac82efcb9da347db19ae0ea2a89ef36d44d195251341fc2ef688561b18f3e15d9
+  metadata.gz: fe23cc64afe81e073164650ef50b64ae208cfc57cc82a9e6e57efc4925f8cd87853b0b5726f2dea6cbe528cf9348fc1499e9e5fe6febf2e9f4348eb96a1b2e9e
+  data.tar.gz: 4ab5f810b80fc2716684aaa46481a2e83db7bf628a6a81bdfe25c4f1ed588eaf3fb090fd011e92df3592ec93962e2915b2ec3f0821c4d93081f04624e207a7cc

data/CHANGELOG

@@ -2,6 +2,15 @@
 
 ## 20260809
 
+0.10.1: Get the specs running again, under rspec 3 and rake.
+
+1. ~ spec/all.rb: rspec 3 syntax throughout, in place of the pre-rspec-3 #should ==, so the specs run at all.
+2. ~ spec/all.rb: the six raise expectations were written as switches.should{raise MissingArgument}, which asserts nothing and names a constant which doesn't exist; they now expect OptionParser::MissingArgument and RequiredSwitchMissing for real.
+3. ~ spec/all.rb: + specs for #perform and #perform!, which had been left pending, and - the Array#empty! alias, since ARGV.clear says it without patching Array.
+4. + Rakefile: an rspec task pointed at spec/all.rb, since the specs live in the one file rather than under the default spec/**/*_spec.rb, + a version task, and spec as the default task.
+5. ~ Gemfile: use gemspec rather than restate rspec, and + ostruct, which the bundle must provide for require_gem to find under Ruby 4.0.
+6. ~ switches.rb.gemspec: + rake as a development dependency and + Rakefile to the file list.
+
 0.10.0: Restore loading and building under Ruby 4.0, and bring the repo up to standard.
 
 1. ~ lib/Switches.rb: require ostruct through a vendored require_gem (+ lib/Kernel/require_gem.rb, + lib/Thoran/Kernel/RequireGem/require_gem.rb), so it no longer needs ostruct to be a default gem — which it stopped being as of Ruby 4.0 — nor require_gem to be found on RUBYLIB.

data/Gemfile

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

data/Rakefile

@@ -0,0 +1,14 @@
+# Rakefile
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/all.rb'
+end
+
+task default: :spec
+
+desc "Show version"
+task :version do
+  puts "switches.rb #{Gem::Specification.load('switches.rb.gemspec').version}"
+end

data/lib/Switches.rb

@@ -2,7 +2,7 @@
 # Switches
 
 # 20260809
-# 0.10.0
+# 0.10.1
 
 # Description: Switches provides for a nice wrapper to OptionParser to also act as a store for switches supplied.  
 

data/spec/all.rb

@@ -1,25 +1,17 @@
-require "#{File.dirname(__FILE__)}/../lib/Switches"
+# spec/all.rb
 
-class Array
-  
-  alias_method :empty!, :clear
-  
-end
+require_relative '../lib/Switches'
 
 describe Switches do
-  
   describe ".new" do
-    
-    it "should return an object of class Switches" do
-      Switches.new.class.should == Switches
+    it "returns an object of class Switches" do
+      expect(Switches.new.class).to eq(Switches)
     end
-    
   end
-  
+
   describe "#set" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '')
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
       Switches.new do |s|
         s.set :v?, :verbose?
@@ -27,196 +19,208 @@ describe Switches do
         s.set :host, :h
       end
     end
-    
-    it "should set a short boolean switch or flag to true when supplied with a short switch" do
-      setup('-v').v?.should == true
+
+    it "sets a short boolean switch to true when supplied with a short switch" do
+      expect(build('-v').v?).to eq(true)
     end
-    
-    it "should set a long boolean switch value to true when supplied with a short switch" do
-      setup('-v').verbose?.should == true
+
+    it "sets a long boolean switch to true when supplied with a short switch" do
+      expect(build('-v').verbose?).to eq(true)
     end
-    
-    it "should set a short boolean switch or flag to true when supplied with a long switch" do
-      setup('--verbose').v?.should == true
+
+    it "sets a short boolean switch to true when supplied with a long switch" do
+      expect(build('--verbose').v?).to eq(true)
     end
-    
-    it "should set a long boolean switch or flag to true when supplied with a long switch" do
-      setup('--verbose').verbose?.should == true
+
+    it "sets a long boolean switch to true when supplied with a long switch" do
+      expect(build('--verbose').verbose?).to eq(true)
     end
-    
-    it "should set a short switch value to the value supplied when supplied with a short switch" do
-      setup('-p 22').p.should == '22'
+
+    it "sets a short switch to the value supplied when supplied with a short switch" do
+      expect(build('-p 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the value supplied when supplied with a short switch" do
-      setup('-p 22').port.should == '22'
+
+    it "sets a long switch to the value supplied when supplied with a short switch" do
+      expect(build('-p 22').port).to eq('22')
     end
-    
-    it "should set a short switch value to the value supplied when supplied with a long switch" do
-      setup('--port 22').p.should == '22'
+
+    it "sets a short switch to the value supplied when supplied with a long switch" do
+      expect(build('--port 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the value supplied when supplied with a long switch" do
-      setup('--port 22').port.should == '22'
+
+    it "sets a long switch to the value supplied when supplied with a long switch" do
+      expect(build('--port 22').port).to eq('22')
     end
-    
-    it "shouldn't matter in which order the short and long switches are given" do
-      setup('-h example.com').h.should == 'example.com'
-      setup('--host example.com').h.should == 'example.com'
+
+    it "doesn't matter in which order the short and long switches are given" do
+      expect(build('-h example.com').h).to eq('example.com')
+      expect(build('--host example.com').h).to eq('example.com')
     end
-    
-  end # describe "#set"
-  
+  end
+
   describe "#set!" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '')
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
       Switches.new do |s|
         s.set! :p, :port
       end
     end
-    
-    it "should set a short switch value to the argument supplied with a short switch" do
-      setup('-p 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a short switch" do
+      expect(build('-p 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a short switch" do
-      setup('-p 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a short switch" do
+      expect(build('-p 22').port).to eq('22')
     end
-    
-    it "should set a short switch value to the argument supplied with a long switch" do
-      setup('--port 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a long switch" do
+      expect(build('--port 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a long switch" do
-      setup('--port 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a long switch" do
+      expect(build('--port 22').port).to eq('22')
     end
-    
-    it "should raise a MissingArgument error when no argument is supplied to a short switch" do
-      switches = lambda{setup('-p')}
-      switches.should{raise MissingArgument}
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to a short switch" do
+      expect{build('-p')}.to raise_error(OptionParser::MissingArgument)
     end
-    
-    it "should raise a MissingArgument error when no argument is supplied to a long switch" do
-      switches = lambda{setup('--port')}
-      switches.should{raise MissingArgument}
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to a long switch" do
+      expect{build('--port')}.to raise_error(OptionParser::MissingArgument)
     end
-    
-  end # describe "#set!"
-  
+  end
+
   describe "#required" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '')
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
       Switches.new do |s|
         s.required :p, :port
       end
     end
-    
-    it "should set a short switch value to the argument supplied with a short switch" do
-      setup('-p 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a short switch" do
+      expect(build('-p 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a short switch" do
-      setup('-p 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a short switch" do
+      expect(build('-p 22').port).to eq('22')
     end
-    
-    it "should set a short switch value to the argument supplied with a long switch" do
-      setup('--port 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a long switch" do
+      expect(build('--port 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a long switch" do
-      setup('--port 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a long switch" do
+      expect(build('--port 22').port).to eq('22')
+    end
+
+    it "raises RequiredSwitchMissing when no switch is supplied" do
+      expect{build}.to raise_error(RequiredSwitchMissing)
     end
-    
-    it "should raise a RequiredSwitchMissing error no switch is supplied" do
-      switches = lambda{setup}
-      switches.should{raise RequiredSwitchMissing}
+
+    it "names every missing switch in the RequiredSwitchMissing message" do
+      expect{build}.to raise_error(RequiredSwitchMissing, /-p.*--port/m)
     end
-    
-  end # describe "#required"
-  
+  end
+
   describe "#required!" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '')
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
       Switches.new do |s|
         s.required! :p, :port
       end
     end
-    
-    it "should set a short switch value to the argument supplied with a short switch" do
-      setup('-p 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a short switch" do
+      expect(build('-p 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a short switch" do
-      setup('-p 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a short switch" do
+      expect(build('-p 22').port).to eq('22')
     end
-    
-    it "should set a short switch value to the argument supplied with a long switch" do
-      setup('--port 22').p.should == '22'
+
+    it "sets a short switch to the argument supplied with a long switch" do
+      expect(build('--port 22').p).to eq('22')
     end
-    
-    it "should set a long switch value to the argument supplied with a long switch" do
-      setup('--port 22').port.should == '22'
+
+    it "sets a long switch to the argument supplied with a long switch" do
+      expect(build('--port 22').port).to eq('22')
     end
-    
-    it "should raise a MissingArgument error when no argument is supplied to a short switch" do
-      switches = lambda{setup('-p')}
-      switches.should{raise MissingArgument}
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to a short switch" do
+      expect{build('-p')}.to raise_error(OptionParser::MissingArgument)
     end
-    
-    it "should raise a MissingArgument error when no argument is supplied to a long switch" do
-      switches = lambda{setup('-p')}
-      switches.should{raise MissingArgument}
+
+    it "raises OptionParser::MissingArgument when no argument is supplied to a long switch" do
+      expect{build('--port')}.to raise_error(OptionParser::MissingArgument)
     end
-    
-    it "should raise a RequiredSwitchMissing error no switch is supplied" do
-      switches = lambda{setup}
-      switches.should{raise RequiredSwitchMissing}
+
+    it "raises RequiredSwitchMissing when no switch is supplied" do
+      expect{build}.to raise_error(RequiredSwitchMissing)
     end
-    
-  end # describe "#required!"
-  
+  end
+
   describe "#perform" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '', &block)
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
-      Switches.new do |s|
-        s.perform(:action){an_action}
-      end
+      Switches.new{|s| s.perform(:a, :action, &block)}
+    end
+
+    it "calls the block when supplied with a short switch" do
+      called = false
+      build('-a'){called = true}
+      expect(called).to eq(true)
     end
-    
-    def an_action
-      'value'
+
+    it "calls the block when supplied with a long switch" do
+      called = false
+      build('--action'){called = true}
+      expect(called).to eq(true)
+    end
+
+    it "doesn't call the block when the switch isn't supplied" do
+      called = false
+      build{called = true}
+      expect(called).to eq(false)
     end
-    
-    it "should send(:an_action)"
-    
-  end # describe "#perform"
-  
+
+    it "doesn't require an argument" do
+      expect{build('-a'){}}.not_to raise_error
+    end
+  end
+
   describe "#perform!" do
-    
-    def setup(switches_string = '')
-      ARGV.empty!
+    def build(switches_string = '', &block)
+      ARGV.clear
       switches_string.split.each{|a| ARGV << a}
-      Switches.new do |s|
-        s.perform(:action){an_action}
-      end
+      Switches.new{|s| s.perform!(:a, :action, &block)}
+    end
+
+    it "passes the argument to the block when supplied with a short switch" do
+      argument = nil
+      build('-a value'){|o| argument = o}
+      expect(argument).to eq('value')
     end
-    
-    def an_action
-      'value'
-    end
-    
-    it "should send(:an_action)"
-    
-    it "should require a block parameter"
-    
-  end # describe "#perform!"
-  
-end # describe Switches
+
+    it "passes the argument to the block when supplied with a long switch" do
+      argument = nil
+      build('--action value'){|o| argument = o}
+      expect(argument).to eq('value')
+    end
+
+    it "doesn't call the block when the switch isn't supplied" do
+      called = false
+      build{called = true}
+      expect(called).to eq(false)
+    end
+
+    it "raises OptionParser::MissingArgument when no argument is supplied" do
+      expect{build('-a'){}}.to raise_error(OptionParser::MissingArgument)
+    end
+  end
+end

data/switches.rb.gemspec

@@ -1,7 +1,7 @@
 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.version = '0.10.0'
+  s.version = '0.10.1'
   s.date = '2026-08-09'
 
   s.summary = "The easiest way to provide switches to a Ruby program."
@@ -12,12 +12,14 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.required_ruby_version = ">= 2.7.0"
 
+  s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
 
   s.files = [
     'CHANGELOG',
     'Gemfile',
     'LICENSE.txt',
+    'Rakefile',
     'README.md',
     'switches.rb.gemspec',
     Dir['lib/**/*.rb'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switches.rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - thoran
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 2026-08-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,6 +48,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - lib/Kernel/require_gem.rb
 - lib/Switches.rb
 - lib/Thoran/Kernel/RequireGem/require_gem.rb