signore 0.6.0 → 0.7.0

data/test/signore/sig_from_stream_test.rb

@@ -1,15 +1,14 @@
-# frozen_string_literal: true
-
 require 'stringio'
 require_relative '../test_helper'
 require_relative '../../lib/signore/sig_from_stream'
 
 module Signore
   describe SigFromStream do
-    describe '.sig_from' do
+    describe '.call' do
       it 'asks about signature parts' do
-        io = capture_io { SigFromStream.sig_from StringIO.new("\n\n\n\n") }
-        _(io.first).must_equal <<-end.dedent
+        io = capture_io { SigFromStream.call StringIO.new("\n\n\n\n\n") }
+        _(io.first).must_equal <<~end
+
           text?
 
           author?
@@ -21,7 +20,7 @@ module Signore
       end
 
       it 'asks about signature parts and returns resulting signature' do
-        input = StringIO.new <<-end.dedent
+        input = StringIO.new <<~end
           You do have to be mad to work here, but it doesn’t help.
 
           Gary Barnes
@@ -29,14 +28,14 @@ module Signore
           asr
         end
         sig = nil
-        capture_io { sig = SigFromStream.sig_from input }
+        capture_io { sig = SigFromStream.call input }
         text = 'You do have to be mad to work here, but it doesn’t help.'
         _(sig).must_equal Signature.new(author: 'Gary Barnes', source: 'asr',
                                         text: text)
       end
 
       it 'handles multi-line signatures' do
-        input = StringIO.new <<-end.dedent
+        input = StringIO.new <<~end
           ‘You’ve got an interesting accent. Subtle. I can’t place it.’
           ‘It’s text-to-speech… I was raised by smartphones.’
 
@@ -45,8 +44,8 @@ module Signore
 
         end
         sig = nil
-        capture_io { sig = SigFromStream.sig_from input }
-        text = <<-end.dedent.strip
+        capture_io { sig = SigFromStream.call input }
+        text = <<~end.strip
           ‘You’ve got an interesting accent. Subtle. I can’t place it.’
           ‘It’s text-to-speech… I was raised by smartphones.’
         end

data/test/signore/signature_test.rb

@@ -1,12 +1,22 @@
-# frozen_string_literal: true
-
 require 'yaml'
 require_relative '../test_helper'
-require_relative '../../lib/signore/mapper'
 require_relative '../../lib/signore/signature'
 
 module Signore # rubocop:disable Metrics/ModuleLength
   describe Signature do
+    describe '.from_h' do
+      it 'deserializes a Signature from a Hash' do
+        text = 'For the sake of topic titles, I’d rather if Monty saved Python.'
+        sig_hash = { 'author' => 'Anonymous Coward', 'source' => '/.',
+                     'subject' => 'on ‘Monty Wants to Save MySQL’',
+                     'tags' => %w[/. MySQL], 'text' => text }
+        signature = Signature.new(author: 'Anonymous Coward', source: '/.',
+                                  subject: 'on ‘Monty Wants to Save MySQL’',
+                                  tags: %w[/. MySQL], text: text)
+        _(Signature.from_h(sig_hash)).must_equal signature
+      end
+    end
+
     describe '.new' do
       it 'instantiates Signatures via parameters' do
         source = 'A History of Modern Computing'
@@ -45,10 +55,10 @@ module Signore # rubocop:disable Metrics/ModuleLength
         text = 'For the sake of topic titles, I’d rather if Monty saved Python.'
         sig  = Signature.new(author: 'Anonymous Coward', source: '/.',
                              subject: 'on ‘Monty Wants to Save MySQL’',
-                             tags: %w(/. MySQL), text: text)
+                             tags: %w[/. MySQL], text: text)
         _(sig.to_h).must_equal 'author' => 'Anonymous Coward', 'source' => '/.',
                                'subject' => 'on ‘Monty Wants to Save MySQL’',
-                               'tags' => %w(/. MySQL), 'text' => text
+                               'tags' => %w[/. MySQL], 'text' => text
       end
 
       it 'removes non-existing keys' do
@@ -62,7 +72,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
       end
 
       it 'does not show meta if there’s nothing to show' do
