signore 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a6bf3a2bc72020cf26754484238b4efb83028f771c395386e857a1916aea59
-  data.tar.gz: 278acaae1aee55674c1b736367f77b848bdad91d70d9fd47ba103d1fd55a19be
+  metadata.gz: 3836fca9879726bbdd969adeb450e296799c3bbcbce890d3f00bae4381ae0fde
+  data.tar.gz: 5bbe4c90bd1f80dd63d6062a89f2708f9f92be3f4f69917c0f8fa00cb08454a3
 SHA512:
-  metadata.gz: 3e5cce22deca6ff0ff82cda5297a301075a7549059849f26d993caf97c7cca1e265f89d02307ef90c748f0c390d78e07f7b70080e64810095caa196e3eab9c37
-  data.tar.gz: 15abbffeb0e9cd013381dfc273c451c9630738d459dd1fab35d0268aa94ccbfba207676ecb04f2532e3fafc01d5aa4c9f234df6d478264b7cabe551efc8efde9
+  metadata.gz: e5e6381cb3b0067c61c8f8951528c166deeca50b2cdaf00aff640f42b3ab203fe4366925948cf20f0506a8b2a432028933020d1918d46548c9fe90e5a3a4a1b0
+  data.tar.gz: 72170f9b4ae8a52d92ac780fa2a581b87cdc5202cd613ea440506c582b5aefd69515c55f784da530b34201febb915b65e0780c18221bc8242c660ba63a6a6070

data/.rubocop.yml

@@ -1,6 +1,10 @@
+plugins:
+  - rubocop-minitest
+  - rubocop-rake
+
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.4
 
 Bundler/GemFilename:
   Enabled: false

data/gems.locked

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    signore (0.7.0)
+    signore (1.0.0)
       lovely_rufus (~> 1.0)
