signore 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d6a5ab52ca772347f22c1c1edafe01c3b1ff6f2
-  data.tar.gz: 1de61e65fea0d01bb5fd316e56a68ee03087a271
+  metadata.gz: c1a5292cb375e7c9e5a675459999789ef30c0dfd
+  data.tar.gz: b8c56a2de499328fd5eda249ba20f88f2ddb89db
 SHA512:
-  metadata.gz: ed60cf371e93057783c7e6ea71729836e4a64813400ce24b1608166db55bb378ad8e8143e950237ac17f214d54b9ebd3234f97e2e5a4d20664ae1fc313600bda
-  data.tar.gz: 92e0f956b0c204af3eeb309cc14b2196534baee73f0dba15762e8ee07171b0198993d0ac5532532f0336cc0a08a2a6e5b98eab06aa03f69e3242a0eaa996f02c
+  metadata.gz: bb841f115b6c3368e4c26871e98873dfb344f708f81a7cdf644cd0a8a098559ed702e744ffd8938b748d7ba6e4db74d459124a8ecfbdec27f77a94b10861300a
+  data.tar.gz: 1c5e087bd48151c54c9c118c1d7e44f42c1f8f20abdf6f79e230d98c0de27aedbdee6f6419952d06d829365692e525f28c82283ae9b5a2cdfa0dd8507eaf3e77

data/.reek

@@ -1,10 +1,2 @@
-FeatureEnvy:
-  exclude:
-    - Signore::Settings#forbidden
-
 IrresponsibleModule:
   enabled: false
-
-UtilityFunction:
-  exclude:
-    - Signore::Settings#repo_path

data/.rubocop.yml

@@ -4,8 +4,14 @@ Style/AndOr:
 Style/Documentation:
   Enabled: false
 
+Style/EmptyCaseCondition:
+  Enabled: false
+
 Style/Not:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/.travis.yml

@@ -1,6 +1,12 @@
+cache: bundler
+fast_finish: true
 language: ruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 rvm:
   - ruby-2.1
   - ruby-2.2
+  - ruby-2.3.0
   - ruby-head
 sudo: false

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -2,77 +2,65 @@ PATH
   remote: .
   specs:
     signore (0.4.2)
-      lovely_rufus (~> 0.3.0)
-      private_attr (~> 1.1)
+      lovely_rufus (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
-    adamantium (0.2.0)
+    ast (2.3.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    ast (2.0.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     bogus (0.1.6)
       dependor (>= 0.0.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
+    codeclimate-engine-rb (0.3.1)
+      virtus (~> 1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     dependor (1.0.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.11)
-    ffi (1.9.10)
-    hitimes (1.2.2)
-    ice_nine (0.11.1)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lovely_rufus (0.3.1)
-      private_attr (~> 1.0)
-    memoizable (0.4.2)
+    descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.7.0)
-    minitest-focus (1.1.1)
+    equalizer (0.0.11)
+    ffi (1.9.14)
+    ice_nine (0.11.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lovely_rufus (1.0.1)
+    minitest (5.9.0)
+    minitest-focus (1.1.2)
       minitest (>= 4, < 6)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
     powerpack (0.1.1)
-    private_attr (1.1.0)
-    procto (0.0.2)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rainbow (2.1.0)
+    rake (11.2.2)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    reek (3.1)
-      parser (~> 2.2.2.5)
+    reek (4.4.0)
+      codeclimate-engine-rb (~> 0.3.1)
+      parser (~> 2.3.1, >= 2.3.1.2)
       rainbow (~> 2.0)
-      unparser (~> 0.2.2)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+    rerun (0.11.0)
+      listen (~> 3.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.4.0)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
-    unparser (0.2.4)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.2)
-      procto (~> 0.0.2)
+    unicode-display_width (1.1.0)
+    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
@@ -81,11 +69,11 @@ DEPENDENCIES
   bogus (~> 0.1.3)
   minitest (~> 5.6)
   minitest-focus (~> 1.1)
-  rake (~> 10.1)
-  reek (~> 3.1)
-  rerun (~> 0.10.0)
-  rubocop (~> 0.32.0)
+  rake (~> 11.0)
+  reek (~> 4.0)
+  rerun (~> 0.11.0)
+  rubocop (~> 0.42.0)
   signore!
 
 BUNDLED WITH
-   1.10.5
+   1.12.1

data/README.md

@@ -84,13 +84,6 @@ signore stores the signatures in a YAML file (for ease of editing, if such a nee
 
 
 
-Requirements
-------------
-
-signore requires Ruby 1.9 and works best with Ruby 1.9.2 compiled with Psych (for sanity when hand-editing the YAML file, if it happens to sport non-US-ASCII characters).
-
-
-
 ---
 
-© MMIX-MMXIV Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)
+© MMIX-MMXV Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
@@ -11,6 +13,7 @@ end
 
 Reek::Rake::Task.new do |task|
   task.fail_on_error = false
+  task.reek_opts     = '--no-wiki-links'
 end
 
 RuboCop::RakeTask.new do |task|

data/bin/signore

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../lib/signore'
 trap(:INT) { exit }

data/certs/chastell.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMREwDwYDVQQDDAhjaGFz
+dGVsbDEYMBYGCgmSJomT8ixkARkWCGNoYXN0ZWxsMRMwEQYKCZImiZPyLGQBGRYD
+bmV0MB4XDTE1MTEwOTIxMTMwOVoXDTE2MTEwODIxMTMwOVowQjERMA8GA1UEAwwI
+Y2hhc3RlbGwxGDAWBgoJkiaJk/IsZAEZFghjaGFzdGVsbDETMBEGCgmSJomT8ixk
+ARkWA25ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcf6OF3mi6D
+UedwY2A6fYEQF2bJVYQxV8fWHA5Q2R6y7Eg0hM80Q0yod7pJxlJTpnAPzuIl1u4y
+hhfa/Vz0u6PVRhBYQ/Bcj9UEwgiXcy3P4ybINDeDt7GRVs3R9rRoT1aAsb5RCS0z
+u/JKS2RcAS5XPpFow3Cfs5A/pM2NLsR/zeiaKg8rRB59A/tWw26F+YTaWfPAPFGv
+d6af29NKWQh+EPkX1JwwtSwjKfVOeFr0csC6QLWKpp1z/7Lla8d3px426Ccjca0I
+5VwtQeZ5LClTjqaYyH7vSojpOtgRuvVKspZ2jfe1KZq9jz//a/rSUrFcPlEQuXQp
+i8E3TKoJrW0CAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+BBYEFLi/J921Nb53s8GKtKptC08QmHnwMCAGA1UdEQQZMBeBFWNoYXN0ZWxsQGNo
+YXN0ZWxsLm5ldDAgBgNVHRIEGTAXgRVjaGFzdGVsbEBjaGFzdGVsbC5uZXQwDQYJ
+KoZIhvcNAQEFBQADggEBAA+rUbXujzqDv8WE7kkiJadQhxldq/cRhaJDMKSWF3/H
+6PL/Me8zq8Ok7/pQtxBvAhKcy3DdsH0q5pyPHoMrYySxEo9lNXLvwCPsi21rR53b
+2w5rBytYCxrhsXISKwCkBYwVwtICafZ8VtRbD3pgnsPv+9NYJJ/rN4Z34doWM7oK
+CAfY6o0LcY+qmvqLvqpweyoO73wkfKGUSz1a09dJfAP5aIREQDvpYrWx2ZoDrAct
+srwnZ6g5uTvNbd0I1SnvnCJJ5y5iPvJIBlnGb3QZ77y2XXCOy3Yc0rjK7A8bQt5t
+xOlyYMPKhWx2IqEip+J7PBpBwMnxIPhTcNlFOj8mSa0=
+-----END CERTIFICATE-----

data/lib/signore/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require_relative 'repo'
 require_relative 'settings'
@@ -16,22 +18,27 @@ module Signore
 
     def run(input: $stdin)
       case action
-      when 'prego'  then puts retrieve_sig
+      when 'prego'  then prego
       when 'pronto' then puts create_sig_from(input)
       else abort 'usage: signore prego|pronto [tag, …]'
       end
     end
 
-    private_attr_reader :repo, :settings
-
     private
 
-    def create_sig_from(input)
-      SigFromStream.sig_from(input, tags: tags).tap { |sig| repo << sig }
+    attr_reader :repo, :settings
+
+    def prego
+      sig = repo.find(tags: tags)
+      puts case
+           when repo.empty? then 'No signatures found.'
+           when sig.empty?  then "Sadly no signatures are tagged #{tags}."
+           else sig
+           end
     end
 
-    def retrieve_sig
-      repo.find(tags: tags)
+    def create_sig_from(input)
+      SigFromStream.sig_from(input, tags: tags).tap { |sig| repo << sig }
     end
   end
 end

data/lib/signore/mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'signature'
 
 module Signore

data/lib/signore/repo.rb

@@ -1,40 +1,51 @@
+# frozen_string_literal: true
+
+require 'forwardable'
 require 'yaml/store'
 require_relative 'mapper'
 require_relative 'settings'
 require_relative 'sig_finder'
-require_relative 'signature'
 require_relative 'tags'
 
 module Signore
   class Repo
-    def initialize(path: Settings.new.repo_path, sig_finder: SigFinder)
+    extend Forwardable
+
+    def initialize(path: Settings.new.repo_path, sig_finder: SigFinder.new)
       @path       = path
       @sig_finder = sig_finder
+      convert if legacy?
     end
 
     def <<(sig)
-      sigs << sig
-      persist
+      store.transaction { (store['signatures'] ||= []) << Mapper.to_h(sig) }
     end
 
+    delegate empty?: :sigs
+
     def find(tags: Tags.new)
       sig_finder.find(sigs, tags: tags)
     end
 
     def sigs
       @sigs ||= begin
-        elems = store.transaction(true) { store.fetch('signatures', []) }
-        elems.map { |elem| elem.is_a?(Signature) ? elem : Mapper.from_h(elem) }
+        hashes = store.transaction(true) { store.fetch('signatures', []) }
+        hashes.map(&Mapper.method(:from_h))
       end
     end
 
-    private_attr_reader :path, :sig_finder
-
     private
 
-    def persist
-      hashes = sigs.map { |sig| Mapper.to_h(sig) }
-      store.transaction { store['signatures'] = hashes }
+    attr_reader :path, :sig_finder
+
+    def convert
+      store.transaction do
+        store['signatures'] = store.fetch('signatures', []).map(&:to_h)
+      end
+    end
+
+    def legacy?
+      path.exist? and path.read.include?('Signore::Signature')
     end
 
     def store

data/lib/signore/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require_relative 'tags'
 
@@ -11,26 +13,20 @@ module Signore
       args.first
     end
 
+    # :reek:UtilityFunction
     def repo_path
       dir = ENV.fetch('XDG_DATA_HOME') { File.expand_path('~/.local/share') }
       Pathname.new("#{dir}/signore/signatures.yml")
     end
 
     def tags
-      Tags.new(forbidden: forbidden, required: required)
+      negated, required = tag_names.partition { |name| name.start_with?('~') }
+      Tags.new(forbidden: negated.map { |neg| neg[1..-1] }, required: required)
     end
 
-    private_attr_reader :args
-
     private
 
-    def forbidden
-      tag_names.select { |tag| tag.start_with?('~') }.map { |tag| tag[1..-1] }
-    end
-
-    def required
-      tag_names.reject { |tag| tag.start_with?('~') }
-    end
+    attr_reader :args
 
     def tag_names
       args[1..-1] or []

data/lib/signore/sig_finder.rb

@@ -1,13 +1,21 @@
+# frozen_string_literal: true
+
 require_relative 'signature'
 require_relative 'tags'
 
 module Signore
-  module SigFinder
-    module_function
+  class SigFinder
+    def initialize(random: Random.new)
+      @random = random
+    end
 
-    def find(sigs, random: Random.new, tags: Tags.new)
+    def find(sigs, tags: Tags.new)
       shuffled = sigs.shuffle(random: random)
       shuffled.find(-> { Signature.new }) { |sig| tags.match?(sig.tags) }
     end
+
+    private
+
+    attr_reader :random
   end
 end

data/lib/signore/sig_from_stream.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'signature'
 require_relative 'tags'
 
 module Signore
   class SigFromStream
-    Params = Struct.new(*%i(text author subject source))
-
     def self.sig_from(input, tags: Tags.new)
       new(input, tags: tags).to_sig
     end
@@ -20,19 +20,25 @@ module Signore
                     text: params.text)
     end
 
-    private_attr_reader :input, :tags
-
     private
 
+    attr_reader :input, :tags
+
+    Params = Struct.new(*%i(text author subject source))
+
     def get_param(param)
       puts "#{param}?"
-      ''.tap do |value|
-        value << input.gets until value.lines.to_a.last == "\n"
-      end.strip
+      param == :text ? multiline : input.gets.strip
+    end
+
+    def multiline
+      value = ''
+      value += input.gets until value.lines.to_a.last == "\n"
+      value.strip
     end
 
     def params
-      @params ||= Params.new(*Params.members.map { |name| get_param(name) })
+      @params ||= Params.new(*Params.members.map(&method(:get_param)))
     end
   end
 end

data/lib/signore/signature.rb

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+
 require 'lovely_rufus'
 
 module Signore
   Signature = Struct.new(*%i(text author source subject tags)) do
-    def initialize(author: nil, source: nil, subject: nil, tags: nil, text: nil)
+    def initialize(author: '', source: '', subject: '', tags: [], text: '')
       super text, author, source, subject, tags
-      each_pair { |key, value| self[key] = nil if value and value.empty? }
+    end
+
+    def empty?
+      to_s.empty?
     end
 
     undef text if defined?(:text)
@@ -13,7 +18,9 @@ module Signore
     end
 
     def to_h
-      super.map { |key, val| [key.to_s, val] }.to_h.keep_if { |_, value| value }
+      super.map { |key, val| [key.to_s, val] }.to_h.keep_if do |_, value|
+        value and not value.empty?
+      end
     end
 
     def to_s
@@ -27,12 +34,12 @@ module Signore
 
     def indent_size_for(text)
       indent = text.split("\n").map(&:size).max - meta.size - 2
-      indent < 0 ? 0 : indent
+      indent.negative? ? 0 : indent
     end
 
     def meta
-      stem = [author, subject].compact.join(' ')
-      stem.empty? ? "#{source}" : [stem, source].compact.join(', ')
+      stem = [author, subject].reject(&:empty?).join(' ')
+      [stem, source].reject(&:empty?).join(', ')
     end
 
     def meta_for(text)

data/lib/signore/tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Signore
   Tags = Struct.new(:forbidden, :required) do
     def initialize(forbidden: [], required: [])
@@ -5,8 +7,11 @@ module Signore
     end
 
     def match?(sig_tags)
-      sig_tags ||= []
       (required & sig_tags) == required and (forbidden & sig_tags).empty?
     end
+
+    def to_s
+      (required + forbidden.map { |tag| '~' + tag }).join(' ')
+    end
   end
 end

data/lib/signore.rb

@@ -1,2 +1,3 @@
-require 'private_attr/everywhere'
+# frozen_string_literal: true
+
 require_relative 'signore/cli'

data/signore.gemspec

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+require 'English'
+require 'pathname'
+
 Gem::Specification.new do |gem|
   gem.author      = 'Piotr Szotkowski'
   gem.description = 'signore helps manage email signatures and select ' \
@@ -7,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'signore'
   gem.summary     = 'signore: an email signature manager/randomiser'
-  gem.version     = '0.4.2'
+  gem.version     = '0.5.0'
 
   gem.required_ruby_version = '~> 2.1'
 
@@ -15,14 +20,18 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename(path) }
   gem.test_files  = gem.files.grep(%r{^test/.*\.rb$})
 
-  gem.add_dependency 'lovely_rufus', '~> 0.3.0'
-  gem.add_dependency 'private_attr', '~> 1.1'
+  gem.cert_chain  = ['certs/chastell.pem']
+  if Pathname.new($PROGRAM_NAME).basename == Pathname.new('gem')
+    gem.signing_key = Pathname.new('~/.ssh/gem-private_key.pem').expand_path
+  end
+
+  gem.add_dependency 'lovely_rufus', '~> 1.0'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.6'
   gem.add_development_dependency 'minitest-focus', '~> 1.1'
-  gem.add_development_dependency 'rake',           '~> 10.1'
-  gem.add_development_dependency 'reek',           '~> 3.1'
-  gem.add_development_dependency 'rerun',          '~> 0.10.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.32.0'
+  gem.add_development_dependency 'rake',           '~> 11.0'
+  gem.add_development_dependency 'reek',           '~> 4.0'
+  gem.add_development_dependency 'rerun',          '~> 0.11.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.42.0'
 end

data/test/fixtures/nosignatures.yml

@@ -0,0 +1,2 @@
+---
+signatures: []

data/test/fixtures/signatures.legacy.yml

@@ -1,13 +1,13 @@
 signatures:
-- !ruby/struct:Signore::Signature
-  text: She was good at playing abstract confusion in the same way a midget is good at being short.
-  author: Clive James
-  subject: on Marilyn Monroe
 - !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]

data/test/fixtures/signatures.yml

@@ -1,11 +1,11 @@
 signatures:
-- text: She was good at playing abstract confusion in the same way a midget is good at being short.
-  author: Clive James
-  subject: on Marilyn Monroe
 - text: You do have to be mad to work here, but it doesn’t help.
   author: Gary Barnes
   source: asr
   tags: [tech, work]
+- text: More gangland camp than neo-noir.
+  author: Nicholas Christopher
+  subject: on Pulp Fiction
 - text: // sometimes I believe compiler ignores all my comments
   tags: [programming, tech]
 - text: Bruce Schneier knows Alice and Bob’s shared secret.

data/test/signore/cli_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'stringio'
 require 'tempfile'
@@ -37,6 +39,22 @@ module Signore
                                                   [Gary Barnes, asr]
           end
         end
+
+        it 'tells the user if no signatures are found' do
+          path = Pathname.new('test/fixtures/nosignatures.yml')
+          repo = Repo.new(path: path)
+          args = %w(prego)
+          out = capture_io { CLI.new(args, repo: repo).run }.first
+          _(out).must_include 'No signatures found.'
+        end
+
+        it 'tells the user if no signatures with selected tag are found' do
+          path = Pathname.new('test/fixtures/signatures.yml')
+          repo = Repo.new(path: path)
+          args = %w(prego esse ~percipi)
+          out = capture_io { CLI.new(args, repo: repo).run }.first
+          _(out).must_include 'Sadly no signatures are tagged esse ~percipi.'
+        end
       end
 
       describe 'pronto' do

data/test/signore/mapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper'
 require_relative '../../lib/signore/mapper'
 require_relative '../../lib/signore/signature'

data/test/signore/repo_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'pathname'
 require 'tempfile'
@@ -9,8 +11,17 @@ require_relative '../../lib/signore/tags'
 
 module Signore
   describe Repo do
+    let(:path) { Pathname.new(Tempfile.new('').path) }
+
+    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(:path) { Pathname.new(Tempfile.new('').path)                     }
       let(:sig)  { Signature.new(text: text)                               }
       let(:text) { 'Normaliser Unix c’est comme pasteuriser le camembert.' }
 
@@ -26,10 +37,21 @@ module Signore
       end
     end
 
+    describe '#empty?' do
+      it 'is true when a repo is empty' do
+        assert 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?
+      end
+    end
+
     describe '#find' do
       let(:path)       { Pathname.new('test/fixtures/signatures.yml') }
       let(:repo)       { Repo.new(path: path, sig_finder: sig_finder) }
-      let(:sig_finder) { fake(:sig_finder, as: :class)                }
+      let(:sig_finder) { fake(SigFinder)                              }
       let(:sigs)       { repo.sigs                                    }
       let(:store)      { YAML::Store.new(path)                        }
 
@@ -39,9 +61,9 @@ module Signore
       end
 
       it 'returns a random signature based on required and forbidden tags' do
-        tags = Tags.new(forbidden: %w(tech), required: %w(programming security))
-        stub(sig_finder).find(sigs, tags: tags) { sigs.last }
-        _(repo.find(tags: tags)).must_equal sigs.last
+        tags = Tags.new(forbidden: %w(programming security), required: %w(tech))
+        stub(sig_finder).find(sigs, tags: tags) { sigs.first }
+        _(repo.find(tags: tags)).must_equal sigs.first
       end
 
       it 'doesn’t blow up if the path is missing' do
@@ -55,7 +77,8 @@ module Signore
       end
 
       it 'keeps working with legacy YAML files' do
-        path = Pathname.new('test/fixtures/signatures.legacy.yml')
+        path = Pathname.new(Tempfile.new('').path)
+        FileUtils.cp Pathname.new('test/fixtures/signatures.legacy.yml'), path
         repo = Repo.new(path: path, sig_finder: sig_finder)
         stub(sig_finder).find(sigs, tags: Tags.new) { sigs.last }
         _(repo.find).must_equal sigs.last
@@ -67,7 +90,7 @@ module Signore
         path = Pathname.new('test/fixtures/signatures.yml')
         sigs = Repo.new(path: path).sigs
         _(sigs.size).must_equal 6
-        _(sigs.first.author).must_equal 'Clive James'
+        _(sigs.first.author).must_equal 'Gary Barnes'
         _(sigs.last.subject).must_equal 'Star Wars ending explained'
       end
     end

data/test/signore/settings_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'tmpdir'
 require_relative '../test_helper'

data/test/signore/sig_finder_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml/store'
 require_relative '../test_helper'
 require_relative '../../lib/signore/sig_finder'
@@ -5,40 +7,42 @@ require_relative '../../lib/signore/tags'
 
 module Signore
   describe SigFinder do
+    verify_contract SigFinder
+
     let(:sigs) do
       Repo.new(path: Pathname.new('test/fixtures/signatures.yml')).sigs
     end
 
-    let(:sig_finder) { SigFinder.new(sigs) }
+    let(:sig_finder) { SigFinder.new }
 
-    describe '.find' do
+    describe '#find' do
       it 'returns a random Signature by default' do
-        _(SigFinder.find(sigs, random: Random.new(0)).text)
+        _(SigFinder.new(random: Random.new(0)).find(sigs).text)
           .must_include 'Amateur fighter pilot ignores orders'
-        _(SigFinder.find(sigs, random: Random.new(1)).text)
+        _(SigFinder.new(random: Random.new(1)).find(sigs).text)
           .must_equal '// sometimes I believe compiler ignores all my comments'
       end
 
       it 'returns a random signature if the tags are empty' do
-        _(SigFinder.find(sigs, tags: Tags.new, random: Random.new(1)).text)
-          .must_equal '// sometimes I believe compiler ignores all my comments'
+        _(SigFinder.new(random: Random.new(0)).find(sigs, tags: Tags.new).text)
+          .must_include 'Amateur fighter pilot ignores orders'
       end
 
       it 'returns a random signature based on provided tags' do
-        _(SigFinder.find(sigs, tags: Tags.new(required: %w(programming))).text)
+        _(sig_finder.find(sigs, tags: Tags.new(required: %w(programming))).text)
           .must_equal '// sometimes I believe compiler ignores all my comments'
-        _(SigFinder.find(sigs, tags: Tags.new(required: %w(work))).text)
+        _(sig_finder.find(sigs, tags: Tags.new(required: %w(work))).text)
           .must_equal 'You do have to be mad to work here, but it doesn’t help.'
       end
 
       it 'returns a random signature based on required and forbidden tags' do
         tags = Tags.new(forbidden: %w(programming security), required: %w(tech))
-        _(SigFinder.find(sigs, tags: tags).text)
+        _(sig_finder.find(sigs, tags: tags).text)
           .must_equal 'You do have to be mad to work here, but it doesn’t help.'
       end
 
       it 'returns a null object if there are no results' do
-        _(SigFinder.find([])).must_equal Signature.new
+        _(sig_finder.find([])).must_equal Signature.new
       end
     end
   end

data/test/signore/sig_from_stream_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require_relative '../test_helper'
 require_relative '../../lib/signore/sig_from_stream'
@@ -21,9 +23,7 @@ module Signore
 
           Gary Barnes
 
-
           asr
-
         end
         sig = nil
         capture_io { sig = SigFromStream.sig_from input }
@@ -37,9 +37,10 @@ module Signore
           ‘You’ve got an interesting accent. Subtle. I can’t place it.’
           ‘It’s text-to-speech… I was raised by smartphones.’
 
-          Patrick Ewing\n\n\n
-        end
+          Patrick Ewing
+
 
+        end
         sig = nil
         capture_io { sig = SigFromStream.sig_from input }
         text = <<-end.dedent.strip

data/test/signore/signature_test.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require_relative '../test_helper'
+require_relative '../../lib/signore/mapper'
 require_relative '../../lib/signore/signature'
 
-module Signore
+module Signore # rubocop:disable Metrics/ModuleLength
   describe Signature do
     describe '.new' do
       it 'instantiates Signatures via parameters' do
@@ -22,8 +25,18 @@ module Signore
       it 'nils empty parameters' do
         new = Signature.new(author: '', source: '', subject: '', tags: [],
                             text: '')
-        _(new).must_equal Signature.new(author: nil, source: nil, subject: nil,
-                                        tags: nil, text: nil)
+        _(new).must_equal Signature.new(author: '', source: '', subject: '',
+                                        tags: [], text: '')
+      end
+    end
+
+    describe '#empty?' do
+      it 'is true when the Signature is a null object' do
+        assert Signature.new.empty?
+      end
+
+      it 'is false when the Signature has some text' do
+        refute Signature.new(text: 'Node.jk').empty?
       end
     end
 
@@ -82,14 +95,12 @@ module Signore
       end
 
       it 'shows author and subject, space separated' do
-        text = 'She was good at playing abstract confusion ' \
-        'in the same way a midget is good at being short.'
-        sig = Signature.new(author: 'Clive James', subject: 'on Marilyn Monroe',
-                            text: text)
+        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
-          She was good at playing abstract confusion in
-          the same way a midget is good at being short.
-                        [Clive James on Marilyn Monroe]
+          More gangland camp than neo-noir.
+          [Nicholas Christopher on Pulp Fiction]
         end
       end
 
@@ -106,7 +117,7 @@ module Signore
 
       it 'handles edge cases properly' do
         YAML.load_file('test/fixtures/wrapper.yml').each do |sig, wrapped|
-          _(sig.to_s).must_equal wrapped
+          _(Mapper.from_h(sig.to_h).to_s).must_equal wrapped
         end
       end
     end

data/test/signore/tags_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper'
 require_relative '../../lib/signore/tags'
 
@@ -6,8 +8,8 @@ module Signore
     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?(nil)
-        assert Tags.new(forbidden: %w(fnord)).match?(nil)
+        assert Tags.new.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)
@@ -16,5 +18,15 @@ module Signore
         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)