-        text = '// sometimes I believe compiler ignores all my comments'
+        text = "// sometimes I believe compiler\n// ignores all my comments"
         sig  = Signature.new(text: text)
         _(sig.to_s).must_equal text
       end
@@ -70,7 +80,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
       it 'shows author on its own' do
         sig = Signature.new(author: 'kodz',
                             text: 'stay-at-home executives vs. wallstreet dads')
-        _(sig.to_s).must_equal <<-end.dedent.strip
+        _(sig.to_s).must_equal <<~end.strip
           stay-at-home executives vs. wallstreet dads
                                                [kodz]
         end
@@ -79,18 +89,20 @@ module Signore # rubocop:disable Metrics/ModuleLength
       it 'shows author and source, comma-separated' do
         text = 'You do have to be mad to work here, but it doesn’t help.'
         sig  = Signature.new(author: 'Gary Barnes', source: 'asr', text: text)
-        _(sig.to_s).must_equal <<-end.dedent.strip
-          You do have to be mad to work here, but it doesn’t help.
-                                                [Gary Barnes, asr]
+        _(sig.to_s).must_equal <<~end.strip
+          You do have to be mad to work
+          here, but it doesn’t help.
+                     [Gary Barnes, asr]
         end
       end
 
       it 'shows source on its own' do
         text = 'Bruce Schneier knows Alice and Bob’s shared secret.'
         sig  = Signature.new(source: 'Bruce Schneier Facts', text: text)
-        _(sig.to_s).must_equal <<-end.dedent.strip
-          Bruce Schneier knows Alice and Bob’s shared secret.
-                                       [Bruce Schneier Facts]
+        _(sig.to_s).must_equal <<~end.strip
+          Bruce Schneier knows Alice
+          and Bob’s shared secret.
+              [Bruce Schneier Facts]
         end
       end
 
@@ -98,7 +110,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
         text = 'More gangland camp than neo-noir.'
         sig = Signature.new(author: 'Nicholas Christopher',
                             subject: 'on Pulp Fiction', text: text)
-        _(sig.to_s).must_equal <<-end.dedent.strip
+        _(sig.to_s).must_equal <<~end.strip
           More gangland camp than neo-noir.
           [Nicholas Christopher on Pulp Fiction]
         end
@@ -108,7 +120,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
         text = 'Amateur fighter pilot ignores orders, listens ' \
           'to the voices in his head and slaughters thousands.'
         sig = Signature.new(subject: 'Star Wars ending explained', text: text)
-        _(sig.to_s).must_equal <<-end.dedent.strip
+        _(sig.to_s).must_equal <<~end.strip
           Amateur fighter pilot ignores orders, listens to
           the voices in his head and slaughters thousands.
                               [Star Wars ending explained]
@@ -117,7 +129,7 @@ module Signore # rubocop:disable Metrics/ModuleLength
 
       it 'handles edge cases properly' do
         YAML.load_file('test/fixtures/wrapper.yml').each do |sig, wrapped|
-          _(Mapper.from_h(sig.to_h).to_s).must_equal wrapped
+          _(Signature.from_h(sig.to_h).to_s).must_equal wrapped
         end
       end
     end

data/test/signore/tags_test.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../test_helper'
 require_relative '../../lib/signore/tags'
 
@@ -7,24 +5,24 @@ module Signore
   describe Tags do
     describe '#match?' do
       it 'is a predicate whether the Tags match the given list of tags' do
-        tags = %w(programming tech)
+        tags = %w[programming tech]
         assert Tags.new.match?([])
-        assert Tags.new(forbidden: %w(fnord)).match?([])
+        assert Tags.new(forbidden: %w[fnord]).match?([])
         assert Tags.new.match?(tags)
