signore 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    signore (0.0.0)
-      lovely-rufus
+    signore (0.1.1)
+      lovely-rufus (>= 0.0.1)
       trollop
 
 GEM
   remote: http://rubygems.org/
   specs:
-    lovely-rufus (0.0.0)
-    minitest (2.6.1)
-    rake (0.9.2)
+    lovely-rufus (0.0.1)
+    minitest (2.11.4)
+    rake (0.9.2.2)
     trollop (1.16.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (>= 2.3)
+  minitest (>= 2.11.1)
   rake
   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-MMXI Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)
+© MMIX-MMXII Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL 3 (see LICENCE)

data/lib/signore/signature.rb

@@ -5,15 +5,8 @@ module Signore class Signature < Struct.new :text, :author, :source, :subject, :
   end
 
   def to_s
-    lines = text.split("\n").map { |line| LovelyRufus::Wrapper.new(line).wrapped 80 }
-
-    if meta
-      lines << "[#{meta}]"
-      max = lines.map { |line| line.split "\n" }.flatten.map(&:size).max
-      lines.last.insert 0, ' ' * (max - meta.size - 2)
-    end
-
-    lines.join "\n"
+    wrapped = LovelyRufus::Wrapper.new(text.gsub("\n", "\n\n")).wrapped(80).gsub("\n\n", "\n")
+    wrapped + meta_for(wrapped)
   end
 
   private
@@ -29,4 +22,13 @@ module Signore class Signature < Struct.new :text, :author, :source, :subject, :
     end
   end
 
+  def meta_for wrapped
+    return '' unless meta
+
+    indent = wrapped.split("\n").map(&:size).max - meta.size - 2
+    spaces = indent > 0 ? ' ' * indent : ''
+
+    "\n#{spaces}[#{meta}]"
+  end
+
 end end

data/signore.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'signore'
-  gem.version  = '0.1.0'
+  gem.version  = '0.1.1'
   gem.summary  = 'signore: an email signature manager/randomiser'
   gem.homepage = 'http://github.com/chastell/signore'
   gem.author   = 'Piotr Szotkowski'
@@ -10,8 +10,8 @@ Gem::Specification.new do |gem|
   gem.executables = Dir['bin/*'].map { |d| d.split '/' }.map &:last
   gem.test_files  = Dir['spec/**/*.rb']
 
-  gem.add_dependency 'lovely-rufus'
+  gem.add_dependency 'lovely-rufus', '>= 0.0.1'
   gem.add_dependency 'trollop'
-  gem.add_development_dependency 'minitest', '>= 2.3'
+  gem.add_development_dependency 'minitest', '>= 2.11.1'
   gem.add_development_dependency 'rake'
 end

data/spec/signore/database_spec.rb

@@ -43,16 +43,16 @@ module Signore describe Database do
 
       db << sig
 
-      file.read.must_equal <<-END.dedent
+      file.read.must_equal <<-end.dedent
         ---
         signatures:
         - !ruby/struct:Signore::Signature
           text: Normaliser Unix c’est comme pasteuriser le camembert.
-          author: !!null 
-          source: !!null 
-          subject: !!null 
-          tags: !!null 
-      END
+          author: 
+          source: 
+          subject: 
+          tags: 
+      end
     end
 
   end

data/spec/signore/executable_spec.rb

@@ -52,17 +52,17 @@ module Signore describe Executable 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
+        stdout.must_equal <<-end.dedent
           // sometimes I believe compiler ignores all my comments
-        END
+        end
       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
+        stdout.must_equal <<-end.dedent
           You do have to be mad to work here, but it doesn’t help.
                                                 [Gary Barnes, asr]
-        END
+        end
       end
 
     end
@@ -74,37 +74,37 @@ module Signore describe Executable do
       end
 
       it 'asks about signature parts and saves given signature with provided labels' do
-        input = StringIO.new <<-END.dedent
+        input = StringIO.new <<-end.dedent
           The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.\n
           Mark Pilgrim\n\n\n
-        END
+        end
 
         stdout = capture_io { Executable.new(['-d', @file.path, 'pronto', 'Wikipedia', 'ADHD']).run input }.first
-        stdout.must_equal <<-END.dedent
+        stdout.must_equal <<-end.dedent
           text?
           author?
           subject?
           source?
           The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.
                                                                 [Mark Pilgrim]
-        END
+        end
 
         stdout = capture_io { Executable.new(['-d', @file.path, 'prego', 'Wikipedia', 'ADHD']).run }.first
-        stdout.must_equal <<-END.dedent
+        stdout.must_equal <<-end.dedent
           The Wikipedia page on ADHD is like 20 pages long. That’s just cruel.
                                                                 [Mark Pilgrim]
-        END
+        end
       end
 
       it 'handles multi-line signatures' do
-        input = StringIO.new <<-END.dedent
+        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
-        END
+        end
 
         stdout = capture_io { Executable.new(['-d', @file.path, 'pronto']).run input }.first
-        stdout.must_equal <<-END.dedent
+        stdout.must_equal <<-end.dedent
           text?
           author?
           subject?
@@ -112,7 +112,7 @@ module Signore describe Executable do
           ‘I’ve gone through over-stressed to physical exhaustion – what’s next?’
           ‘Tuesday.’
                                                          [Simon Burr, Kyle Hearn]
-        END
+        end
       end
 
     end

data/spec/signore/signature_spec.rb

@@ -25,36 +25,36 @@ module Signore describe Signature do
   describe '#to_s' do
 
     it 'returns a signature formatted with meta information (if available)' do
-      @compiler.to_s.must_equal <<-END.dedent.strip
+      @compiler.to_s.must_equal <<-end.dedent.strip
         // sometimes I believe compiler ignores all my comments
-      END
+      end
 
-      @dads.to_s.must_equal <<-END.dedent.strip
+      @dads.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
+      @mad.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
+      @bruce.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
+      @confusion.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
+      @starwars.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]
-      END
+      end
     end
 
     it 'handles edge cases properly' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signore
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lovely-rufus
-  requirement: &15779140 !ruby/object:Gem::Requirement
+  requirement: &14326360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *15779140
+  version_requirements: *14326360
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &15778700 !ruby/object:Gem::Requirement
+  requirement: &14325960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15778700
+  version_requirements: *14325960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &15778200 !ruby/object:Gem::Requirement
+  requirement: &14325420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.11.1
   type: :development
   prerelease: false
-  version_requirements: *15778200
+  version_requirements: *14325420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15777780 !ruby/object:Gem::Requirement
+  requirement: &14325000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15777780
+  version_requirements: *14325000
 description: 
 email: chastell@chastell.net
 executables:
@@ -100,12 +100,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ! 'signore: an email signature manager/randomiser'
 test_files:
 - spec/spec_helper.rb
-- spec/signore/database_spec.rb
-- spec/signore/signature_spec.rb
 - spec/signore/executable_spec.rb
+- spec/signore/signature_spec.rb
+- spec/signore/database_spec.rb
+has_rdoc: