lovely_rufus 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6cb54441bc4de2ce91a1e7b0f5ea967d62c097c
-  data.tar.gz: ef2d88196e57edb97ef756093996666913a6341f
+  metadata.gz: 49c92b0710902ad7b5974120c3259511bca506b9
+  data.tar.gz: bacdd2b6ed4093103944c30e464defca9c88fd67
 SHA512:
-  metadata.gz: d7a63ba6449cb745133b335e4f43f3ff0b89e7c69f9f9ef5d50fcf5becdb49c9a8332786b723fbfd678827ea98683e0cdaf4dbd13d75e9dc65383a0b7e7f25f1
-  data.tar.gz: d929eb6b1d549eb0b423a6f55889290cb2b3a66096835feb9a691a8a5765b0cd53c55f3222bb610021028520a1551ac108c5bb6afc2d7b81c29d6441d9b4c66e
+  metadata.gz: 23d1be28b58049eb916bb07390880e487e81c960ad3315212de2fe396e225f695ed9f2489c3254d55efac807f88d73521d791c800b9b4211754b8d5f29978f86
+  data.tar.gz: 4258e4a7562d74568f4c1fa2a26df4cddf9d2b93691f8582418e931ccd8904be057ba7721e5a6992fefb7f994cb897ea5091df89f655b3b60b82b965efa3cd49

data/.rubocop.yml

@@ -1,25 +1,13 @@
-AccessModifierIndentation:
-  Enabled: false
-
 AndOr:
   Enabled: false
 
 Documentation:
   Enabled: false
 
-EndAlignment:
-  Enabled: false
-
 FileName:
   Exclude:
     - bin/lovely-rufus
 
-IndentationWidth:
-  Enabled: false
-
-MethodDefParentheses:
-  EnforcedStyle: require_no_parentheses
-
 SingleLineBlockParams:
   Enabled: false
 

data/Gemfile.lock

@@ -6,57 +6,55 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (1.1.0)
-    bogus (0.1.4)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    bogus (0.1.5)
       dependor (>= 0.0.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     dependor (1.0.1)
     ffi (1.9.3)
-    json (1.8.1)
-    listen (2.7.1)
+    hitimes (1.2.2)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    minitest (5.3.2)
+    minitest (5.4.1)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    nio4r (1.0.0)
-    parser (2.1.7)
-      ast (~> 1.1)
+    parser (2.2.0.pre.4)
+      ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     rainbow (2.0.0)
-    rake (10.2.2)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.3.7)
-      rainbow
-      ruby2ruby (~> 2.0.8)
+    reek (1.3.8)
+      rainbow (>= 1.99, < 3.0)
+      ruby2ruby (>= 2.0.8, < 3.0)
       ruby_parser (~> 3.3)
       sexp_processor
-    rerun (0.9.0)
-      listen (~> 2.7)
-    rubocop (0.20.1)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.7)
+    rerun (0.10.0)
+      listen (~> 2.7, >= 2.7.3)
+    rubocop (0.26.0)
+      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.4.2)
-    ruby2ruby (2.0.8)
+    ruby-progressbar (1.5.1)
+    ruby2ruby (2.1.2)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.5.0)
+    ruby_parser (3.6.2)
       sexp_processor (~> 4.1)
-    sexp_processor (4.4.3)
-    slop (3.5.0)
-    timers (1.1.0)
+    sexp_processor (4.4.4)
+    slop (3.6.0)
+    timers (4.0.1)
+      hitimes
 
 PLATFORMS
   ruby
@@ -68,5 +66,5 @@ DEPENDENCIES
   minitest-focus (~> 1.1)
   rake (~> 10.1)
   reek (~> 1.3)
-  rerun (~> 0.9.0)
-  rubocop (~> 0.20.0)
+  rerun (~> 0.10.0)
+  rubocop (~> 0.26.0)

data/Rakefile

@@ -2,9 +2,9 @@ require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i[spec rubocop reek]
+task default: %i(spec rubocop reek)
 
-Rake::TestTask.new :spec do |task|
+Rake::TestTask.new(:spec) do |task|
   task.test_files = FileList['spec/**/*_spec.rb']
   task.warning    = true
 end
@@ -15,4 +15,6 @@ Reek::Rake::Task.new do |task|
   task.reek_opts     = '--quiet'
 end
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new do |task|
+  task.options << '--display-cop-names'
+end

