signore 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfa7081166f66138934fa81485de2426aedf599f
-  data.tar.gz: b793a96754856ac62bc6343843b0197354c0e00b
+  metadata.gz: 6cfb842786a542e13dc3cdee1e74bc008dd789a4
+  data.tar.gz: 3f0c4e0cb4e27b390fd32b62cb59fe7317b9f58b
 SHA512:
-  metadata.gz: 3287652982fef7bd53702ef29f6d3f1ec6b4cd0ef3b02c74078e2d75b92829f513fa0069f18bc2939ea2cf9685deca9116125bc805736a39ecaaa692c5f7df68
-  data.tar.gz: 15f769de2fdda15cacb79dfd8f611747a051f2a58253cca0cc29c91ab26912277632b3a55022c50bf6c2eb5f7b1978664438b07a00dc439e6283dc77c698b5c0
+  metadata.gz: 961505f7494b297608087821fb41c95f9d1fa4fa7cb9afb096467708cc036cf7011146fa9bac5aceaba0e4aab1d44fd90078917d5bdfe144841c103db415a14d
+  data.tar.gz: 5ffbfc986b267f701ddc91ba1bfcba3f9274c303b8fd7a24d0eb581357994532b04a918294e34e9bb5cce4efe2ff38ac5ed358e52b5b7afa465049f4d2dc1947

data/.rubocop.yml

@@ -1,14 +1,11 @@
-AndOr:
+Style/AndOr:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-Not:
+Style/Not:
   Enabled: false
 
-SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-TrailingComma:
+Style/TrailingComma:
   EnforcedStyleForMultiline: comma

data/.ruby-version

@@ -1 +1 @@
-2.1
+2.2

data/Gemfile.lock

@@ -1,62 +1,78 @@
 PATH
   remote: .
   specs:
-    signore (0.3.2)
-      lovely_rufus (~> 0.2.1)
+    signore (0.3.3)
+      lovely_rufus (~> 0.3.0)
+      private_attr (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    bogus (0.1.5)
+    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)
     dependor (1.0.1)
+    diff-lcs (1.2.5)
+    equalizer (0.0.9)
     ffi (1.9.6)
     hitimes (1.2.2)
-    listen (2.8.0)
+    ice_nine (0.11.1)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lovely_rufus (0.2.1)
-    minitest (5.4.3)
+    lovely_rufus (0.3.0)
+      private_attr (~> 1.0)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    minitest (5.5.1)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    parser (2.2.0.pre.7)
+    parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    powerpack (0.1.0)
+    private_attr (1.0.0)
+    procto (0.0.2)
     rainbow (2.0.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.4.0)
-      rainbow (>= 1.99, < 3.0)
-      ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (>= 3.5.0, < 4.0)
-      sexp_processor (~> 4.4)
+    reek (2.0.0)
+      parser (~> 2.2)
+      rainbow (~> 2.0)
+      unparser (~> 0.2.2)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.27.1)
+    rubocop (0.29.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
-    ruby2ruby (2.1.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.6.3)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.4.4)
-    slop (3.6.0)
+    ruby-progressbar (1.7.1)
+    thread_safe (0.3.4)
     timers (4.0.1)
       hitimes
+    unparser (0.2.2)
+      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.0.2)
+      procto (~> 0.0.2)
 
 PLATFORMS
   ruby
@@ -66,7 +82,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-focus (~> 1.1)
   rake (~> 10.1)
-  reek (~> 1.3)
+  reek (~> 2.0)
   rerun (~> 0.10.0)
-  rubocop (~> 0.27.0)
+  rubocop (~> 0.29.0)
   signore!

data/Rakefile

@@ -2,17 +2,16 @@ require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i(spec rubocop reek)
+task default: %i(test rubocop reek)
 
-Rake::TestTask.new(:spec) do |task|
-  task.test_files = FileList['spec/**/*_spec.rb']
-  task.warning    = true
+Rake::TestTask.new do |task|
+  task.pattern = 'test/**/*_test.rb'
+  task.warning = true
 end
 
 Reek::Rake::Task.new do |task|
