signore 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4429b92a7301b71b4b710583e55ce18a5b46777f
-  data.tar.gz: dcf99b4753c4e304385ae67c2b90a9c69eb53899
+  metadata.gz: bfa7081166f66138934fa81485de2426aedf599f
+  data.tar.gz: b793a96754856ac62bc6343843b0197354c0e00b
 SHA512:
-  metadata.gz: 7b091b37f94a2451db56b668896b2faa52ed05e00dd583d12f633d292b767fdfee282bf70f4d316b861b3de11a745728191f00225a76d0702905225a9e8a0010
-  data.tar.gz: 12648f89f7636705a019a020c94cd279d302ea110e57ec317fdd0ebc6f7636a0fcb87c038d11f4e50950dc6347253858ce771a8369cfe238ac380bd1ce3673b2
+  metadata.gz: 3287652982fef7bd53702ef29f6d3f1ec6b4cd0ef3b02c74078e2d75b92829f513fa0069f18bc2939ea2cf9685deca9116125bc805736a39ecaaa692c5f7df68
+  data.tar.gz: 15f769de2fdda15cacb79dfd8f611747a051f2a58253cca0cc29c91ab26912277632b3a55022c50bf6c2eb5f7b1978664438b07a00dc439e6283dc77c698b5c0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    signore (0.3.1)
-      lovely_rufus (~> 0.2.0)
+    signore (0.3.2)
+      lovely_rufus (~> 0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -17,12 +17,12 @@ GEM
     dependor (1.0.1)
     ffi (1.9.6)
     hitimes (1.2.2)
-    listen (2.7.11)
+    listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lovely_rufus (0.2.0)
-    minitest (5.4.2)
+    lovely_rufus (0.2.1)
+    minitest (5.4.3)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
     parser (2.2.0.pre.7)
@@ -34,16 +34,16 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.3.8)
+    reek (1.4.0)
       rainbow (>= 1.99, < 3.0)
       ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (~> 3.3)
-      sexp_processor
+      ruby_parser (>= 3.5.0, < 4.0)
+      sexp_processor (~> 4.4)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.27.0)
+    rubocop (0.27.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.6, < 3.0)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)

data/README.md

@@ -71,7 +71,7 @@ Another aproach would be to create a named pipe that your email program reads fr
 Properties
 ----------
 
-Most `Signature`s have `text` and `tags`, some also have `author`, `source` and `subject`. Currently `tags` are used to query the sig database, while `author`, `source` and `subject` are combined into meta information displayed below the actual signature (right aligned and and in square brackets).
+Most `Signature`s have `text` and `tags`, some also have `author`, `source` and `subject`. Currently `tags` are used to query the sig repository, while `author`, `source` and `subject` are combined into meta information displayed below the actual signature (right aligned and and in square brackets).
 
 The `text` of the `Signature`s is wrapped to 80 characters or fewer upon display (separately for every line). Additionally, if the result is two lines, signore attempts to make them roughly the same length. The wrapping engine also attempts to avoid one-letter words at ends of lines (moving them to the next line if possible).
 

data/config/reek.yml

@@ -17,4 +17,4 @@ NestedIterators:
 UtilityFunction:
   exclude:
     - Signore::Mapper#from_h
-    - Signore::Settings#db_path
+    - Signore::Settings#repo_path

data/lib/signore/cli.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require_relative 'database'
+require_relative 'repo'
 require_relative 'settings'
 require_relative 'sig_from_stream'
 
@@ -9,9 +9,9 @@ module Signore
 
     delegate %i(action tags) => :settings
 
-    def initialize(args = ARGV, db: Database.new)
+    def initialize(args = ARGV, repo: Repo.new)
       @settings = Settings.new(args)
-      @db       = db
+      @repo     = repo
     end
 
     def run(input: $stdin)
@@ -22,17 +22,17 @@ module Signore
       end
     end
 
-    attr_reader :db, :settings
-    private     :db, :settings
+    attr_reader :repo, :settings
+    private     :repo, :settings
 
     private
 
     def create_sig_from(input)
-      SigFromStream.sig_from(input, tags: tags).tap { |sig| db << sig }
+      SigFromStream.sig_from(input, tags: tags).tap { |sig| repo << sig }
     end
 
     def retrieve_sig
-      db.find(tags: tags)
+      repo.find(tags: tags)
     end
   end
 end

data/lib/signore/{database.rb → repo.rb}

@@ -7,8 +7,8 @@ require_relative 'signature'
 require_relative 'tags'
 
 module Signore
-  class Database
-    def initialize(path: Settings.new.db_path, sig_finder: SigFinder)
+  class Repo
+    def initialize(path: Settings.new.repo_path, sig_finder: SigFinder)
       @path       = path
       @sig_finder = sig_finder
       initialise_store if path.zero? or not path.exist?

data/lib/signore/settings.rb

@@ -11,9 +11,9 @@ module Signore
       args.first
     end
 
