signore 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ae3bd13eb44a22d1617a29fe32e78f4b3f9abe1
+  data.tar.gz: bc38ff309685c63d6c4cc37b687bf6f37f7af13a
+SHA512:
+  metadata.gz: 8946f12a8af7ec349e419f688e95c9b98504b582bfbee04471aa33b8f3c61fd9336d17faeac680059556cf26c6f4bc844f5eb7df981d54a126842c5cadc4e6cf
+  data.tar.gz: ca59fe6dd1077779a688f8bbce6722d2c9ceb6fe71f5ae912b7f074cafc625d11a598474a2668f0d717ebe2f3608899e2e6b74a8a39de906bede9c630b6dfa4e

data/.rubocop.yml

@@ -0,0 +1,23 @@
+AccessModifierIndentation:
+  Enabled: false
+
+AlignHash:
+  Enabled: false
+
+AlignParameters:
+  Enabled: false
+
+AndOr:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+EndAlignment:
+  Enabled: false
+
+IndentationWidth:
+  Enabled: false
+
+MethodDefParentheses:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.1

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -2,21 +2,42 @@ PATH
   remote: .
   specs:
     signore (0.1.2)
-      lovely-rufus (>= 0.0.2)
-      trollop
+      lovely_rufus (~> 0.1.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    lovely-rufus (0.0.2)
-    minitest (2.11.4)
-    rake (0.9.2.2)
-    trollop (1.16.2)
+    ast (1.1.0)
+    json (1.8.1)
+    lovely_rufus (0.1.0)
+    minitest (5.2.3)
+    parser (2.1.4)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rainbow (2.0.0)
+    reek (1.3.6)
+      ruby2ruby (~> 2.0.7)
+      ruby_parser (~> 3.2)
+      sexp_processor
+    rubocop (0.18.1)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.3)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+    ruby2ruby (2.0.7)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.4.1)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.4.1)
+    slop (3.4.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (>= 2.11.1)
-  rake
+  minitest (~> 5.0)
+  reek (~> 1.3)
+  rubocop (~> 0.18.0)
   signore!

data/README.md

@@ -105,4 +105,4 @@ signore requires Ruby 1.9 and works best with Ruby 1.9.2 compiled with Psych (fo
 
 ---
 
-© MMIX-MMXII Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)
+© MMIX-MMXIII Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)

data/Rakefile

@@ -1,16 +1,18 @@
 require 'rake/testtask'
+require 'reek/rake/task'
+require 'rubocop/rake_task'
+
+task default: %i[spec rubocop reek]
 
 Rake::TestTask.new :spec do |task|
   task.test_files = FileList['spec/**/*_spec.rb']
+  task.warning    = true
 end
 
-desc 'Run signore console'
-task :console do
-  require 'irb'
-  require_relative 'lib/signore'
-  include Signore
-  ARGV.clear
-  IRB.start
+Reek::Rake::Task.new do |task|
+  task.config_files  = 'config/reek.yml'
+  task.fail_on_error = false
+  task.reek_opts     = '--quiet'
 end
 
-task default: :spec
+Rubocop::RakeTask.new

data/config/reek.yml

@@ -0,0 +1,14 @@
+DuplicateMethodCall:
+  exclude:
+  - Signore::Database#find
+
+IrresponsibleModule:
+  enabled: false
+
+NestedIterators:
+  exclude:
+  - Signore::Database#find
+  max_allowed_nesting: 2
+
+UnusedParameters:
+  enabled: false

data/lib/signore/database.rb

@@ -1,27 +1,24 @@
-# encoding: UTF-8
-
 module Signore class Database
-
   def initialize path
     @store = YAML::Store.new path
   end
 
   def << sig
-    @store.transaction do
-      @store['signatures'] ||= []
-      @store['signatures'] << sig
+    store.transaction do
+      store['signatures'] ||= []
+      store['signatures'] << sig
     end
   end
 