+      pstore (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -52,6 +53,7 @@ GEM
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
+    pstore (0.2.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
@@ -77,11 +79,18 @@ GEM
     rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
+    rubocop-minitest (0.38.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -92,6 +101,8 @@ DEPENDENCIES
   rake (~> 13.0)
   reek (~> 6.0)
   rubocop (~> 1.0)
+  rubocop-minitest (~> 0.38.0)
+  rubocop-rake (~> 0.7.0)
   signore!
 
 BUNDLED WITH

data/lib/signore/repo.rb

@@ -17,7 +17,6 @@ module Signore
 
     def initialize(path: self.class.default_path)
       @path = path
-      convert if legacy?
     end
 
     def <<(signature)
@@ -34,14 +33,6 @@ module Signore
 
     attr_reader :path
 
-    def convert
-      self.hashes = hashes.map(&:to_h)
-    end
-
-    def legacy?
-      path.exist? and path.read.include?('Signore::Signature')
-    end
-
     def hashes
       store.transaction(true) { store.fetch('signatures', []) }
     end

data/lib/signore/sig_from_stream.rb

@@ -3,9 +3,7 @@ require_relative 'tags'
 
 module Signore
   class SigFromStream
-    def self.call(input, tags: Tags.new)
-      new(input, tags: tags).call
-    end
+    def self.call(input, tags: Tags.new) = new(input, tags:).call
 
     def initialize(input, tags: Tags.new)
       @input = input
@@ -27,7 +25,7 @@ module Signore
     def get_param(param)
       puts "\n#{param}?"
       separator = param == :text ? "\n\n" : "\n"
-      input.gets(separator).strip
+      input.gets(separator).strip.gsub(/(?<=\p{L})'/, '’').tr("'", '‘')
     end
 
     def params

data/signore.gemspec

@@ -10,20 +10,23 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0-or-later'
   gem.name        = 'signore'
   gem.summary     = 'signore: an email signature manager/randomiser'
-  gem.version     = '1.0.0'
+  gem.version     = '1.1.0'
 
-  gem.required_ruby_version = '~> 3.2'
+  gem.required_ruby_version = '~> 3.4'
 
   gem.files       = `git ls-files -z`.split "\0"
   gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename(path) }
 
   gem.add_dependency 'lovely_rufus', '~> 1.0'
+  gem.add_dependency 'pstore',       '~> 0.2.0'
 
-  gem.add_development_dependency 'minitest',       '~> 5.6'
-  gem.add_development_dependency 'minitest-focus', '~> 1.1'
-  gem.add_development_dependency 'rake',           '~> 13.0'
-  gem.add_development_dependency 'reek',           '~> 6.0'
-  gem.add_development_dependency 'rubocop',        '~> 1.0'
+  gem.add_development_dependency 'minitest',         '~> 5.6'
+  gem.add_development_dependency 'minitest-focus',   '~> 1.1'
+  gem.add_development_dependency 'rake',             '~> 13.0'
+  gem.add_development_dependency 'reek',             '~> 6.0'
+  gem.add_development_dependency 'rubocop',          '~> 1.0'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.38.0'
+  gem.add_development_dependency 'rubocop-rake',     '~> 0.7.0'
 
   gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/signore/repo_test.rb

@@ -31,14 +31,6 @@ module Signore
       end
     end
 
-    describe '.new' do
-      it 'rewrites legacy file to hashes on first access' do
-        FileUtils.cp Pathname.new('test/fixtures/signatures.legacy.yml'), path
-        Repo.new(path: path)
-        _(path.read).wont_include 'Signore::Signature'
-      end
-    end
-
     describe '#<<' do
       let(:sig)  { Signature.new(text: text)                               }
       let(:text) { 'Normaliser Unix c’est comme pasteuriser le camembert.' }
@@ -48,12 +40,6 @@ module Signore
         _(path.read).must_include text
       end
 
-      it 'rewrites legacy YAML files on save' do
-        FileUtils.cp Pathname.new('test/fixtures/signatures.legacy.yml'), path
-        Repo.new(path: path) << sig
-        _(path.read).wont_include 'Signore::Signature'
-      end
-
       it 'handles edge cases' do
         sig = Signature.new(author: '000___000')
         Repo.new(path: path) << sig
@@ -62,12 +48,13 @@ module Signore
 
     describe '#empty?' do
       it 'is true when a repo is empty' do
-        assert Repo.new(path: path).empty?
+        assert_predicate Repo.new(path: path), :empty?
       end
 
       it 'is false when a repo is not empty' do
-        FileUtils.cp Pathname.new('test/fixtures/signatures.legacy.yml'), path
-        refute Repo.new(path: path).empty?
+        FileUtils.cp Pathname.new('test/fixtures/signatures.yml'), path
+
+        refute_predicate Repo.new(path: path), :empty?
       end
     end
 
@@ -80,15 +67,6 @@ module Signore
         _(sigs.last.subject).must_equal 'Star Wars ending explained'
       end
 
-      it 'keeps working with legacy YAML files' do
-        legacy_path = Pathname.new('test/fixtures/signatures.legacy.yml')
-        temp_path   = Pathname.new(Tempfile.new.path)
-        FileUtils.cp legacy_path, temp_path
-        legacy_repo = Repo.new(path: temp_path)
-        new_repo = Repo.new(path: Pathname.new('test/fixtures/signatures.yml'))
-        _(legacy_repo.sigs).must_equal new_repo.sigs
-      end
-
       it 'doesn’t blow up if the path is missing' do
         tempdir = Dir.mktmpdir
         path = Pathname.new("#{tempdir}/some_intermediate_dir/sigs.yml")

data/test/signore/sig_from_stream_test.rb

@@ -51,6 +51,16 @@ module Signore
         end
         _(sig).must_equal Signature.new(author: 'Patrick Ewing', text: text)
       end
+
+      it 'replaces apostrophes with proper quotation marks' do
+        simple = "There's no 'i' in 'denial'."
+        author = 'ʎoɟ ʎɹoɔ'
+        input = StringIO.new("#{simple}\n\n#{author}\n\n\n")
+        sig = nil
+        capture_io { sig = SigFromStream.call input }
+        text = 'There’s no ‘i’ in ‘denial’.'
+        _(sig).must_equal Signature.new(author:, text:)
+      end
     end
   end
 end

data/test/signore/signature_test.rb

@@ -42,11 +42,11 @@ module Signore # rubocop:disable Metrics/ModuleLength
 
     describe '#empty?' do
       it 'is true when the Signature is a null object' do
-        assert Signature.new.empty?
+        assert_predicate Signature.new, :empty?
       end
 
       it 'is false when the Signature has some text' do
-        refute Signature.new(text: 'Node.jk').empty?
+        refute_predicate Signature.new(text: 'Node.jk'), :empty?
       end
     end
 
@@ -62,7 +62,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
       end
 
       it 'removes non-existing keys' do
-        assert Signature.new.to_h.empty?
+        assert_predicate Signature.new.to_h, :empty?
       end
     end
 

data/test/signore/tags_test.rb

@@ -3,9 +3,11 @@ require_relative '../../lib/signore/tags'
 
 module Signore
   describe Tags do
+    # rubocop:disable Minitest/AssertMatch, Minitest/RefuteMatch
     describe '#match?' do
       it 'is a predicate whether the Tags match the given list of tags' do
         tags = %w[programming tech]
+
         assert Tags.new.match?([])
         assert Tags.new(forbidden: %w[fnord]).match?([])
         assert Tags.new.match?(tags)
@@ -16,6 +18,7 @@ module Signore
         refute Tags.new(forbidden: %w[tech], required: %w[tech]).match?(tags)
       end
     end
+    # rubocop:enable Minitest/AssertMatch, Minitest/RefuteMatch
 
     describe '#to_s' do
       it 'returns a CLI-like representation of the Tags' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Szotkowski
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: signore helps manage email signatures and select random ones based on
   their tags
 email: chastell@chastell.net
@@ -101,11 +143,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".overcommit.yml"
 - ".reek.yml"
 - ".rubocop.yml"
-- ".tool-versions"
-- ".travis.yml"
 - LICENCE
 - README.md
 - Rakefile
@@ -122,7 +161,6 @@ files:
 - lib/signore/tags.rb
 - signore.gemspec
 - test/fixtures/nosignatures.yml
-- test/fixtures/signatures.legacy.yml
 - test/fixtures/signatures.yml
 - test/fixtures/wrapper.yml
 - test/signore/cli_test.rb
@@ -145,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.overcommit.yml

@@ -1,4 +0,0 @@
-PreCommit:
-  RakeTarget:
-    enabled: true
-    targets: [default]

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.6.1

data/.travis.yml

@@ -1,12 +0,0 @@
-before_install:
-  - gem update --system
-  - gem install bundler
-  - bundle
-language: ruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-rvm:
-  - 2.5
-  - 2.6
-  - ruby-head

data/test/fixtures/signatures.legacy.yml

@@ -1,23 +0,0 @@
-signatures:
-- !ruby/struct:Signore::Signature
-  text: You do have to be mad to work here, but it doesn’t help.
-  author: Gary Barnes
-  source: asr
-  tags: [tech, work]
-- !ruby/struct:Signore::Signature
-  text: More gangland camp than neo-noir.
-  author: Nicholas Christopher
-  subject: on Pulp Fiction
-- !ruby/struct:Signore::Signature
-  text: // sometimes I believe compiler ignores all my comments
-  tags: [programming, tech]
-- !ruby/struct:Signore::Signature
-  text: Bruce Schneier knows Alice and Bob’s shared secret.
-  source: Bruce Schneier Facts
-  tags: [security, tech]
-- !ruby/struct:Signore::Signature
-  text: stay-at-home executives vs. wallstreet dads
-  author: kodz
-- !ruby/struct:Signore::Signature
-  text: Amateur fighter pilot ignores orders, listens to the voices in his head and slaughters thousands.
-  subject: Star Wars ending explained