-    def db_path
-      db_dir = ENV.fetch('XDG_DATA_HOME') { File.expand_path('~/.local/share') }
-      Pathname.new("#{db_dir}/signore/signatures.yml")
+    def repo_path
+      dir = ENV.fetch('XDG_DATA_HOME') { File.expand_path('~/.local/share') }
+      Pathname.new("#{dir}/signore/signatures.yml")
     end
 
     def tags

data/signore.gemspec

@@ -7,13 +7,13 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'signore'
   gem.summary     = 'signore: an email signature manager/randomiser'
-  gem.version     = '0.3.1'
+  gem.version     = '0.3.2'
 
   gem.files       = `git ls-files -z`.split "\0"
   gem.executables = gem.files.grep(/^bin\//).map { |path| File.basename(path) }
   gem.test_files  = gem.files.grep(/^spec\/.*\.rb$/)
 
-  gem.add_dependency 'lovely_rufus', '~> 0.2.0'
+  gem.add_dependency 'lovely_rufus', '~> 0.2.1'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.0'

data/spec/fixtures/wrapper.yml

@@ -77,10 +77,10 @@
     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]
+    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
 - - !ruby/struct:Signore::Signature

data/spec/signore/cli_spec.rb

@@ -21,19 +21,19 @@ module Signore
       end
 
       describe 'prego' do
-        let(:db)   { Database.new(path: path)                     }
+        let(:repo) { Repo.new(path: path)                         }
         let(:path) { Pathname.new('spec/fixtures/signatures.yml') }
 
         it 'prints a signature tagged with the provided tags' do
           args = %w(prego tech programming)
-          out  = capture_io { CLI.new(args, db: db).run }.first
+          out  = capture_io { CLI.new(args, repo: repo).run }.first
           sig  = "// sometimes I believe compiler ignores all my comments\n"
           out.must_equal sig
         end
 
         it 'prints a signature based on allowed and forbidden tags' do
           args = %w(prego ~programming tech ~security)
-          out  = capture_io { CLI.new(args, db: db).run }.first
+          out  = capture_io { CLI.new(args, repo: repo).run }.first
           out.must_equal <<-end.dedent
             You do have to be mad to work here, but it doesn’t help.
                                                   [Gary Barnes, asr]
@@ -42,7 +42,7 @@ module Signore
       end
 
       describe 'pronto' do
-        let(:db) { Database.new(path: Pathname.new(Tempfile.new('').path)) }
+        let(:repo) { Repo.new(path: Pathname.new(Tempfile.new('').path)) }
 
         it 'asks about signature parts and saves resulting signature' do
           input = StringIO.new <<-end.dedent
@@ -51,7 +51,7 @@ module Signore
             Mark Pilgrim\n\n\n
           end
           args = %w(pronto Wikipedia ADHD)
-          out  = capture_io { CLI.new(args, db: db).run input: input }.first
+          out  = capture_io { CLI.new(args, repo: repo).run input: input }.first
           out.must_equal <<-end.dedent
             text?
             author?
@@ -61,7 +61,7 @@ module Signore
                                                                   [Mark Pilgrim]
           end
           args = %w(prego Wikipedia ADHD)
-          out  = capture_io { CLI.new(args, db: db).run }.first
+          out  = capture_io { CLI.new(args, repo: repo).run }.first
           out.must_equal <<-end.dedent
             The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.
                                                                   [Mark Pilgrim]
@@ -75,7 +75,7 @@ module Signore
 
             Patrick Ewing\n\n\n
           end
-          io = capture_io { CLI.new(['pronto'], db: db).run input: input }
+          io = capture_io { CLI.new(['pronto'], repo: repo).run input: input }
           io.first.must_equal <<-end.dedent
             text?
             author?

data/spec/signore/{database_spec.rb → repo_spec.rb}

@@ -3,52 +3,52 @@ require 'pathname'
 require 'tempfile'
 require 'tmpdir'
 require_relative '../spec_helper'
-require_relative '../../lib/signore/database'
+require_relative '../../lib/signore/repo'
 require_relative '../../lib/signore/signature'
 require_relative '../../lib/signore/tags'
 
 module Signore
-  describe Database do
+  describe Repo do
     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.' }
 
       it 'saves the provided signature to disk' do
-        Database.new(path: path) << sig
+        Repo.new(path: path) << sig
         path.read.must_include text
       end
 
       it 'rewrites legacy YAML files on save' do
         FileUtils.cp Pathname.new('spec/fixtures/signatures.legacy.yml'), path
-        Database.new(path: path) << sig
+        Repo.new(path: path) << sig
         path.read.wont_include 'Signore::Signature'
       end
     end
 
     describe '#find' do