-  def find opts = {}
-    opts = { tags: [], no_tags: [] }.merge opts
-
-    @store.transaction true do
-      @store['signatures']
-        .select { |sig| opts[:tags].all?    { |tag| sig.tagged_with? tag } }
-        .reject { |sig| opts[:no_tags].any? { |tag| sig.tagged_with? tag } }
-        .shuffle.first
+  def find(forbidden_tags: [], random: Random.new, required_tags: [])
+    store.transaction true do
+      store['signatures']
+        .select { |sig| required_tags.all?  { |tag| sig.tagged_with? tag } }
+        .reject { |sig| forbidden_tags.any? { |tag| sig.tagged_with? tag } }
+        .sample random: random
     end
   end
 
+  attr_reader :store
+  private     :store
 end end

data/lib/signore/executable.rb

@@ -1,34 +1,23 @@
-# encoding: UTF-8
-
 module Signore class Executable
-
-  def initialize args = ARGV, db_class = Database
-    opts = Trollop.options args do
-      opt :database, 'Location of the signature database', default: ENV.fetch('XDG_DATA_HOME') { File.expand_path '~/.local/share' } + '/signore/signatures.yml'
+  def initialize args = ARGV, db_factory: Database
+    @settings = settings_from args
+    @db       = db_factory.new settings.db_path
+    unless %w[prego pronto].include? settings.action
+      abort 'usage: signore prego|pronto [tag, …]'
     end
-    Trollop.die 'usage: signore prego|pronto [label, …]' unless ['prego', 'pronto'].include? args.first
-
-    @db = db_class.new opts[:database]
-
-    @action = args.shift
-
-    @no_tags, @tags = args.partition { |tag| tag.start_with? '~' }
-    @no_tags.map! { |tag| tag[1..-1] }
   end
 
-  def run input = $stdin
-    case @action
-    when 'prego'
-      sig = @db.find tags: @tags, no_tags: @no_tags
-    when 'pronto'
-      params = get_params input
-      sig = Signature.new params[:text], params[:author], params[:source], params[:subject], @tags
-      @db << sig
-    end
-
+  def run(input: $stdin)
+    sig = case settings.action
+          when 'prego'  then handle_prego settings
+          when 'pronto' then handle_pronto input
+          end
     puts sig.to_s
   end
 
+  attr_reader :db, :settings
+  private     :db, :settings
+
   private
 
   def get_param param, input
@@ -38,10 +27,43 @@ module Signore class Executable
     value.strip
   end
 
