yard-junk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2951dd9b76ead149237efbb2d837868f334db37
-  data.tar.gz: 6b9e03ce2ec1b7f2c6eebb3fa7a23fa2bad10c95
+  metadata.gz: 4f026c0bf7f4d4490bc4a95d445fafb80d4bfe35
+  data.tar.gz: 26a7538f89dd38d6352575e563b5192b5d15bef0
 SHA512:
-  metadata.gz: 5b007c4ee552650b8c49d13619cbb98fb3dad7855ebf7a807c0c32ded821535197266e6511ef5754097937286a5bf1832e748fb824c38f9529914322e158e810
-  data.tar.gz: f58438719e6d9a11a7bd995d336e09f97b59aeaf5b81094e46fe7852ebfebe9c574f0fcd80455163333213c4f5f4da71130dac193a77b7dacdf73f63a07c89b7
+  metadata.gz: 8cffcf86cc22223300d43cac2609f8aa31c51b65c01c9f9fd9a56a8ddf4cf44e207a51f63543f1e14321c01df538f29288c43948f0356bde1306c7c4d4baa903
+  data.tar.gz: ebde7f6f891bc40cc7f9ebb6be60890b8884a3c4390de1c6a92302a6c759e87ee2b7a695ec61dcc7de9a40bf5bfc57bf186114bd9c270d786420a34a86be0662

data/Changelog.md

@@ -1,5 +1,9 @@
 # Yard-Junk changelog
 
+## 0.0.5 -- 2017-09-11
+
+* Fix gem conflict with `did_you_mean`.
+
 ## 0.0.4 -- 2017-09-09
 
 * Support for partial reports `yard-junk --path path/to/folder` (#13)

data/lib/yard-junk.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'yard'
 require_relative 'yard-junk/version'
 require_relative 'yard-junk/logger'
 require_relative 'yard-junk/command_line'

data/lib/yard-junk/logger/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'did_you_mean'
+require_relative 'spellcheck'
 
 module YardJunk
   class Logger
@@ -43,43 +43,7 @@ module YardJunk
         self.class.type
       end
 
-      private
-
-      # DidYouMean changed API dramatically between 1.0 and 1.1, and different rubies have different
-      # versions of it bundled.
-      if DidYouMean.const_defined?(:SpellCheckable) # 1.0 +
-        class SpellChecker < Struct.new(:error, :dictionary) # rubocop:disable Style/StructInheritance
-          include DidYouMean::SpellCheckable
-
-          def candidates
-            {error => dictionary}
-          end
-        end
-
-        def spell_check(error, dictionary)
-          SpellChecker.new(error, dictionary).corrections
-        end
-      elsif DidYouMean.const_defined?(:SpellChecker) # 1.1+
-        def spell_check(error, dictionary)
-          DidYouMean::SpellChecker.new(dictionary: dictionary).correct(error)
-        end
-      elsif DidYouMean.const_defined?(:BaseFinder) # < 1.0
-        class SpellFinder < Struct.new(:error, :dictionary) # rubocop:disable Style/StructInheritance
-          include DidYouMean::BaseFinder
-
-          def searches
-            {error => dictionary}
-          end
-        end
-
-        def spell_check(error, dictionary)
-          SpellFinder.new(error, dictionary).suggestions
-        end
-      else
-        def spell_check(*)
-          []
-        end
-      end
+      include Spellcheck
 
       class << self
         def registry

data/lib/yard-junk/logger/spellcheck.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+begin
+  require 'did_you_mean'
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+end
+
+module YardJunk
+  class Logger
+    module Spellcheck
+      # DidYouMean changed API dramatically between 1.0 and 1.1, and different rubies have different
+      # versions of it bundled.
+      if !Kernel.const_defined?(:DidYouMean)
+        def spell_check(*)
+          []
+        end
+      elsif DidYouMean.const_defined?(:SpellCheckable) # 1.0 +
+        class SpellChecker < Struct.new(:error, :dictionary) # rubocop:disable Style/StructInheritance
+          include DidYouMean::SpellCheckable
+
+          def candidates
+            {error => dictionary}
+          end
+        end
+
+        def spell_check(error, dictionary)
+          SpellChecker.new(error, dictionary).corrections
+        end
+      elsif DidYouMean.const_defined?(:SpellChecker) # 1.1+
+        def spell_check(error, dictionary)
+          DidYouMean::SpellChecker.new(dictionary: dictionary).correct(error)
+        end
+      elsif DidYouMean.const_defined?(:BaseFinder) # < 1.0
+        class SpellFinder < Struct.new(:error, :dictionary) # rubocop:disable Style/StructInheritance
+          include DidYouMean::BaseFinder
+
+          def searches
+            {error => dictionary}
+          end
+        end
+
+        def spell_check(error, dictionary)
+          SpellFinder.new(error, dictionary).suggestions
+        end
+      else
+        def spell_check(*)
+          []
+        end
+      end
+    end
+  end
+end

data/lib/yard-junk/version.rb

@@ -6,7 +6,7 @@ module YardJunk
   # @private
   MINOR = 0
   # @private
-  PATCH = 4
+  PATCH = 5
 
   # @private
   VERSION = [MINOR, MAJOR, PATCH].join('.')

data/yard-junk.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rainbow'
   s.add_dependency 'yard'
-  s.add_dependency 'did_you_mean'
+  s.add_dependency 'did_you_mean' if RUBY_VERSION < '2.3'
   s.add_dependency 'backports'
 
   s.add_development_dependency 'rubocop', '>= 0.49'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard-junk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: did_you_mean
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +203,7 @@ files:
 - lib/yard-junk/janitor/text_reporter.rb
 - lib/yard-junk/logger.rb
 - lib/yard-junk/logger/message.rb
+- lib/yard-junk/logger/spellcheck.rb
 - lib/yard-junk/rake.rb
 - lib/yard-junk/version.rb
 - yard-junk.gemspec