signore 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89502aa06cad37d7834baf70be3c8721f2836819
-  data.tar.gz: 0b1eff879e6481e1b6a9fe5d649c8bffc07ac355
+SHA256:
+  metadata.gz: dbdddb275117ac24cdd81c8c415abd9141edb88b99336fe6ba1f85949f5b8c21
+  data.tar.gz: 3f24b5ec1f8e15e82e39c5bb1475027c3fb5eb4fecca76b89ca3129f1df0ef7c
 SHA512:
-  metadata.gz: 7b63d9935c384eb27522c0759f1bd380a24ae3c06590a2561b2cc36345015603925710de79007065a4bf59b19fc15f04eb79cb402505bb6ee628b678100f2035
-  data.tar.gz: 3d1df2ec0ba886c86c0d06231bb001931009ee442aa944b152b84044ae0e195a373ac055a5e3f8225a0660043a1646dd3851b8ac6cba94308d50d1386f0f8aa2
+  metadata.gz: 26afc9d20e02346291c5cc5df08740f4b22a35b1f1207ec63b81d25fbb79a476e9cd3f83769de77c7198611f0d302a16af52e73c6a4977708218d4d268a2bbf8
+  data.tar.gz: cfc553dbcc66881b8562124f478a034657ba486811ce965e45906af5d0a1ab66c21448bbbdaa8bba8145fa8d6b33491bf48039d20ee5998c211651a0aa101258

data/.overcommit.yml

@@ -0,0 +1,4 @@
+PreCommit:
+  RakeTarget:
+    enabled: true
+    targets: [default]

data/.reek.yml

@@ -0,0 +1,3 @@
+detectors:
+  IrresponsibleModule:
+    enabled: false

data/.rubocop.yml

@@ -1,3 +1,11 @@
+Metrics/BlockLength:
+  Exclude:
+    - signore.gemspec
+    - test/**/*
+
+Naming/HeredocDelimiterCase:
+  Enabled: false
+
 Style/AndOr:
   Enabled: false
 
@@ -7,11 +15,11 @@ Style/Documentation:
 Style/EmptyCaseCondition:
   Enabled: false
 
-Style/Not:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
+Style/Not:
+  Enabled: false
 
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
+Style/StructInheritance:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.3
+2.5

data/.travis.yml

@@ -1,10 +1,11 @@
-cache: bundler
-fast_finish: true
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle
 language: ruby
 matrix:
   allow_failures:
     - rvm: ruby-head
 rvm:
-  - ruby-2.3.0
+  - 2.5
   - ruby-head
-sudo: false

data/Rakefile

@@ -1,10 +1,9 @@
-# frozen_string_literal: true
-
+require 'bundler/setup'
 require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i(test rubocop reek)
+task default: %i[test rubocop reek]
 
 Rake::TestTask.new do |task|
   task.pattern = 'test/**/*_test.rb'
@@ -13,7 +12,6 @@ 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,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 require_relative '../lib/signore'
 trap(:INT) { exit }

data/certs/chastell.pem

@@ -1,21 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

data/gems.locked

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    signore (0.7.0)
+      lovely_rufus (~> 1.0)
+      procto (~> 0.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    bogus (0.1.6)
+      dependor (>= 0.0.4)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    codeclimate-engine-rb (0.4.1)
+      virtus (~> 1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    dependor (1.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.11)
+    ffi (1.9.25)
+    ice_nine (0.11.2)
+    iniparse (1.4.4)
+    jaro_winkler (1.5.1)
+    kwalify (0.7.2)
+    lovely_rufus (1.0.1)
+    minitest (5.11.3)
+    minitest-focus (1.1.2)
+      minitest (>= 4, < 6)
+    overcommit (0.46.0)
+      childprocess (~> 0.6, >= 0.6.3)
+      iniparse (~> 1.4)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    procto (0.0.3)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    reek (5.2.0)
+      codeclimate-engine-rb (~> 0.4.0)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
+      rainbow (>= 2.0, < 4.0)
+    rubocop (0.60.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    thread_safe (0.3.6)
+    unicode-display_width (1.4.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
+
+DEPENDENCIES
+  bogus (~> 0.1.3)
+  minitest (~> 5.6)
+  minitest-focus (~> 1.1)
+  overcommit (~> 0.46.0)
+  rake (~> 12.0)
+  reek (~> 5.0)
+  rubocop (~> 0.60.0)
+  signore!
+
+BUNDLED WITH
+   1.17.1

data/{Gemfile → gems.rb}

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

data/lib/signore.rb

@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 require_relative 'signore/cli'

data/lib/signore/cli.rb

@@ -1,15 +1,14 @@
-# frozen_string_literal: true
-
 require 'forwardable'
 require_relative 'repo'
 require_relative 'settings'
+require_relative 'sig_finder'
 require_relative 'sig_from_stream'
 
 module Signore
   class CLI
     extend Forwardable
 
-    delegate %i(action tags) => :settings
+    delegate %i[action tags] => :settings
 
     def initialize(args = ARGV, repo: Repo.new)
       @settings = Settings.new(args)
@@ -29,7 +28,7 @@ module Signore
     attr_reader :repo, :settings
 
     def prego
-      sig = repo.find(tags: tags)
+      sig = SigFinder.find(repo.sigs, tags: tags)
       puts case
            when repo.empty? then 'No signatures found.'
            when sig.empty?  then "Sadly no signatures are tagged #{tags}."
@@ -38,7 +37,7 @@ module Signore
     end
 
     def create_sig_from(input)
-      SigFromStream.sig_from(input, tags: tags).tap { |sig| repo << sig }
+      SigFromStream.call(input, tags: tags).tap { |sig| repo << sig }
     end
   end
 end

data/lib/signore/repo.rb

@@ -1,53 +1,55 @@
-# frozen_string_literal: true
-
 require 'forwardable'
+require 'pathname'
 require 'yaml/store'
-require_relative 'mapper'
-require_relative 'settings'
-require_relative 'sig_finder'
+require_relative 'signature'
 require_relative 'tags'
 
 module Signore
   class Repo
+    class << self
+      def default_path
+        dir = ENV.fetch('XDG_DATA_HOME') { File.expand_path('~/.local/share') }
+        Pathname.new(dir) / 'signore' / 'signatures.yml'
+      end
+    end
+
     extend Forwardable
 
-    def initialize(path: Settings.new.repo_path, sig_finder: SigFinder.new)
-      @path       = path
-      @sig_finder = sig_finder
+    def initialize(path: self.class.default_path)
+      @path = path
       convert if legacy?
     end
 
-    def <<(sig)
-      store.transaction { (store['signatures'] ||= []) << Mapper.to_h(sig) }
+    def <<(signature)
+      self.hashes = hashes + [signature.to_h]
     end
 
-    delegate empty?: :sigs
-
-    def find(tags: Tags.new)
-      sig_finder.find(sigs, tags: tags)
-    end
+    delegate empty?: :hashes
 
     def sigs
-      @sigs ||= begin
-        hashes = store.transaction(true) { store.fetch('signatures', []) }
-        hashes.map(&Mapper.method(:from_h))
-      end
+      hashes.map(&Signature.method(:from_h))
     end
 
     private
 
-    attr_reader :path, :sig_finder
+    attr_reader :path
 
     def convert
-      store.transaction do
-        store['signatures'] = store.fetch('signatures', []).map(&:to_h)
-      end
+      self.hashes = hashes.map(&:to_h)
     end
 
     def legacy?
       path.exist? and path.read.include?('Signore::Signature')
     end
 
+    def hashes
+      store.transaction(true) { store.fetch('signatures', []) }
+    end
+
+    def hashes=(hashes)
+      store.transaction { store['signatures'] = hashes }
+    end
+
     def store
       @store ||= begin
         path.dirname.mkpath

data/lib/signore/settings.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'pathname'
 require_relative 'tags'
 
@@ -13,12 +11,6 @@ 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
       negated, required = tag_names.partition { |name| name.start_with?('~') }
       Tags.new(forbidden: negated.map { |neg| neg[1..-1] }, required: required)
@@ -29,7 +21,7 @@ module Signore
     attr_reader :args
 
     def tag_names
-      args[1..-1] or []
+      args.empty? ? [] : args[1..-1]
     end
   end
 end

data/lib/signore/sig_finder.rb

@@ -1,21 +1,13 @@
-# frozen_string_literal: true
-
 require_relative 'signature'
 require_relative 'tags'
 
 module Signore
-  class SigFinder
-    def initialize(random: Random.new)
-      @random = random
-    end
+  module SigFinder
+    module_function
 
-    def find(sigs, tags: Tags.new)
+    def find(sigs, random: Random.new, 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,20 +1,17 @@
-# frozen_string_literal: true
-
+require 'procto'
 require_relative 'signature'
 require_relative 'tags'
 
 module Signore
   class SigFromStream
-    def self.sig_from(input, tags: Tags.new)
-      new(input, tags: tags).to_sig
-    end
+    include Procto.call
 
     def initialize(input, tags: Tags.new)
       @input = input
       @tags  = tags
     end
 
-    def to_sig
+    def call
       Signature.new(author: params.author, source: params.source,
                     subject: params.subject, tags: tags.required,
                     text: params.text)
@@ -27,18 +24,9 @@ module Signore
     Params = Struct.new(:text, :author, :subject, :source)
 
     def get_param(param)
-      return get_text if param == :text
-      puts
-      puts "#{param}?"
-      input.gets.strip
-    end
-
-    # :reek:FeatureEnvy
-    def get_text # rubocop:disable AccessorMethodName
-      puts 'text?'
-      value = ''
-      value += input.gets until value.lines.to_a.last == "\n"
-      value.strip
+      puts "\n#{param}?"
+      separator = param == :text ? "\n\n" : "\n"
+      input.gets(separator).strip
     end
 
     def params