-  def get_params input
-    Hash[[:text, :author, :subject, :source].map do |param|
+  def handle_prego settings
+    db.find required_tags: settings.required_tags,
+      forbidden_tags: settings.forbidden_tags
+  end
+
+  def handle_pronto input
+    params = params_from input
+    sig = Signature.new params.text, params.author, params.source,
+      params.subject, settings.required_tags
+    db << sig
+    sig
+  end
+
+  def settings_from args
+    OpenStruct.new.tap do |settings|
+      db_dir = ENV.fetch('XDG_DATA_HOME') { File.expand_path '~/.local/share' }
+      settings.db_path = "#{db_dir}/signore/signatures.yml"
+      parse_settings args, settings
+      settings.action = args.shift
+      settings.forbidden_tags, settings.required_tags = args.partition do |tag|
+        tag.start_with? '~'
+      end
+      settings.forbidden_tags.map! { |tag| tag[1..-1] }
+    end
+  end
+
+  def params_from input
+    OpenStruct.new Hash[[:text, :author, :subject, :source].map do |param|
       [param, get_param(param, input)]
     end].reject { |_, value| value.empty? }
   end
 
+  def parse_settings args, settings
+    OptionParser.new do |opts|
+      opts.on '-d', '--database PATH', 'Database location' do |path|
+        settings.db_path = path
+      end
+    end.parse! args
+  end
 end end

data/lib/signore/signature.rb

@@ -1,34 +1,39 @@
-module Signore class Signature < Struct.new :text, :author, :source, :subject, :tags
+module Signore Signature = Struct.new(*%i[text author source subject tags]) do
+  class << self
+    undef :[]
+  end
+
+  def self.[](author: nil, source: nil, subject: nil, tags: nil, text: nil)
+    new text, author, source, subject, tags
+  end
 
   def tagged_with? tag
     tags and tags.include? tag
   end
 
   def to_s
-    wrapped = LovelyRufus::Wrapper.new(text.gsub("\n", "\n\n")).wrapped(80).gsub("\n\n", "\n")
-    wrapped + meta_for(wrapped)
+    wrapped  = LovelyRufus::TextWrapper.wrap text.gsub("\n", "\n\n"), width: 80
+    squeezed = wrapped.gsub("\n\n", "\n").chomp
+    squeezed + meta_for(squeezed)
   end
 
   private
 
-  def meta
-    case
-    when author && subject && source then "#{author} #{subject}, #{source}"
-    when author && subject           then "#{author} #{subject}"
-    when author && source            then "#{author}, #{source}"
-    when author                      then "#{author}"
-    when source                      then "#{source}"
-    when subject                     then "#{subject}"
-    end
+  def indent_size_for text
+    indent = text_width(text) - meta.size - 2
+    indent < 0 ? 0 : indent
   end
 
-  def meta_for wrapped
-    return '' unless meta
-
-    indent = wrapped.split("\n").map(&:size).max - meta.size - 2
-    spaces = indent > 0 ? ' ' * indent : ''
+  def meta
+    stem = [author, subject].compact.join ' '
+    stem.empty? ? "#{source}" : [stem, source].compact.join(', ')
+  end
 
-    "\n#{spaces}[#{meta}]"
+  def meta_for text
+    meta.empty? ? '' : "\n#{' ' * indent_size_for(text)}[#{meta}]"
   end
 
+  def text_width text
+    text.split("\n").map(&:size).max
+  end
 end end

data/lib/signore.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
-require 'lovely-rufus'
-require 'trollop'
+require 'lovely_rufus'
+require 'optparse'
+require 'ostruct'
 require 'psych'
 require 'yaml/store'
 

data/signore.gemspec

@@ -1,17 +1,18 @@
 Gem::Specification.new do |gem|
   gem.name     = 'signore'
-  gem.version  = '0.1.2'
+  gem.version  = '0.2.0'
   gem.summary  = 'signore: an email signature manager/randomiser'
   gem.homepage = 'http://github.com/chastell/signore'
   gem.author   = 'Piotr Szotkowski'
   gem.email    = 'chastell@chastell.net'
 
   gem.files       = `git ls-files -z`.split "\0"
-  gem.executables = Dir['bin/*'].map { |d| d.split '/' }.map &:last
-  gem.test_files  = Dir['spec/**/*.rb']
+  gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename path }
+  gem.test_files  = gem.files.grep %r{^spec/.*\.rb$}
 
-  gem.add_dependency 'lovely-rufus', '>= 0.0.2'
-  gem.add_dependency 'trollop'
-  gem.add_development_dependency 'minitest', '>= 2.11.1'
-  gem.add_development_dependency 'rake'
+  gem.add_dependency 'lovely_rufus', '~> 0.1.0'
+
+  gem.add_development_dependency 'minitest', '~> 5.0'
+  gem.add_development_dependency 'reek',     '~> 1.3'
+  gem.add_development_dependency 'rubocop',  '~> 0.18.0'
 end

data/spec/fixtures/wrapper.yml

@@ -1,35 +1,42 @@
 # wrapping doesn’t affect one-liners
-- :text: Patches are like Free Software love letters.
-  :wrapped: Patches are like Free Software love letters.
+- - !ruby/struct:Signore::Signature
+    text: Patches are like Free Software love letters.
+  - |-
+    Patches are like Free Software love letters.
 
 # meta info is right-aligned on its own line
-- :text: I have a fever and it’s not disco related.
-  :meta: opi
-  :wrapped: |-
+- - !ruby/struct:Signore::Signature
+    text: I have a fever and it’s not disco related.
+    author: opi
+  - |-
     I have a fever and it’s not disco related.
                                          [opi]
 
 # more-than-80-column signatures are be wrapped, with the result being as short as possible
-- :text: It may look like I’m just sitting here doing nothing. But I’m really actively waiting for all my problems to go away.
-  :wrapped: |-
+- - !ruby/struct:Signore::Signature
+    text: It may look like I’m just sitting here doing nothing. But I’m really actively waiting for all my problems to go away.
+  - |-
     It may look like I’m just sitting here doing nothing. But
     I’m really actively waiting for all my problems to go away.
 
 # meta info is right-aligned to the longest line