-  task.config_files  = 'config/reek.yml'
+  task.config_file   = 'config/reek.yml'
   task.fail_on_error = false
-  task.reek_opts     = '--quiet'
 end
 
 RuboCop::RakeTask.new do |task|

data/lib/signore.rb

@@ -1 +1,4 @@
+require 'private_attr'
+Class.include PrivateAttr
+
 require_relative 'signore/cli'

data/lib/signore/cli.rb

@@ -22,8 +22,7 @@ module Signore
       end
     end
 
-    attr_reader :repo, :settings
-    private     :repo, :settings
+    private_attr_reader :repo, :settings
 
     private
 

data/lib/signore/repo.rb

@@ -30,8 +30,7 @@ module Signore
       end
     end
 
-    attr_reader :path, :sig_finder, :store
-    private     :path, :sig_finder, :store
+    private_attr_reader :path, :sig_finder, :store
 
     private
 

data/lib/signore/settings.rb

@@ -20,8 +20,7 @@ module Signore
       Tags.new(forbidden: forbidden, required: required)
     end
 
-    attr_reader :args
-    private     :args
+    private_attr_reader :args
 
     private
 

data/lib/signore/sig_finder.rb

@@ -18,7 +18,6 @@ module Signore
         .sample(random: random) or Signature.new
     end
 
-    attr_reader :random, :sigs
-    private     :random, :sigs
+    private_attr_reader :random, :sigs
   end
 end

data/lib/signore/sig_from_stream.rb

@@ -20,8 +20,7 @@ module Signore
                     text: params.text)
     end
 
-    attr_reader :input, :tags
-    private     :input, :tags
+    private_attr_reader :input, :tags
 
     private
 

data/signore.gemspec

@@ -7,19 +7,20 @@ 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.2'
+  gem.version     = '0.3.3'
 
   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.test_files  = gem.files.grep(/^test\/.*\.rb$/)
 
-  gem.add_dependency 'lovely_rufus', '~> 0.2.1'
+  gem.add_dependency 'lovely_rufus', '~> 0.3.0'
+  gem.add_dependency 'private_attr', '~> 1.0'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.0'
   gem.add_development_dependency 'minitest-focus', '~> 1.1'
   gem.add_development_dependency 'rake',           '~> 10.1'
-  gem.add_development_dependency 'reek',           '~> 1.3'
+  gem.add_development_dependency 'reek',           '~> 2.0'
   gem.add_development_dependency 'rerun',          '~> 0.10.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.27.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.29.0'
 end

data/{spec/signore/cli_spec.rb → test/signore/cli_test.rb}

@@ -2,7 +2,7 @@ require 'pathname'
 require 'stringio'
 require 'tempfile'
 require 'tmpdir'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/cli'
 
 module Signore
@@ -22,7 +22,7 @@ module Signore
 
       describe 'prego' do
         let(:repo) { Repo.new(path: path)                         }
-        let(:path) { Pathname.new('spec/fixtures/signatures.yml') }
+        let(:path) { Pathname.new('test/fixtures/signatures.yml') }
 
         it 'prints a signature tagged with the provided tags' do
           args = %w(prego tech programming)

data/{spec/signore/mapper_spec.rb → test/signore/mapper_test.rb}

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/mapper'
 require_relative '../../lib/signore/signature'
 

data/{spec/signore/repo_spec.rb → test/signore/repo_test.rb}

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'tempfile'
 require 'tmpdir'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/repo'
 require_relative '../../lib/signore/signature'
 require_relative '../../lib/signore/tags'
@@ -20,14 +20,14 @@ module Signore
       end
 
       it 'rewrites legacy YAML files on save' do
-        FileUtils.cp Pathname.new('spec/fixtures/signatures.legacy.yml'), path
+        FileUtils.cp Pathname.new('test/fixtures/signatures.legacy.yml'), path
         Repo.new(path: path) << sig
         path.read.wont_include 'Signore::Signature'
       end
     end
 
     describe '#find' do
-      let(:path)       { Pathname.new('spec/fixtures/signatures.yml') }
+      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(:sigs)       { repo.sigs                                    }
@@ -55,7 +55,7 @@ module Signore
       end
 
       it 'keeps working with legacy YAML files' do