-      let(:database)   { Database.new(path: path, sig_finder: sig_finder) }
-      let(:path)       { Pathname.new('spec/fixtures/signatures.yml')     }
-      let(:sig_finder) { fake(:sig_finder, as: :class)                    }
-      let(:sigs)       { database.sigs                                    }
-      let(:store)      { YAML::Store.new(path)                            }
+      let(:path)       { Pathname.new('spec/fixtures/signatures.yml') }
+      let(:repo)       { Repo.new(path: path, sig_finder: sig_finder) }
+      let(:sig_finder) { fake(:sig_finder, as: :class)                }
+      let(:sigs)       { repo.sigs                                    }
+      let(:store)      { YAML::Store.new(path)                        }
 
       it 'returns a random signature by default' do
         stub(sig_finder).find(sigs, tags: Tags.new) { sigs.last }
-        database.find.must_equal sigs.last
+        repo.find.must_equal sigs.last
       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 }
-        database.find(tags: tags).must_equal sigs.last
+        repo.find(tags: tags).must_equal sigs.last
       end
 
       it 'doesn’t blow up if the path is missing' do
         begin
           tempdir = Dir.mktmpdir
           path = Pathname.new("#{tempdir}/some_intermediate_dir/sigs.yml")
-          Database.new(path: path).find(tags: Tags.new).must_equal Signature.new
+          Repo.new(path: path).find(tags: Tags.new).must_equal Signature.new
         ensure
           FileUtils.rmtree tempdir
         end
@@ -56,16 +56,16 @@ module Signore
 
       it 'keeps working with legacy YAML files' do
         path = Pathname.new('spec/fixtures/signatures.legacy.yml')
-        database = Database.new(path: path, sig_finder: sig_finder)
+        repo = Repo.new(path: path, sig_finder: sig_finder)
         stub(sig_finder).find(sigs, tags: Tags.new) { sigs.last }
-        database.find.must_equal sigs.last
+        repo.find.must_equal sigs.last
       end
     end
 
     describe '#sigs' do
-      it 'returns all the Signatures from the Database' do
+      it 'returns all the Signatures from the Repo' do
         path = Pathname.new('spec/fixtures/signatures.yml')
-        sigs = Database.new(path: path).sigs
+        sigs = Repo.new(path: path).sigs
         sigs.size.must_equal 6
         sigs.first.author.must_equal 'Clive James'
         sigs.last.subject.must_equal 'Star Wars ending explained'

data/spec/signore/settings_spec.rb

@@ -12,14 +12,14 @@ module Signore
       end
     end
 
-    describe '#db_path' do
+    describe '#repo_path' do
       it 'honours XDG_DATA_HOME if it’s set' do
         begin
           old_xdg = ENV.delete('XDG_DATA_HOME')
           tempdir = Dir.mktmpdir
           ENV['XDG_DATA_HOME'] = tempdir
           path = "#{tempdir}/signore/signatures.yml"
-          Settings.new.db_path.must_equal Pathname.new(path)
+          Settings.new.repo_path.must_equal Pathname.new(path)
         ensure
           FileUtils.rmtree tempdir
           old_xdg ? ENV['XDG_DATA_HOME'] = old_xdg : ENV.delete('XDG_DATA_HOME')
@@ -30,7 +30,7 @@ module Signore
         begin
           old_xdg = ENV.delete('XDG_DATA_HOME')
           path    = File.expand_path('~/.local/share/signore/signatures.yml')
-          Settings.new.db_path.must_equal Pathname.new(path)
+          Settings.new.repo_path.must_equal Pathname.new(path)
         ensure
           ENV['XDG_DATA_HOME'] = old_xdg if old_xdg
         end

data/spec/signore/sig_finder_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../lib/signore/tags'
 module Signore
   describe SigFinder do
     let(:sigs) do
-      Database.new(path: Pathname.new('spec/fixtures/signatures.yml')).sigs
+      Repo.new(path: Pathname.new('spec/fixtures/signatures.yml')).sigs
     end
 
     let(:sig_finder) { SigFinder.new(sigs) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -141,8 +141,8 @@ files:
 - config/reek.yml
 - lib/signore.rb
 - lib/signore/cli.rb
-- lib/signore/database.rb
 - lib/signore/mapper.rb
+- lib/signore/repo.rb
 - lib/signore/settings.rb
 - lib/signore/sig_finder.rb
 - lib/signore/sig_from_stream.rb
@@ -153,8 +153,8 @@ files:
 - spec/fixtures/signatures.yml
 - spec/fixtures/wrapper.yml
 - spec/signore/cli_spec.rb
-- spec/signore/database_spec.rb
 - spec/signore/mapper_spec.rb
+- spec/signore/repo_spec.rb
 - spec/signore/settings_spec.rb
 - spec/signore/sig_finder_spec.rb
 - spec/signore/sig_from_stream_spec.rb
@@ -186,8 +186,8 @@ specification_version: 4
 summary: 'signore: an email signature manager/randomiser'
 test_files:
 - spec/signore/cli_spec.rb
-- spec/signore/database_spec.rb
 - spec/signore/mapper_spec.rb
+- spec/signore/repo_spec.rb
 - spec/signore/settings_spec.rb
 - spec/signore/sig_finder_spec.rb
 - spec/signore/sig_from_stream_spec.rb