data/bin/lovely-rufus

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/lovely_rufus'
+
 LovelyRufus::CLIWrapper.new.run

data/config/reek.yml

@@ -1,25 +1,22 @@
 DuplicateMethodCall:
   exclude:
-  - LovelyRufus::BasicWrapper#call
-  - LovelyRufus::HangoutWrapper#rewrapped
+    - LovelyRufus::BasicWrapper#call
+    - LovelyRufus::HangoutWrapper#rewrapped
 
 FeatureEnvy:
   exclude:
-  - LovelyRufus::BasicWrapper#call
-  - LovelyRufus::HangoutWrapper#hangout_line
-  - LovelyRufus::OneLetterGluer#call
-  - LovelyRufus::QuoteStripper#quote
+    - LovelyRufus::BasicWrapper#call
+    - LovelyRufus::HangoutWrapper#hangout_line
+    - LovelyRufus::OneLetterGluer#call
+    - LovelyRufus::QuoteStripper#quote
 
 IrresponsibleModule:
   enabled: false
 
 NestedIterators:
-  max_allowed_nesting: 2
-
-UncommunicativeVariableName:
   exclude:
-  - LovelyRufus::HangoutWrapper#hangout_line
+    - LovelyRufus#initialize
 
-UnusedParameters:
+UncommunicativeVariableName:
   exclude:
-  - LovelyRufus::Layer#call
+    - LovelyRufus::HangoutWrapper#hangout_line

data/lib/lovely_rufus/basic_wrapper.rb