-        path = Pathname.new('spec/fixtures/signatures.legacy.yml')
+        path = Pathname.new('test/fixtures/signatures.legacy.yml')
         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
@@ -64,7 +64,7 @@ module Signore
 
     describe '#sigs' do
       it 'returns all the Signatures from the Repo' do
-        path = Pathname.new('spec/fixtures/signatures.yml')
+        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'

data/{spec/signore/settings_spec.rb → test/signore/settings_test.rb}

@@ -1,6 +1,6 @@
 require 'pathname'
 require 'tmpdir'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/settings'
 require_relative '../../lib/signore/tags'
 
@@ -16,12 +16,11 @@ module Signore
       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"
+          ENV['XDG_DATA_HOME'] = Dir.mktmpdir
+          path = "#{ENV['XDG_DATA_HOME']}/signore/signatures.yml"
           Settings.new.repo_path.must_equal Pathname.new(path)
         ensure
-          FileUtils.rmtree tempdir
+          FileUtils.rmtree ENV['XDG_DATA_HOME']
           old_xdg ? ENV['XDG_DATA_HOME'] = old_xdg : ENV.delete('XDG_DATA_HOME')
         end
       end

data/{spec/signore/sig_finder_spec.rb → test/signore/sig_finder_test.rb}

@@ -1,12 +1,12 @@
 require 'yaml/store'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/sig_finder'
 require_relative '../../lib/signore/tags'
 
 module Signore
   describe SigFinder do
     let(:sigs) do
-      Repo.new(path: Pathname.new('spec/fixtures/signatures.yml')).sigs
+      Repo.new(path: Pathname.new('test/fixtures/signatures.yml')).sigs
     end
 
     let(:sig_finder) { SigFinder.new(sigs) }

data/{spec/signore/sig_from_stream_spec.rb → test/signore/sig_from_stream_test.rb}

@@ -1,5 +1,5 @@
 require 'stringio'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/sig_from_stream'
 
 module Signore

data/{spec/signore/signature_spec.rb → test/signore/signature_test.rb}

@@ -1,5 +1,5 @@
 require 'yaml'
-require_relative '../spec_helper'
+require_relative '../test_helper'
 require_relative '../../lib/signore/signature'
 
 module Signore
@@ -49,7 +49,6 @@ module Signore
         sig.to_h.must_equal 'author' => 'Anonymous Coward', 'source' => '/.',
                             'subject' => 'on ‘Monty Wants to Save MySQL’',
                             'tags' => %w(/. MySQL), 'text' => text
-
       end
 
       it 'removes non-existing keys' do
@@ -115,7 +114,7 @@ module Signore
       end
 
       it 'handles edge cases properly' do
-        YAML.load_file('spec/fixtures/wrapper.yml').each do |sig, wrapped|
+        YAML.load_file('test/fixtures/wrapper.yml').each do |sig, wrapped|
           sig.to_s.must_equal wrapped
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: private_attr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
 description: signore helps manage email signatures and select random ones based on
   their tags
 email: chastell@chastell.net
@@ -149,17 +163,17 @@ files:
 - lib/signore/signature.rb
 - lib/signore/tags.rb
 - signore.gemspec
-- spec/fixtures/signatures.legacy.yml
-- spec/fixtures/signatures.yml
-- spec/fixtures/wrapper.yml
-- spec/signore/cli_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
-- spec/signore/signature_spec.rb
-- spec/spec_helper.rb
+- test/fixtures/signatures.legacy.yml
+- 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
+- test/signore/sig_from_stream_test.rb
+- test/signore/signature_test.rb
+- test/test_helper.rb
 homepage: http://github.com/chastell/signore
 licenses:
 - AGPL-3.0
@@ -180,16 +194,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'signore: an email signature manager/randomiser'
 test_files:
-- spec/signore/cli_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
-- spec/signore/signature_spec.rb
-- spec/spec_helper.rb
+- 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
+- test/signore/sig_from_stream_test.rb
+- test/signore/signature_test.rb
+- test/test_helper.rb