-        assert Tags.new(required: %w(programming)).match?(tags)
-        assert Tags.new(required: %w(programming tech)).match?(tags)
-        refute Tags.new(required: %w(programming tech Ruby)).match?(tags)
-        refute Tags.new(forbidden: %w(programming)).match?(tags)
-        refute Tags.new(forbidden: %w(tech), required: %w(tech)).match?(tags)
+        assert Tags.new(required: %w[programming]).match?(tags)
+        assert Tags.new(required: %w[programming tech]).match?(tags)
+        refute Tags.new(required: %w[programming tech Ruby]).match?(tags)
+        refute Tags.new(forbidden: %w[programming]).match?(tags)
+        refute Tags.new(forbidden: %w[tech], required: %w[tech]).match?(tags)
       end
     end
 
     describe '#to_s' do
       it 'returns a CLI-like representation of the Tags' do
         _(Tags.new.to_s).must_equal ''
-        _(Tags.new(required: %w(tech)).to_s).must_equal 'tech'
-        _(Tags.new(forbidden: %w(fnord)).to_s).must_equal '~fnord'
-        _(Tags.new(forbidden: %w(fnord), required: %w(tech)).to_s)
+        _(Tags.new(required: %w[tech]).to_s).must_equal 'tech'
+        _(Tags.new(forbidden: %w[fnord]).to_s).must_equal '~fnord'
+        _(Tags.new(forbidden: %w[fnord], required: %w[tech]).to_s)
           .must_equal 'tech ~fnord'
       end
     end

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 ENV['MT_NO_EXPECTATIONS'] = 'true'
 require 'bundler/setup'
 require 'minitest/autorun'
@@ -9,9 +7,3 @@ require 'bogus/minitest/spec'
 require 'signore'
 
 Bogus.configure { |config| config.search_modules << Signore }
-
-class String
-  def dedent
-    gsub(/^#{scan(/^ +/).min}/, '')
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Szotkowski
@@ -10,27 +10,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus
@@ -46,6 +50,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: procto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -88,48 +106,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.46.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.43.0
+        version: 0.60.0
 description: signore helps manage email signatures and select random ones based on
   their tags
 email: chastell@chastell.net
@@ -138,20 +170,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".reek"
+- ".overcommit.yml"
+- ".reek.yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
-- Gemfile
-- Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
 - bin/signore
 - certs/chastell.pem
+- gems.locked
+- gems.rb
 - lib/signore.rb
 - lib/signore/cli.rb
-- lib/signore/mapper.rb
 - lib/signore/repo.rb
 - lib/signore/settings.rb
 - lib/signore/sig_finder.rb
@@ -164,7 +196,6 @@ files:
 - test/fixtures/signatures.yml
 - test/fixtures/wrapper.yml
 - test/signore/cli_test.rb
-- test/signore/mapper_test.rb
 - test/signore/repo_test.rb
 - test/signore/settings_test.rb
 - test/signore/sig_finder_test.rb
@@ -184,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -192,13 +223,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'signore: an email signature manager/randomiser'
 test_files:
 - test/signore/cli_test.rb
-- test/signore/mapper_test.rb
 - test/signore/repo_test.rb
 - test/signore/settings_test.rb
 - test/signore/sig_finder_test.rb

data/.reek

@@ -1,2 +0,0 @@
-IrresponsibleModule:
-  enabled: false

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    signore (0.6.0)
-      lovely_rufus (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.3.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    bogus (0.1.6)
-      dependor (>= 0.0.4)
-    codeclimate-engine-rb (0.3.1)
-      virtus (~> 1.0)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    dependor (1.0.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    equalizer (0.0.11)
-    ice_nine (0.11.2)
-    lovely_rufus (1.0.1)
-    minitest (5.9.1)
-    minitest-focus (1.1.2)
-      minitest (>= 4, < 6)
-    parser (2.3.1.4)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.1.0)
-    rake (11.3.0)
-    reek (4.4.2)
-      codeclimate-engine-rb (~> 0.3.1)
-      parser (~> 2.3.1, >= 2.3.1.2)
-      rainbow (~> 2.0)
-    rubocop (0.43.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    thread_safe (0.3.5)
-    unicode-display_width (1.1.1)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bogus (~> 0.1.3)
-  minitest (~> 5.6)
-  minitest-focus (~> 1.1)
-  rake (~> 11.0)
-  reek (~> 4.0)
-  rubocop (~> 0.43.0)
-  signore!
-
-BUNDLED WITH
-   1.12.1