lovely_rufus 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a7506b842cfa774ae330401ec749a62a747f45
-  data.tar.gz: 2b87ba178ae72ff65d1d5fc0034e8b792af0cc72
+  metadata.gz: 8fb34baf376b3462f33b6f1866510f0b2edb5d47
+  data.tar.gz: 4b8d09f47df793d1a0e66b2d8915329df803ca6a
 SHA512:
-  metadata.gz: f001a856ce6dbf2352e041c0523fa279dfb7f29c887e943341fe788e94df76686a2122e0570a872b24911751a059a6c51599d17ac5573af011a537e330dbb30d
-  data.tar.gz: 1be429a0ad375e82961bbfa99bc230577b81ccc5cc192c494922cbdbb5b4556d8e879348c44228f506ce26ba60801b249a71c8d022b787ff4afe19d565b137f5
+  metadata.gz: 817ef5f32ccf7e0d137389a99ab27960e2389efdbc2d467a2d84ed51bb2bcfe5bb8409d93d3bfd7b3c533ee0225d3677ae49fa56de633f05cbb4b4eb23a9c901
+  data.tar.gz: 9b600aced8c77520706c3b464dba74af1f3e98d68830e2859bcd7e6dd808eec5701fd36267ca5dff00328feb37e80efbcbe0572069c4191d7cb91271ceceb48c

data/.rubocop.yml

@@ -8,5 +8,11 @@ Style/FileName:
   Exclude:
     - bin/lovely-rufus
 
+Style/Not:
+  Enabled: false
+
 Style/SingleLineBlockParams:
   Enabled: false
+
+Style/SpaceAfterNot:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - ruby-2.1
-  - ruby-2.2
+  - 2.1
+  - 2.2
+  - 2.3.0
   - ruby-head
 sudo: false

data/Gemfile

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

data/Gemfile.lock

@@ -2,71 +2,63 @@ PATH
   remote: .
   specs:
     lovely_rufus (1.0.0)
-      private_attr (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
-    adamantium (0.2.0)
+    ast (2.3.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     bogus (0.1.6)
       dependor (>= 0.0.4)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
+    codeclimate-engine-rb (0.3.1)
+      virtus (~> 1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     dependor (1.0.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.11)
-    ffi (1.9.10)
-    ice_nine (0.11.1)
-    listen (3.0.4)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    memoizable (0.4.2)
+    descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.8.2)
+    equalizer (0.0.11)
+    ffi (1.9.14)
+    ice_nine (0.11.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    minitest (5.9.0)
     minitest-focus (1.1.2)
       minitest (>= 4, < 6)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
     powerpack (0.1.1)
-    private_attr (1.1.0)
-    procto (0.0.2)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    rainbow (2.1.0)
+    rake (11.2.2)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    reek (3.6.0)
-      parser (~> 2.2, >= 2.2.2.5)
-      private_attr (~> 1.1)
+    reek (4.4.0)
+      codeclimate-engine-rb (~> 0.3.1)
+      parser (~> 2.3.1, >= 2.3.1.2)
       rainbow (~> 2.0)
-      unparser (~> 0.2.2)
     rerun (0.11.0)
       listen (~> 3.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.7.5)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.4.0)
     thread_safe (0.3.5)
-    tins (1.6.0)
-    unparser (0.2.4)
-      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.2)
-      procto (~> 0.0.2)
+    unicode-display_width (1.1.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
@@ -76,10 +68,10 @@ DEPENDENCIES
   lovely_rufus!
   minitest (~> 5.6)
   minitest-focus (~> 1.1)
-  rake (~> 10.1)
-  reek (~> 3.1)
+  rake (~> 11.0)
+  reek (~> 4.0)
   rerun (~> 0.11.0)
-  rubocop (~> 0.35.0)
+  rubocop (~> 0.42.0)
 
 BUNDLED WITH
-   1.10.6
+   1.12.1

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
@@ -11,6 +13,7 @@ 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/lovely-rufus

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../lib/lovely_rufus'
 require_relative '../lib/lovely_rufus/cli_wrapper'

data/lib/lovely_rufus.rb

@@ -1,4 +1,5 @@
-require 'private_attr/everywhere'
+# frozen_string_literal: true
+
 require_relative 'lovely_rufus/text_wrapper'
 
 module LovelyRufus

data/lib/lovely_rufus/cli_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'settings'
 require_relative 'text_wrapper'
 
@@ -12,6 +14,8 @@ module LovelyRufus
       puts text_wrapper.wrap(stream.read, width: settings.width)
     end
 
-    private_attr_reader :settings, :text_wrapper
+    private
+
+    attr_reader :settings, :text_wrapper
   end
 end

data/lib/lovely_rufus/layers/basic_wrapper.rb

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

data/lib/lovely_rufus/layers/code_comment_stripper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'quote_stripper'
 
 module LovelyRufus
@@ -5,9 +7,7 @@ module LovelyRufus
     class CodeCommentStripper < QuoteStripper
       QUOTES = %r{^\s*(//|#) }
 
-      private
-
-      alias_method :fixed_quote, :quote
+      alias fixed_quote quote
     end
   end
 end

data/lib/lovely_rufus/layers/email_quote_stripper.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 require_relative 'quote_stripper'
 
 module LovelyRufus
   module Layers
+    # :reek:UnusedPrivateMethod
     class EmailQuoteStripper < QuoteStripper
       QUOTES = /^>[> ]*/
 
       private
 
       def fixed_quote
-        quote.size > 0 ? quote.delete(' ') + ' ' : ''
+        quote.empty? ? '' : quote.delete(' ') + ' '
       end
     end
   end

data/lib/lovely_rufus/layers/hangout_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../wrap'
 require_relative 'basic_wrapper'
 require_relative 'layer'
@@ -11,31 +13,44 @@ module LovelyRufus
         next_layer.call(final)
       end
 
-      private_attr_reader :wrap
-
       private
 
-      module HangoutFinder
-        module_function
+      attr_reader :wrap
 
-        def between?(line_a, line_b)
-          last_space = line_a.chomp.rindex(/\p{space}/)
-          last_space and last_space >= line_b.chomp.size
+      class HangoutFinder
+        def initialize(upper, lower, last)
+          @upper = upper
+          @lower = lower
+          @last  = last
         end
 
-        def reverse?(line_a, line_b)
-          cut = line_a.chomp.rindex(/\p{space}/)
-          a_after = line_a[0...cut] + "\n"
-          b_after = line_a[(cut + 1)..-1] + line_b
-          b_after.chomp.rindex(/\p{space}/) > a_after.size
+        def hangout?
+          exists? and not (last? and useless_fix?)
+        end
+
+        private
+
+        attr_reader :last, :lower, :upper
+
+        def exists?
+          last_space = upper.chomp.rindex(/\p{space}/)
+          last_space and last_space >= lower.chomp.size
+        end
+
+        alias last? last
+
+        def useless_fix? # rubocop:disable Metrics/AbcSize
+          cut = upper.chomp.rindex(/\p{space}/)
+          upper_after = upper[0...cut] + "\n"
+          lower_after = upper[(cut + 1)..-1] + lower
+          lower_after.chomp.rindex(/\p{space}/) > upper_after.size
         end
       end
 
       def hangout_line
-        lines.each_cons(2).with_index do |(a, b), i|
-          if HangoutFinder.between?(a, b)
-            return a unless i == lines.size - 2 and HangoutFinder.reverse?(a, b)
-          end
+        lines.each_cons(2).with_index do |(upper, lower), index|
+          finder = HangoutFinder.new(upper, lower, index == lines.size - 2)
+          return upper if finder.hangout?
         end
       end
 

data/lib/lovely_rufus/layers/layer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LovelyRufus
   module Layers
     class Layer
@@ -6,10 +8,12 @@ module LovelyRufus
       end
 
       def call(_wrap)
-        fail 'Layer subclasses must define #call that takes a Wrap'
+        raise 'Layer subclasses must define #call that takes a Wrap'
       end
 
-      private_attr_reader :next_layer
+      private
+
+      attr_reader :next_layer
     end
   end
 end

data/lib/lovely_rufus/layers/one_letter_gluer.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require_relative '../wrap'
 require_relative 'layer'
 
 module LovelyRufus
   module Layers
     class OneLetterGluer < Layer
+      # :reek:FeatureEnvy
       def call(wrap)
         pattern = /(?<=\p{space})(&|\p{letter})\p{space}/
         text    = wrap.text.gsub(pattern, "\\1\\2#{NBSP}")

data/lib/lovely_rufus/layers/quote_stripper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../wrap'
 require_relative 'layer'
 
@@ -11,10 +13,10 @@ module LovelyRufus
         Wrap[quoted, width: wrapped.width + fixed_quote.size]
       end
 
-      private_attr_reader :wrap
-
       private
 
+      attr_reader :wrap
+
       def quote
         starts = wrap.lines.map { |line| line[self.class::QUOTES] }.uniq
         starts.size == 1 ? starts.first || '' : ''

data/lib/lovely_rufus/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 
 module LovelyRufus

data/lib/lovely_rufus/text_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'layers/basic_wrapper'
 require_relative 'layers/code_comment_stripper'
 require_relative 'layers/email_quote_stripper'
@@ -9,6 +11,14 @@ module LovelyRufus
   class TextWrapper
     QUOTES = %r{^([>/#])(\1| )*}
 
+    def self.chain
+      layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
+                Layers::OneLetterGluer, Layers::BasicWrapper,
+                Layers::HangoutWrapper]
+      identity = -> (wrap) { wrap }
+      layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
+    end
+
     def self.wrap(text, width: 72)
       new(Wrap[text, width: width]).call
     end
@@ -19,21 +29,13 @@ module LovelyRufus
 
     def call
       paras.map do |para|
-        chain.call(Wrap[para, width: wrap.width]).text.tr(NBSP, ' ')
+        self.class.chain.call(Wrap[para, width: wrap.width]).text.tr(NBSP, ' ')
       end.join("\n")
     end
 
-    private_attr_reader :wrap
-
     private
 
-    def chain
-      layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
-                Layers::OneLetterGluer, Layers::BasicWrapper,
-                Layers::HangoutWrapper]
-      identity = -> (wrap) { wrap }
-      layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
-    end
+    attr_reader :wrap
 
     def paras
       wrap.text.split(/\n#{QUOTES}?\n/).reject { |par| par[/^(#{QUOTES}| )$/] }

data/lib/lovely_rufus/wrap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module LovelyRufus

data/lovely_rufus.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'pathname'
 
@@ -10,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'lovely_rufus'
   gem.summary     = 'lovely_rufus: text wrapper'
-  gem.version     = '1.0.0'
+  gem.version     = '1.0.1'
 
   gem.required_ruby_version = '~> 2.1'
 
@@ -23,13 +25,11 @@ Gem::Specification.new do |gem|
     gem.signing_key = Pathname.new('~/.ssh/gem-private_key.pem').expand_path
   end
 
-  gem.add_dependency 'private_attr', '~> 1.1'
-
   gem.add_development_dependency 'bogus',          '~> 0.1.4'
   gem.add_development_dependency 'minitest',       '~> 5.6'
   gem.add_development_dependency 'minitest-focus', '~> 1.1'
-  gem.add_development_dependency 'rake',           '~> 10.1'
-  gem.add_development_dependency 'reek',           '~> 3.1'
+  gem.add_development_dependency 'rake',           '~> 11.0'
+  gem.add_development_dependency 'reek',           '~> 4.0'
   gem.add_development_dependency 'rerun',          '~> 0.11.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.35.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.42.0'
 end

data/test/lovely_rufus/cli_wrapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require_relative '../test_helper'
 require_relative '../../lib/lovely_rufus/cli_wrapper'

data/test/lovely_rufus/layers/basic_wrapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/basic_wrapper'
 require_relative '../../../lib/lovely_rufus/wrap'

data/test/lovely_rufus/layers/code_comment_stripper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/code_comment_stripper'
 require_relative '../../../lib/lovely_rufus/wrap'

data/test/lovely_rufus/layers/email_quote_stripper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/email_quote_stripper'
 require_relative '../../../lib/lovely_rufus/wrap'

data/test/lovely_rufus/layers/hangout_wrapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/hangout_wrapper'
 require_relative '../../../lib/lovely_rufus/wrap'

data/test/lovely_rufus/layers/one_letter_gluer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/one_letter_gluer'
 require_relative '../../../lib/lovely_rufus/wrap'

data/test/lovely_rufus/settings_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper'
 require_relative '../../lib/lovely_rufus/settings'
 

data/test/lovely_rufus/text_wrapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require_relative '../test_helper'
 require_relative '../../lib/lovely_rufus/text_wrapper'

data/test/lovely_rufus/wrap_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper'
 require_relative '../../lib/lovely_rufus/wrap'
 

data/test/lovely_rufus_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require_relative '../lib/lovely_rufus'
 

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['MT_NO_EXPECTATIONS'] = 'true'
 require 'bundler/setup'
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lovely_rufus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Piotr Szotkowski
@@ -30,22 +30,8 @@ cert_chain:
   srwnZ6g5uTvNbd0I1SnvnCJJ5y5iPvJIBlnGb3QZ77y2XXCOy3Yc0rjK7A8bQt5t
   xOlyYMPKhWx2IqEip+J7PBpBwMnxIPhTcNlFOj8mSa0=
   -----END CERTIFICATE-----
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: private_attr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +80,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rerun
   requirement: !ruby/object:Gem::Requirement
@@ -136,14 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.42.0
 description: An executable and a Ruby library for wrapping paragraphs of text.
 email: chastell@chastell.net
 executables:
@@ -207,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: 'lovely_rufus: text wrapper'
@@ -223,4 +209,3 @@ test_files:
 - test/lovely_rufus/wrap_test.rb
 - test/lovely_rufus_test.rb
 - test/test_helper.rb
-has_rdoc: