signore 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b9c7abacbf5730fdbadf79e7d5fe61ec37cdd3
-  data.tar.gz: 587a3996c7fabb7e31b3bd27250310749b588f0c
+  metadata.gz: 574592e64de19564735c0cb34ed8176d4a2c2ef2
+  data.tar.gz: e2c9d9a4e3ca171b214f936865fabbaf675a1786
 SHA512:
-  metadata.gz: 0f04915b49b5d7f3678bd178def6607a7bd20727f2bcf1db2731ee86ef8e058c5107004183d7ac4fd47c5aa418b00ccc5df3f53cee0f0f1de35a8c5ca2c3ad14
-  data.tar.gz: b37a86a56e2309943664de9ad3a5b1934d037fca249d123dcfb82cf6bd05f29357c91fa177c8d0e8bd0eb4ab14571c451dbf6014365c9c50568d17ef8158a1c2
+  metadata.gz: 7789db08a85ae9121a8764d677297c3f165b163804edf4819fe60619e5614c5c36709ef9bedf469d613294d4ffc5e9f8251a0f1c7874a0395520cd8a0d4dd242
+  data.tar.gz: ec717cbde5846a0aea3dc693b76edbfee3f2f85bece044452c9eec4b39acb92be1e9a5d021c6c3cf3dc7af58a35c4a99f1854735b60e23a57c4f3d4fd5e9e31e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    signore (0.2.2)
+    signore (0.2.4)
       lovely_rufus (~> 0.2.0)
 
 GEM
@@ -15,17 +15,17 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     dependor (1.0.1)
-    ffi (1.9.3)
+    ffi (1.9.6)
     hitimes (1.2.2)
-    listen (2.7.9)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lovely_rufus (0.2.0)
-    minitest (5.4.1)
+    minitest (5.4.2)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    parser (2.2.0.pre.4)
+    parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -41,17 +41,17 @@ GEM
       sexp_processor
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.26.0)
+    rubocop (0.26.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.4, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
-    ruby2ruby (2.1.2)
+    ruby-progressbar (1.6.0)
+    ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.6.2)
+    ruby_parser (3.6.3)
       sexp_processor (~> 4.1)
     sexp_processor (4.4.4)
     slop (3.6.0)

data/lib/signore/cli.rb

@@ -1,28 +1,39 @@
+require 'forwardable'
 require_relative 'database'
 require_relative 'settings'
 require_relative 'sig_from_stream'
 
 module Signore
   class CLI
+    extend Forwardable
+
+    delegate %i(action tags) => :settings
+
     def initialize(args = ARGV, db: Database.new)
       @settings = Settings.new(args)
       @db       = db
     end
 
     def run(input: $stdin)
-      case settings.action
-      when 'prego'
-        puts db.find(tags: settings.tags)
-      when 'pronto'
-        sig = SigFromStream.sig_from(input, tags: settings.tags)
-        db << sig
-        puts sig
-      else
-        abort 'usage: signore prego|pronto [tag, …]'
+      trap(:INT) { exit }
+      case action
+      when 'prego'  then puts retrieve_sig
+      when 'pronto' then puts create_sig_from(input)
+      else abort 'usage: signore prego|pronto [tag, …]'
       end
     end
 
     attr_reader :db, :settings
     private     :db, :settings
+
+    private
+
+    def create_sig_from(input)
+      SigFromStream.sig_from(input, tags: tags).tap { |sig| db << sig }
+    end
+
+    def retrieve_sig
+      db.find(tags: tags)
+    end
   end
 end

data/lib/signore/database.rb

@@ -15,7 +15,6 @@ module Signore
 
     def <<(sig)
       store.transaction { store['signatures'] << sig }
-      sig
     end
 
     def find(tags: Tags.new)

data/lib/signore/settings.rb

@@ -26,11 +26,15 @@ module Signore
     private
 
     def forbidden
-      args[1..-1].select { |tag| tag.start_with?('~') }.map { |tag| tag[1..-1] }
+      tag_names.select { |tag| tag.start_with?('~') }.map { |tag| tag[1..-1] }
     end
 
     def required
-      args[1..-1].reject { |tag| tag.start_with?('~') }
+      tag_names.reject { |tag| tag.start_with?('~') }
+    end
+
+    def tag_names
+      args[1..-1] or []
     end
   end
 end

data/signore.gemspec

@@ -7,7 +7,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.2.3'
+  gem.version     = '0.2.4'
 
   gem.files       = `git ls-files -z`.split "\0"
   gem.executables = gem.files.grep(/^bin\//).map { |path| File.basename(path) }

data/spec/signore/database_spec.rb

@@ -10,17 +10,12 @@ require_relative '../../lib/signore/tags'
 module Signore
   describe Database do
     describe '#<<' do
-      let(:file) { Tempfile.new('')                                        }
-      let(:sig)  { Signature.new(text)                                     }
-      let(:text) { 'Normaliser Unix c’est comme pasteuriser le camembert.' }
-
       it 'saves the provided signature to disk' do
-        Database.new(path: Pathname.new(file.path)) << sig
-        file.read.must_include text
-      end
-
-      it 'returns the saved signature' do
-        Database.new(path: Pathname.new(file.path)).<<(sig).must_equal sig
+        text = 'Normaliser Unix c’est comme pasteuriser le camembert.'
+        sig  = Signature.new(text)
+        path = Pathname.new(Tempfile.new('').path)
+        Database.new(path: path) << sig
+        path.read.must_include text
       end
     end
 

data/spec/signore/settings_spec.rb

@@ -42,6 +42,10 @@ module Signore
         tags = Tags.new(forbidden: %w(tech), required: %w(en))
         Settings.new(%w(prego ~tech en)).tags.must_equal tags
       end
+
+      it 'doesn’t blow up on empty args' do
+        Settings.new([]).tags.must_equal Tags.new
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,6 @@ Bogus.configure { |config| config.search_modules << Signore }
 
 class String
   def dedent
-    gsub(/^#{self[/\A\s*/]}/, '')
+    gsub(/^#{scan(/^ +/).min}/, '')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely_rufus