@@ -1,7 +1,12 @@
-module LovelyRufus class BasicWrapper < Layer
-  def call wrap
-    unwrapped = wrap.text.tr("\n", ' ').strip
-    wrapped   = unwrapped.gsub(/(.{1,#{wrap.width}})( |$\n?)/, "\\1\n")
-    next_layer.call Wrap[wrapped, width: wrap.width]
+require_relative 'layer'
+require_relative 'wrap'
+
+module LovelyRufus
+  class BasicWrapper < Layer
+    def call(wrap)
+      unwrapped = wrap.text.tr("\n", ' ').strip
+      wrapped   = unwrapped.gsub(/(.{1,#{wrap.width}})( |$\n?)/, "\\1\n")
+      next_layer.call(Wrap[wrapped, width: wrap.width])
+    end
   end
-end end
+end

data/lib/lovely_rufus/cli_wrapper.rb

@@ -1,28 +1,18 @@
-require 'optparse'
+require_relative 'settings'
+require_relative 'text_wrapper'
 
-module LovelyRufus class CLIWrapper
-  def initialize args = ARGV, text_wrapper: TextWrapper
-    @settings     = Settings.new args
-    @text_wrapper = text_wrapper
-  end
-
-  def run stream = $stdin
-    puts text_wrapper.wrap stream.read, width: settings.width
-  end
-
-  attr_reader :settings, :text_wrapper
-  private     :settings, :text_wrapper
-
-  class Settings
-    attr_reader :width
+module LovelyRufus
+  class CLIWrapper
+    def initialize(args = ARGV, text_wrapper: TextWrapper)
+      @settings     = Settings.new(args)
+      @text_wrapper = text_wrapper
+    end
 
-    def initialize args
-      @width = 72
-      OptionParser.new do |opts|
-        opts.on '-w', '--width WIDTH', Integer, 'Wrapping width' do |width|
-          @width = width
-        end
-      end.parse! args
+    def run(stream = $stdin)
+      puts text_wrapper.wrap(stream.read, width: settings.width)
     end
+
+    attr_reader :settings, :text_wrapper
+    private     :settings, :text_wrapper
   end
-end end
+end

data/lib/lovely_rufus/hangout_wrapper.rb

@@ -1,32 +1,38 @@
-module LovelyRufus class HangoutWrapper < Layer
-  def call wrap
-    @wrap  = wrap
-    final  = hangout_line ? rewrapped : wrap.text
-    next_layer.call Wrap[final, width: wrap.width]
-  end
+require_relative 'basic_wrapper'
+require_relative 'layer'
+require_relative 'wrap'
+
+module LovelyRufus
+  class HangoutWrapper < Layer
+    def call(wrap)
+      @wrap  = wrap
+      final  = hangout_line ? rewrapped : wrap.text
+      next_layer.call(Wrap[final, width: wrap.width])
+    end
 
-  attr_reader :wrap
-  private     :wrap
+    attr_reader :wrap
+    private     :wrap
 
-  private
+    private
 
-  def hangout_line
-    lines.each_cons 2 do |a, b|
-      return a if a[/\p{space}/] and a.rindex(/\p{space}/) >= b.size
-      unless b == lines.last
-        return b if b[/\p{space}/] and b.rindex(/\p{space}/) >= a.size
+    def hangout_line
+      lines.each_cons(2) do |a, b|
+        return a if a[/\p{space}/] and a.rindex(/\p{space}/) >= b.size
+        unless b == lines.last
+          return b if b[/\p{space}/] and b.rindex(/\p{space}/) >= a.size
+        end
       end
     end
-  end
 
-  def lines
-    @lines ||= wrap.text.lines.map(&:chomp)
-  end
+    def lines
+      @lines ||= wrap.text.lines.map(&:chomp)
+    end
 
-  def rewrapped
-    hangout_line << NBSP
-    unfolded = lines.join(' ').gsub("#{NBSP} ", NBSP)
-    wrapped  = BasicWrapper.new.call(Wrap[unfolded, width: wrap.width]).text
-    HangoutWrapper.new.call(Wrap[wrapped, width: wrap.width]).text
+    def rewrapped
+      hangout_line << NBSP
+      unfolded = lines.join(' ').gsub("#{NBSP} ", NBSP)
+      wrapped  = BasicWrapper.new.call(Wrap[unfolded, width: wrap.width]).text
+      HangoutWrapper.new.call(Wrap[wrapped, width: wrap.width]).text
+    end
   end
-end end
+end

data/lib/lovely_rufus/layer.rb

@@ -1,12 +1,14 @@
-module LovelyRufus class Layer
-  def initialize next_layer = -> wrap { wrap }
-    @next_layer = next_layer
-  end
+module LovelyRufus
+  class Layer
+    def initialize(next_layer = -> (wrap) { wrap })
+      @next_layer = next_layer
+    end
 
-  def call opts = {}
-    fail 'Layer subclasses must define #call'
-  end
+    def call(_opts = {})
+      fail 'Layer subclasses must define #call'
+    end
 
-  attr_reader :next_layer
-  private     :next_layer
-end end
+    attr_reader :next_layer
+    private     :next_layer
+  end
+end

data/lib/lovely_rufus/one_letter_gluer.rb

@@ -1,7 +1,12 @@
-module LovelyRufus class OneLetterGluer < Layer
-  def call wrap
-    pattern = /(?<=\p{space})(&|\p{letter})\p{space}/
-    text    = wrap.text.gsub pattern, "\\1\\2#{NBSP}"
-    next_layer.call Wrap[text, width: wrap.width]
+require_relative 'layer'
+require_relative 'wrap'
+
+module LovelyRufus
+  class OneLetterGluer < Layer
+    def call(wrap)
+      pattern = /(?<=\p{space})(&|\p{letter})\p{space}/
+      text    = wrap.text.gsub(pattern, "\\1\\2#{NBSP}")
+      next_layer.call(Wrap[text, width: wrap.width])
+    end
   end
-end end
+end

data/lib/lovely_rufus/quote_stripper.rb

@@ -1,27 +1,32 @@
-module LovelyRufus class QuoteStripper < Layer
-  def call wrap
-    @wrap   = wrap
-    wrapped = next_layer.call stripped_wrap
-    quoted  = wrapped.text.lines.map { |line| fixed_quote + line }.join
-    Wrap[quoted, width: wrapped.width + fixed_quote.size]
-  end
+require_relative 'layer'
+require_relative 'wrap'
 
-  attr_reader :wrap
-  private     :wrap
+module LovelyRufus
+  class QuoteStripper < Layer
+    def call(wrap)
+      @wrap   = wrap
+      wrapped = next_layer.call(stripped_wrap)
+      quoted  = wrapped.text.lines.map { |line| fixed_quote + line }.join
+      Wrap[quoted, width: wrapped.width + fixed_quote.size]
+    end
 
-  private
+    attr_reader :wrap
+    private     :wrap
 
-  def fixed_quote
-    quote.size > 0 ? quote.delete(' ') + ' ' : ''
-  end
+    private
 
-  def quote
-    starts = wrap.text.lines.map { |line| line[QUOTES] }.uniq
-    starts.size == 1 ? starts.first || '' : ''
-  end
+    def fixed_quote
+      quote.size > 0 ? quote.delete(' ') + ' ' : ''
+    end
+
+    def quote
+      starts = wrap.text.lines.map { |line| line[QUOTES] }.uniq
+      starts.size == 1 ? starts.first || '' : ''
+    end
 
-  def stripped_wrap
-    stripped_text = wrap.text.lines.map { |line| line[quote.size..-1] }.join
-    Wrap[stripped_text, width: wrap.width - fixed_quote.size]
+    def stripped_wrap
+      stripped_text = wrap.text.lines.map { |line| line[quote.size..-1] }.join
+      Wrap[stripped_text, width: wrap.width - fixed_quote.size]
+    end
   end
-end end
+end

data/lib/lovely_rufus/settings.rb

@@ -0,0 +1,14 @@
+require 'optparse'
+
+module LovelyRufus
+  Settings = Struct.new(:width) do
+    def initialize(args)
+      self.width = 72
+      OptionParser.new do |opts|
+        opts.on('-w', '--width=WIDTH', Integer, 'Wrapping width') do |width|
+          self.width = width
+        end
+      end.parse! args
+    end
+  end
+end

data/lib/lovely_rufus/text_wrapper.rb

@@ -1,29 +1,38 @@
-module LovelyRufus class TextWrapper
-  def self.wrap text, width: 72
-    new(Wrap[text, width: width]).call
-  end
+require_relative 'basic_wrapper'
+require_relative 'hangout_wrapper'
+require_relative 'one_letter_gluer'
+require_relative 'quote_stripper'
+require_relative 'wrap'
 
-  def initialize wrap
-    @wrap = wrap
-  end
+module LovelyRufus
+  class TextWrapper
+    def self.wrap(text, width: 72)
+      new(Wrap[text, width: width]).call
+    end
 
-  def call
-    paras.map do |para|
-      chain.call(Wrap[para, width: wrap.width]).text.tr NBSP, ' '
-    end.join "\n"
-  end
+    def initialize(wrap)
+      @wrap = wrap
+    end
 
-  attr_reader :wrap
-  private     :wrap
+    def call
+      paras.map do |para|
+        chain.call(Wrap[para, width: wrap.width]).text.tr(NBSP, ' ')
+      end.join("\n")
+    end
 
-  private
+    attr_reader :wrap
+    private     :wrap
 
-  def chain
-    layers = [QuoteStripper, OneLetterGluer, BasicWrapper, HangoutWrapper]
-    layers.reverse.reduce(-> wrap { wrap }) { |inner, outer| outer.new inner }
-  end
+    private
+
+    def chain
+      layers = [QuoteStripper, OneLetterGluer, BasicWrapper, HangoutWrapper]
+      identity = -> (wrap) { wrap }
+      layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
+    end
 
-  def paras
-    wrap.text.split(/\n#{QUOTES}?\n/).reject { |para| para[/^(#{QUOTES}| )$/] }
+    def paras
+      wrap.text.split(/\n#{QUOTES}?\n/).reject { |par| par[/^(#{QUOTES}| )$/] }
+    end
   end
-end end
+end

data/lib/lovely_rufus/wrap.rb

@@ -1,10 +1,7 @@
 module LovelyRufus
-  Wrap = Struct.new :text, :width do
-    class << self
-      undef []
-      def [] text = '', width: 72
-        new text, width
-      end
+  Wrap = Struct.new(:text, :width) do
+    def initialize(text = '', width: 72)
+      super text, width
     end
   end
 end

data/lib/lovely_rufus.rb

@@ -1,13 +1,11 @@
-require_relative 'lovely_rufus/layer'
-require_relative 'lovely_rufus/basic_wrapper'
-require_relative 'lovely_rufus/cli_wrapper'
-require_relative 'lovely_rufus/hangout_wrapper'
-require_relative 'lovely_rufus/one_letter_gluer'
-require_relative 'lovely_rufus/quote_stripper'
-require_relative 'lovely_rufus/text_wrapper'
-require_relative 'lovely_rufus/wrap'
-
 module LovelyRufus
   NBSP   = "\u00A0"
   QUOTES = /^([>\/#])(\1| )*/
+
+  def self.wrap(text, width: 72)
+    TextWrapper.wrap(text, width: width)
+  end
 end
+
+require_relative 'lovely_rufus/cli_wrapper'
+require_relative 'lovely_rufus/text_wrapper'

data/lovely_rufus.gemspec

@@ -1,22 +1,23 @@
 Gem::Specification.new do |gem|
   gem.author      = 'Piotr Szotkowski'
-  gem.description = 'An executable and a Ruby library for wrapping paragraphs of text.'
+  gem.description = 'An executable and a Ruby library for wrapping ' \
+                    'paragraphs of text.'
   gem.email       = 'chastell@chastell.net'
   gem.homepage    = 'http://github.com/chastell/lovely_rufus'
   gem.license     = 'AGPL-3.0'
   gem.name        = 'lovely_rufus'
   gem.summary     = 'lovely_rufus: text wrapper'
-  gem.version     = '0.1.2'
+  gem.version     = '0.2.0'
 
-  gem.files       = `git ls-files -z`.split "\0"
-  gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename path }
-  gem.test_files  = gem.files.grep %r{^spec/.*\.rb$}
+  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_development_dependency 'bogus',          '~> 0.1.4'
   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 'rerun',          '~> 0.9.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.20.0'
+  gem.add_development_dependency 'rerun',          '~> 0.10.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.26.0'
 end

data/spec/lovely_rufus/basic_wrapper_spec.rb

@@ -1,49 +1,53 @@
 require_relative '../spec_helper'
+require_relative '../../lib/lovely_rufus/basic_wrapper'
+require_relative '../../lib/lovely_rufus/wrap'
 
-module LovelyRufus describe BasicWrapper do
-  describe '#call' do
-    it 'wraps text to the given width' do
-      text = 'I go crazy when I hear a cymbal and a hi-hat ' \
-        'with a souped-up tempo'
-      wrap = <<-end.dedent
-        I go crazy when I hear
-        a cymbal and a hi-hat
-        with a souped-up tempo
+module LovelyRufus
+  describe BasicWrapper do
+    describe '#call' do
+      it 'wraps text to the given width' do
+        text = 'I go crazy when I hear a cymbal and a hi-hat ' \
+          'with a souped-up tempo'
+        wrap = <<-end.dedent
+          I go crazy when I hear
+          a cymbal and a hi-hat
+          with a souped-up tempo
+        end
+        bw = BasicWrapper.new
+        bw.call(Wrap[text, width: 22]).must_equal Wrap[wrap, width: 22]
       end
-      bw = BasicWrapper.new
-      bw.call(Wrap[text, width: 22]).must_equal Wrap[wrap, width: 22]
-    end
 
-    it 'extends past the given width when necessary' do
-      text = 'I’m killing your brain like a poisonous mushroom'
-      wrap = <<-end.dedent
-        I’m
-        killing
-        your
-        brain
-        like
-        a
-        poisonous
-        mushroom
+      it 'extends past the given width when necessary' do
+        text = 'I’m killing your brain like a poisonous mushroom'
+        wrap = <<-end.dedent
+          I’m
+          killing
+          your
+          brain
+          like
+          a
+          poisonous
+          mushroom
+        end
+        bw = BasicWrapper.new
+        bw.call(Wrap[text, width: 5]).must_equal Wrap[wrap, width: 5]
       end
-      bw = BasicWrapper.new
-      bw.call(Wrap[text, width: 5]).must_equal Wrap[wrap, width: 5]
-    end
 
-    it 'rewraps a String from zero' do
-      text = <<-end.dedent
-        turn off
-        the lights and I’ll glow
+      it 'rewraps a String from zero' do
+        text = <<-end.dedent
+          turn off
+          the lights and I’ll glow
+        end
+        wrap = "turn off the lights and I’ll glow\n"
+        BasicWrapper.new.call(Wrap[text]).must_equal Wrap[wrap]
       end
-      wrap = "turn off the lights and I’ll glow\n"
-      BasicWrapper.new.call(Wrap[text]).must_equal Wrap[wrap]
-    end
 
-    it 'passes the fixed text to the next layer and returns its outcome' do
-      final = fake :wrap
-      layer = fake :layer
-      mock(layer).call(Wrap["I\nO\nU\n", width: 2]) { final }
-      BasicWrapper.new(layer).call(Wrap['I O U', width: 2]).must_equal final
+      it 'passes the fixed text to the next layer and returns its outcome' do
+        final = fake(:wrap)
+        layer = fake(:layer)
+        mock(layer).call(Wrap["I\nO\nU\n", width: 2]) { final }
+        BasicWrapper.new(layer).call(Wrap['I O U', width: 2]).must_equal final
+      end
     end
   end
-end end
+end