-- :text: No, no, it’s spelled Raymond Luxury Yacht, but it’s pronounced Throatwobbler Mangrove.
-  :meta: Monty Python
-  :wrapped: |-
+- - !ruby/struct:Signore::Signature
+    text: No, no, it’s spelled Raymond Luxury Yacht, but it’s pronounced Throatwobbler Mangrove.
+    source: Monty Python
+  - |-
     No, no, it’s spelled Raymond Luxury Yacht,
     but it’s pronounced Throatwobbler Mangrove.
                                  [Monty Python]
 
 # multi-line signatures are wrapped on a line-by-line basis
-- :text: |-
+- - !ruby/struct:Signore::Signature
+    text: |-
       ‘The Ruby community should proceed with all deliberate speed towards ISO standardization of the language.’
       ‘Yeah, look what it did to Forth.’
       ‘Don’t just say it, show it. <http://vividpicture.com/aleks/atari/forth.jpg>’
-  :meta: M. Edward (Ed) Borasky, Matt Lawrence, Gregory Brown, ruby-talk
-  :wrapped: |-
+    author: M. Edward (Ed) Borasky, Matt Lawrence, Gregory Brown
+    source: ruby-talk
+  - |-
     ‘The Ruby community should proceed with all deliberate
     speed towards ISO standardization of the language.’
     ‘Yeah, look what it did to Forth.’
@@ -37,13 +44,15 @@
                 [M. Edward (Ed) Borasky, Matt Lawrence, Gregory Brown, ruby-talk]
 
 # long meta info is flushed left
-- :text: |-
+- - !ruby/struct:Signore::Signature
+    text: |-
       ‘The Guardian also had a pre-election column, in which an allegedly “ironic joke” was open to other interpretations: “John Wilkes Booth, Lee Harvey Oswald, John Hinckley Jr., where are you now that we need you?” They removed the column from on-line access and apologized.’
       ‘They should have. Hinckley missed the vital spot, so who needs him?’
       ‘As everybody knows, Reagan was killed in that attack and a lookalike was substituted.’
       ‘You mean we were governed all those years by an ACTOR!’
-  :meta: Spehro Pefhany, CyberCypher, Jess Askin, don groves, alt.usage.english
-  :wrapped: |-
+    author: Spehro Pefhany, CyberCypher, Jess Askin, don groves
+    source: alt.usage.english
+  - |-
     ‘The Guardian also had a pre-election column, in which an allegedly
     “ironic joke” was open to other interpretations: “John Wilkes Booth,
     Lee Harvey Oswald, John Hinckley Jr., where are you now that we need
@@ -55,26 +64,31 @@
     [Spehro Pefhany, CyberCypher, Jess Askin, don groves, alt.usage.english]
 
 # wrapping doesn’t left one-letter words at the end of lines
-- :text: I’ve been trying for some time to develop a lifestyle that doesn’t require my presence.
-  :meta: Gary Trudeau
-  :wrapped: |-
+- - !ruby/struct:Signore::Signature
+    text: I’ve been trying for some time to develop a lifestyle that doesn’t require my presence.
+    author: Gary Trudeau
+  - |-
     I’ve been trying for some time to develop
     a lifestyle that doesn’t require my presence.
                                    [Gary Trudeau]
 
 # there are no hangouts
-- :text: Better to teach a man to fish than to give him a fish. And if he can’t be bothered to learn to fish and starves to death, that’s a good enough outcome for me.
-  :meta: Steve VanDevender
-  :wrapped: |-
-    Better to teach a man to fish than to give him a fish.
-    And if he can’t be bothered to learn to fish and starves
-    to death, that’s a good enough outcome for me.
-                                         [Steve VanDevender]
+- - !ruby/struct:Signore::Signature
+    text: Better to teach a man to fish than to give him a fish. And if he can’t be bothered to learn to fish and starves to death, that’s a good enough outcome for me.
+    author: Steve VanDevender
+  - |-
+    Better to teach a man to fish than to give him
+    a fish. And if he can’t be bothered to learn to
+    fish and starves to death, that’s a good enough outcome for me.
+                                                [Steve VanDevender]
 
 # for two-line signatures, first line is considered for hangouts
-- :text: Well, the old ones go mmmmmbbbbzzzzttteeeeeep as they start up and the new ones go whupwhupwhupwhooopwhooooopwhooooooommmmmmmmmm.
-  :meta: Graham Reed on subway engines, asr
-  :wrapped: |-
+- - !ruby/struct:Signore::Signature
+    text: Well, the old ones go mmmmmbbbbzzzzttteeeeeep as they start up and the new ones go whupwhupwhupwhooopwhooooopwhooooooommmmmmmmmm.
+    author: Graham Reed
+    subject: on subway engines
+    source: asr
+  - |-
     Well, the old ones go mmmmmbbbbzzzzttteeeeeep as they start up
     and the new ones go whupwhupwhupwhooopwhooooopwhooooooommmmmmmmmm.
                                   [Graham Reed on subway engines, asr]

data/spec/signore/database_spec.rb

@@ -1,60 +1,43 @@
-# encoding: UTF-8
-
 require_relative '../spec_helper'
 
 module Signore describe Database do
-
   describe '#find' do
-
-    before do
-      srand
-      @db = Database.new 'spec/fixtures/signatures.yml'
-    end
+    let(:db)   { Database.new path              }
+    let(:path) { 'spec/fixtures/signatures.yml' }
 
     it 'returns a random signature by default' do
-      srand 1981
-      @db.find.text.must_equal 'Amateur fighter pilot ignores orders, listens to the voices in his head and slaughters thousands.'
-      srand 1979
-      @db.find.text.must_equal 'stay-at-home executives vs. wallstreet dads'
+      Database.new(path).find(random: Random.new(1981)).text
+        .must_include 'Amateur fighter pilot ignores orders'
+      Database.new(path).find(random: Random.new(2009)).text
+        .must_include '// sometimes I believe compiler ignores all my comments'
     end
 
     it 'returns a random signature if the tags are empty' do
-      srand 2009
-      @db.find(tags: []).text.must_equal '// sometimes I believe compiler ignores all my comments'
+      Database.new(path).find(required_tags: [], random: Random.new(2013)).text
+        .must_equal '// sometimes I believe compiler ignores all my comments'
     end
 
     it 'returns a random signature based on provided tags' do
-      @db.find(tags: ['programming']).text.must_equal '// sometimes I believe compiler ignores all my comments'
-      @db.find(tags: ['work']).text.must_equal        'You do have to be mad to work here, but it doesn’t help.'
+      db.find(required_tags: ['programming']).text
+        .must_equal '// sometimes I believe compiler ignores all my comments'
+      db.find(required_tags: ['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
-      @db.find(tags: ['tech'], no_tags: ['programming', 'security']).text.must_equal 'You do have to be mad to work here, but it doesn’t help.'
+      forbidden_tags = %w[programming security]
+      db.find(required_tags: ['tech'], forbidden_tags: forbidden_tags).text
+        .must_equal 'You do have to be mad to work here, but it doesn’t help.'
     end
-
   end
 
-  describe '#save' do
-
+  describe '#<<' do
     it 'saves the provided signature to disk' do
+      text = 'Normaliser Unix c’est comme pasteuriser le camembert.'
       file = Tempfile.new ''
       db   = Database.new file.path
-      sig  = Signature.new 'Normaliser Unix c’est comme pasteuriser le camembert.'
-
-      db << sig
-
-      file.read.must_equal <<-end.dedent
-        ---
-        signatures:
-        - !ruby/struct:Signore::Signature
-          text: Normaliser Unix c’est comme pasteuriser le camembert.
-          author: 
-          source: 
-          subject: 
-          tags: 
-      end
+      db  << Signature.new(text)
+      file.read.must_include text
     end
-
   end
-
 end end

data/spec/signore/executable_spec.rb

@@ -1,86 +1,89 @@
-# encoding: UTF-8
-
 require_relative '../spec_helper'
 
 module Signore describe Executable do
-
   describe '#initialize' do
-
     it 'prints usage if no command is given' do
-      stderr = capture_io { -> { Executable.new [] }.must_raise SystemExit }.last
-      stderr.must_include 'usage: signore prego|pronto [label, …]'
+      capture_io do
+        -> { Executable.new [] }.must_raise SystemExit
+      end.last.must_include 'usage: signore prego|pronto [tag, …]'
     end
 
     it 'prints usage if a bogus command is given' do
-      stderr = capture_io { -> { Executable.new ['bogus'] }.must_raise SystemExit }.last
-      stderr.must_include 'usage: signore prego|pronto [label, …]'
+      capture_io do
+        -> { Executable.new ['bogus'] }.must_raise SystemExit
+      end.last.must_include 'usage: signore prego|pronto [tag, …]'
     end
 
     it 'loads the signature database from the specified location' do
-      db_class = MiniTest::Mock.new
-      db_class.expect :new, nil, ['signatures.yml']
-      Executable.new ['-d', 'signatures.yml', 'prego'], db_class
-      db_class.verify
+      db_factory = MiniTest::Mock.new.expect :new, nil, ['signatures.yml']
+      Executable.new %w[-d signatures.yml prego], db_factory: db_factory
+      db_factory.verify
     end
 
-    it 'loads the signature database from ~/.local/share/signore/signatures.yml if no location specified' do
-      pending if ENV['XDG_DATA_HOME']
-      db_class = MiniTest::Mock.new
-      db_class.expect :new, nil, [File.expand_path('~/.local/share/signore/signatures.yml')]
-      Executable.new ['prego'], db_class
-      db_class.verify
+    it 'defaults to ~/.local/share/signore/signatures.yml' do
+      begin
+        orig = ENV.delete 'XDG_DATA_HOME'
+        default_path = File.expand_path '~/.local/share/signore/signatures.yml'
+        db_factory = MiniTest::Mock.new
+        db_factory.expect :new, nil, [default_path]
+        Executable.new ['prego'], db_factory: db_factory
+        db_factory.verify
+      ensure
+        ENV['XDG_DATA_HOME'] = orig if orig
+      end
     end
 
-    it 'loads the signature database from $XDG_DATA_HOME/signore/signatures.yml if $XDG_DATA_HOME is set' do
+    it 'defaults to $XDG_DATA_HOME/signore/signatures.yml' do
       begin
-        orig_data_home = ENV.delete 'XDG_DATA_HOME'
+        orig = ENV.delete 'XDG_DATA_HOME'
         ENV['XDG_DATA_HOME'] = Dir.tmpdir
-        db_class = MiniTest::Mock.new
-        db_class.expect :new, nil, ["#{ENV['XDG_DATA_HOME']}/signore/signatures.yml"]
-        Executable.new ['prego'], db_class
-        db_class.verify
+        default_path = "#{ENV['XDG_DATA_HOME']}/signore/signatures.yml"
+        db_factory = MiniTest::Mock.new
+        db_factory.expect :new, nil, [default_path]
+        Executable.new ['prego'], db_factory: db_factory
+        db_factory.verify
       ensure
-        orig_data_home ? ENV['XDG_DATA_HOME'] = orig_data_home : ENV.delete('XDG_DATA_HOME')
+        orig ? ENV['XDG_DATA_HOME'] = orig : ENV.delete('XDG_DATA_HOME')
       end
     end
-
   end
 
   describe '#run' do
-
     describe 'prego' do
-
       it 'prints a signature tagged with the provided tags' do
-        stdout = capture_io { Executable.new(['-d', 'spec/fixtures/signatures.yml', 'prego', 'tech', 'programming']).run }.first
-        stdout.must_equal <<-end.dedent
-          // sometimes I believe compiler ignores all my comments
-        end
+        args   = %w[-d spec/fixtures/signatures.yml prego tech programming]
+        output = "// sometimes I believe compiler ignores all my comments\n"
+        stdout = capture_io { Executable.new(args).run }.first
+        stdout.must_equal output
       end
 
       it 'prints a signature based on allowed and forbidden tags' do
-        stdout = capture_io { Executable.new(['-d', 'spec/fixtures/signatures.yml', 'prego', '~programming', 'tech', '~security']).run }.first
-        stdout.must_equal <<-end.dedent
+        path = 'spec/fixtures/signatures.yml'
+        args = %W[-d #{path} prego ~programming tech ~security]
+        out  = capture_io { Executable.new(args).run }.first
+        out.must_equal <<-end.dedent
           You do have to be mad to work here, but it doesn’t help.
                                                 [Gary Barnes, asr]
         end
       end
-
     end
 
     describe 'pronto' do
-
       before do
         @file = Tempfile.new ''
       end
 
-      it 'asks about signature parts and saves given signature with provided labels' do
+      it 'asks about signature parts and saves resulting signature' do
         input = StringIO.new <<-end.dedent
-          The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.\n
+          The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.
+
           Mark Pilgrim\n\n\n
         end
 
-        stdout = capture_io { Executable.new(['-d', @file.path, 'pronto', 'Wikipedia', 'ADHD']).run input }.first
-        stdout.must_equal <<-end.dedent
+        capture_io do
+          args = %W[-d #{@file.path} pronto Wikipedia ADHD]
+          Executable.new(args).run input: input
+        end.first.must_equal <<-end.dedent
           text?
           author?
           subject?
@@ -89,8 +92,9 @@ module Signore describe Executable do
                                                                 [Mark Pilgrim]
         end
 
-        stdout = capture_io { Executable.new(['-d', @file.path, 'prego', 'Wikipedia', 'ADHD']).run }.first
-        stdout.must_equal <<-end.dedent
+        capture_io do
+          Executable.new(%W[-d #{@file.path} prego Wikipedia ADHD]).run
+        end.first.must_equal <<-end.dedent
           The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.
                                                                 [Mark Pilgrim]
         end
@@ -98,25 +102,24 @@ module Signore describe Executable do
 
       it 'handles multi-line signatures' do
         input = StringIO.new <<-end.dedent
-          ‘I’ve gone through over-stressed to physical exhaustion – what’s next?’
-          ‘Tuesday.’\n
-          Simon Burr, Kyle Hearn\n\n\n
+          ‘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
 
-        stdout = capture_io { Executable.new(['-d', @file.path, 'pronto']).run input }.first
-        stdout.must_equal <<-end.dedent
+        capture_io do
+          Executable.new(['-d', @file.path, 'pronto']).run input: input
+        end.first.must_equal <<-end.dedent
           text?
           author?
           subject?
           source?
-          ‘I’ve gone through over-stressed to physical exhaustion – what’s next?’
-          ‘Tuesday.’
-                                                         [Simon Burr, Kyle Hearn]
+          ‘You’ve got an interesting accent. Subtle. I can’t place it.’
+          ‘It’s text-to-speech… I was raised by smartphones.’
+                                                        [Patrick Ewing]
         end
       end
-
     end
-
   end
-
 end end

data/spec/signore/signature_spec.rb

@@ -1,56 +1,84 @@
-# encoding: UTF-8
-
 require_relative '../spec_helper'
 
 module Signore describe Signature do
-
-  before do
-    @confusion, @mad, @compiler, @bruce, @dads, @starwars = YAML.load_file('spec/fixtures/signatures.yml')['signatures']
+  describe '.[]' do
+    it 'instantiates Signatures via parameters' do
+      source = 'A History of Modern Computing'
+      text   = 'In 1940 he summarized his work in an influential book, ' \
+        '‘Punched Card Methods in Scientific Computation’.'
+      sig    = Signature[author: 'Paul E. Ceruzzi', source: source,
+        subject: 'on Wallace Eckert', tags: ['punched cards'], text: text]
+      sig.author.must_equal 'Paul E. Ceruzzi'
+      sig.source.must_equal source
+      sig.subject.must_equal 'on Wallace Eckert'
+      sig.tags.must_equal ['punched cards']
+      sig.text.must_equal text
+    end
   end
 
   describe '#tagged_with?' do
-
     it 'says whether a tagged signature is tagged with a given tag' do
-      refute @compiler.tagged_with? 'fnord'
-      assert @compiler.tagged_with? 'programming'
-      assert @compiler.tagged_with? 'tech'
+      sig = Signature[tags: %w[programming tech]]
+      refute sig.tagged_with? 'fnord'
+      assert sig.tagged_with? 'programming'
+      assert sig.tagged_with? 'tech'
     end
 
     it 'says that an untagged signature is not tagged with any tag' do
-      refute @dads.tagged_with? 'fnord'
+      refute Signature.new.tagged_with? 'fnord'
     end
-
   end
 
   describe '#to_s' do
+    it 'does not show meta if there’s nothing to show' do
+      text = '// sometimes I believe compiler ignores all my comments'
+      sig  = Signature.new text
+      sig.to_s.must_equal text
+    end
 
-    it 'returns a signature formatted with meta information (if available)' do
-      @compiler.to_s.must_equal <<-end.dedent.strip
-        // sometimes I believe compiler ignores all my comments
-      end
-
-      @dads.to_s.must_equal <<-end.dedent.strip
+    it 'shows author on its own' do
+      sig = Signature.new 'stay-at-home executives vs. wallstreet dads', 'kodz'
+      sig.to_s.must_equal <<-end.dedent.strip
         stay-at-home executives vs. wallstreet dads
                                              [kodz]
       end
+    end
 
-      @mad.to_s.must_equal <<-end.dedent.strip
+    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 text, 'Gary Barnes', 'asr'
+      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]
       end
+    end
 
-      @bruce.to_s.must_equal <<-end.dedent.strip
+    it 'shows source on its own' do
+      text = 'Bruce Schneier knows Alice and Bob’s shared secret.'
+      sig  = Signature[text: text, source: 'Bruce Schneier Facts']
+      sig.to_s.must_equal <<-end.dedent.strip
         Bruce Schneier knows Alice and Bob’s shared secret.
                                      [Bruce Schneier Facts]
       end
+    end
 
-      @confusion.to_s.must_equal <<-end.dedent.strip
+    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[text: text, author: 'Clive James',
+        subject: 'on Marilyn Monroe']
+      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]
       end
+    end
 
-      @starwars.to_s.must_equal <<-end.dedent.strip
+    it 'shows subject on its own' do
+      text = 'Amateur fighter pilot ignores orders, listens ' \
+        'to the voices in his head and slaughters thousands.'
+      sig = Signature[text: text, subject: 'Star Wars ending explained']
+      sig.to_s.must_equal <<-end.dedent.strip
         Amateur fighter pilot ignores orders, listens to
         the voices in his head and slaughters thousands.
                             [Star Wars ending explained]
@@ -58,17 +86,9 @@ module Signore describe Signature do
     end
 
     it 'handles edge cases properly' do
-      class SignatureWithMeta < Signature
-        attr_accessor :meta
-      end
-
-      YAML.load_file('spec/fixtures/wrapper.yml').each do |sample|
-        sig = SignatureWithMeta.new sample[:text]
-        sig.meta = sample[:meta]
-        sig.to_s.must_equal sample[:wrapped]
+      YAML.load_file('spec/fixtures/wrapper.yml').each do |sig, wrapped|
+        sig.to_s.must_equal wrapped
       end
     end
-
   end
-
 end end

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
-gem 'minitest'
+require 'bundler/setup'
 require 'minitest/autorun'
-
+require 'minitest/pride'
 require 'pathname'
 require 'tempfile'
 require 'tmpdir'
 
-require_relative '../lib/signore'
+require 'signore'
 
 class String
   def dedent
-    gsub /^#{self[/\A\s*/]}/, ''
+    gsub(/^#{self[/\A\s*/]}/, '')
   end
 end

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: lovely-rufus
-  requirement: &13739880 !ruby/object:Gem::Requirement
-    none: false
+  name: lovely_rufus
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13739880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &13739160 !ruby/object:Gem::Requirement
-    none: false
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '5.0'
+  type: :development
   prerelease: false
-  version_requirements: *13739160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &13804800 !ruby/object:Gem::Requirement
-    none: false
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *13804800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &13804260 !ruby/object:Gem::Requirement
-    none: false
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
-  version_requirements: *13804260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 description: 
 email: chastell@chastell.net
 executables:
@@ -62,13 +73,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rvmrc
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
 - bin/signore
+- config/reek.yml
 - lib/signore.rb
 - lib/signore/database.rb
 - lib/signore/executable.rb
@@ -82,31 +95,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/chastell/signore
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: ! 'signore: an email signature manager/randomiser'
+specification_version: 4
+summary: 'signore: an email signature manager/randomiser'
 test_files:
-- spec/spec_helper.rb
+- spec/signore/database_spec.rb
 - spec/signore/executable_spec.rb
 - spec/signore/signature_spec.rb
-- spec/signore/database_spec.rb
-has_rdoc: 
+- spec/spec_helper.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm gemset use signore
-bundle