+          .must_equal 'tech ~fnord'
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['MT_NO_EXPECTATIONS'] = 'true'
 require 'bundler/setup'
 require 'minitest/autorun'

data.tar.gz.sig

@@ -0,0 +1 @@
++9b�fS���Y������?
�N��i�򤆭+>p����㇈mM��5@�.��5,y�d��'����*w�Rg�^�㌵
� zYx/�q]�/|��	�A�������>`�����ޡb�!��T��hV��JN/	�U7�ST`vv�B�_*��68�G��->��\������fs��	�f��mJ;���s��^"i�:�^Ca*��@��5 5j!ύu[�vn�2�*P��(���

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMREwDwYDVQQDDAhjaGFz
+  dGVsbDEYMBYGCgmSJomT8ixkARkWCGNoYXN0ZWxsMRMwEQYKCZImiZPyLGQBGRYD
+  bmV0MB4XDTE1MTEwOTIxMTMwOVoXDTE2MTEwODIxMTMwOVowQjERMA8GA1UEAwwI
+  Y2hhc3RlbGwxGDAWBgoJkiaJk/IsZAEZFghjaGFzdGVsbDETMBEGCgmSJomT8ixk
+  ARkWA25ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcf6OF3mi6D
+  UedwY2A6fYEQF2bJVYQxV8fWHA5Q2R6y7Eg0hM80Q0yod7pJxlJTpnAPzuIl1u4y
+  hhfa/Vz0u6PVRhBYQ/Bcj9UEwgiXcy3P4ybINDeDt7GRVs3R9rRoT1aAsb5RCS0z
+  u/JKS2RcAS5XPpFow3Cfs5A/pM2NLsR/zeiaKg8rRB59A/tWw26F+YTaWfPAPFGv
+  d6af29NKWQh+EPkX1JwwtSwjKfVOeFr0csC6QLWKpp1z/7Lla8d3px426Ccjca0I
+  5VwtQeZ5LClTjqaYyH7vSojpOtgRuvVKspZ2jfe1KZq9jz//a/rSUrFcPlEQuXQp
+  i8E3TKoJrW0CAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFLi/J921Nb53s8GKtKptC08QmHnwMCAGA1UdEQQZMBeBFWNoYXN0ZWxsQGNo
+  YXN0ZWxsLm5ldDAgBgNVHRIEGTAXgRVjaGFzdGVsbEBjaGFzdGVsbC5uZXQwDQYJ
+  KoZIhvcNAQEFBQADggEBAA+rUbXujzqDv8WE7kkiJadQhxldq/cRhaJDMKSWF3/H
+  6PL/Me8zq8Ok7/pQtxBvAhKcy3DdsH0q5pyPHoMrYySxEo9lNXLvwCPsi21rR53b
+  2w5rBytYCxrhsXISKwCkBYwVwtICafZ8VtRbD3pgnsPv+9NYJJ/rN4Z34doWM7oK
+  CAfY6o0LcY+qmvqLvqpweyoO73wkfKGUSz1a09dJfAP5aIREQDvpYrWx2ZoDrAct
+  srwnZ6g5uTvNbd0I1SnvnCJJ5y5iPvJIBlnGb3QZ77y2XXCOy3Yc0rjK7A8bQt5t
+  xOlyYMPKhWx2IqEip+J7PBpBwMnxIPhTcNlFOj8mSa0=
+  -----END CERTIFICATE-----
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus
@@ -16,28 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: private_attr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +94,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.42.0
 description: signore helps manage email signatures and select random ones based on
   their tags
 email: chastell@chastell.net
@@ -154,6 +162,7 @@ files:
 - README.md
 - Rakefile
 - bin/signore
+- certs/chastell.pem
 - lib/signore.rb
 - lib/signore/cli.rb
 - lib/signore/mapper.rb
@@ -164,6 +173,7 @@ files:
 - lib/signore/signature.rb
 - lib/signore/tags.rb
 - signore.gemspec
+- test/fixtures/nosignatures.yml
 - test/fixtures/signatures.legacy.yml
 - test/fixtures/signatures.yml
 - test/fixtures/wrapper.yml
@@ -196,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: 'signore: an email signature manager/randomiser'
@@ -210,4 +220,3 @@ test_files:
 - test/signore/signature_test.rb
 - test/signore/tags_test.rb
 - test/test_helper.rb
-has_rdoc: