hylite 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '029f1390d68bcdad670b11ba3c3bd1c7688745dd'
-  data.tar.gz: 5e1a2079b48cc1fbe2b501c36f155611647402a1
+  metadata.gz: d62665fa2a24a184b51d5ab4bf55882c323885f9
+  data.tar.gz: 3dcd0bdeb8cbc8a5cd1fb0f947e8fb4104e5e96e
 SHA512:
-  metadata.gz: 525bf92d906fc94f8eb4891162c1cf7d21aaea4d75b9ec8b04e73309674131d43d98c1f1382c505579e7fd8aa42acdb4f1b4d99d18b48955311e96172a6159c0
-  data.tar.gz: 21175e7b41dff749412da917726f9045a3651a308188b2f3cfe44a82e4197bd4811ad8d439f21a5bf689d406a407f5f0e2fb8cf6b62bf7c1861f4d9f524b38a6
+  metadata.gz: cfe3816c2a24afc19906855b85cc10b91cfea1340e45ad6555c6c3ecf673d72d28fb330bda9f0633eaac1635cb88a0b135cea25eb78f450bb728b8f9b3c7cdcb
+  data.tar.gz: 63d935be6b66b5c4a142756a9ea23db326229df3b69602db1b0b2661307e02bda17e64407ce3973391d7ab893dedb53fb943b5bc3913e30cb731b74d029aa18b

data/lib/hylite/choose_hyliter.rb

@@ -4,33 +4,10 @@ require 'hylite/hyliters'
 class Hylite
   module ChooseHyliter
     extend self
-
     def call(code, lang)
-      case
-      when rouge_available?    then Rouge.new(code, lang)
-      when pygments_available? then Pygments.new(code, lang)
-      when coderay_available?  then CodeRay.new(code, lang)
-      end
-    end
-
-    def rouge_available?
-      require 'rouge'
-      true
-    rescue LoadError
-      false
-    end
-
-    def pygments_available?
-      ENV['PATH'].split(File::PATH_SEPARATOR).any? do |dir|
-        File.exist? File.join(dir, 'pygmentize')
-      end
-    end
-
-    def coderay_available?
-      require 'rouge'
-      true
-    rescue LoadError
-      false
+      Rouge.new?(   code, lang) ||
+      Pygments.new?(code, lang) ||
+      CodeRay.new?( code, lang)
     end
   end
 end

data/lib/hylite/cli.rb

@@ -7,10 +7,6 @@ class Hylite
       self.argv = argv
     end
 
-    def errors
-      config.errors
-    end
-
     def result
       ensure_evaluated
       @result

data/lib/hylite/hyliters.rb

@@ -2,19 +2,38 @@ require 'open3'
 
 class Hylite
   class Hyliter
+    def self.new?(code, lang)
+      return nil unless available?
+      new code, lang
+    end
+
+    def self.available?
+      raise NotImplementedError, 'Subclass should define'
+    end
+
     attr_reader :code, :lang
+
     def initialize(code, lang)
       @code, @lang = code, lang
     end
+
     def type
       raise NotImplementedError, 'Subclass should define'
     end
   end
 
   class Rouge < Hyliter
+    def self.available?
+      require 'rouge'
+      true
+    rescue LoadError
+      false
+    end
+
     def type
       :rouge
     end
+
     def call
       # From Fish, you can see all styles with:
       # for style in (rougify help style | tail -1 | tr -d ' ' | tr , \n); echo \n===== $style =====; rougify highlight -t $style -l ruby bin/hylite   ; end
@@ -27,9 +46,16 @@ class Hylite
   end
 
   class Pygments < Hyliter
+    def self.available?
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? do |dir|
+        File.exist? File.join(dir, 'pygmentize')
+      end
+    end
+
     def type
       :pygments
     end
+
     def call
       # From Fish, you can see all styles with:
       # for style in (pygmentize -L styles | sed -n '/\*/s/[*: ]//gp'); echo \n===== $style =====; pygmentize -f terminal256 -O style=$style -l ruby < lib/hylite.rb ; end
@@ -46,9 +72,17 @@ class Hylite
   end
 
   class CodeRay < Hyliter
+    def self.available?
+      require 'coderay'
+      true
+    rescue LoadError
+      false
+    end
+
     def type
       :coderay
     end
+
     def call
       ::CodeRay.encode(code, lang, :terminal)
     end

data/lib/hylite/version.rb

@@ -1,3 +1,3 @@
 class Hylite
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/binary_spec.rb

@@ -98,8 +98,8 @@ RSpec.describe 'binaries' do
       expect(stdout).to_not be_empty
     end
 
-    specify 'highlight_syntax: warns you to use hylite, but still works' do
-      stdout, stderr, status = Open3.capture3 'highlight_syntax', stdin_data: '1+1'
+    specify 'hilight_syntax: warns you to use hylite, but still works' do
+      stdout, stderr, status = Open3.capture3 'hilight_syntax', stdin_data: '1+1'
       expect(stderr).to match /hylite/
       expect(status).to be_success
       expect(stdout).to_not be_empty

data/spec/choose_hyliter.rb

@@ -2,47 +2,32 @@ require 'hylite/choose_hyliter'
 require 'rouge'
 
 RSpec.describe 'ChooseHyliter' do
-  # ugh, might be better to inject require than this nonsense >.<
+  def assert_hilights!(name, unavailable:[])
+    Array(unavailable).each do |klass|
+      allow(klass).to receive(:new?).and_return(nil)
+    end
 
-  it 'uses rouge if available' do
     hyliter = Hylite::ChooseHyliter.call("#a { color: #FFF; }" , "css")
-    expect(hyliter.type).to eq :rouge
+    expect(hyliter.type).to eq name
 
     hylited = hyliter.call
     expect(hyliter.call).to include 'FFF'
     expect(hyliter.call).to include "\e[" # an escape sequence in there somewhere
   end
 
+  it 'uses rouge if available' do
+    assert_hilights! :rouge
+  end
 
   it 'does not use rouge if it does not support the requested language'
 
-
   it 'uses pygments if rouge, isn\'t available' do
-    allow(Hylite::ChooseHyliter).to receive(:require).with('rouge').and_raise(LoadError)
-
-    hyliter = Hylite::ChooseHyliter.call("#a { color: #FFF; }" , "css")
-    expect(hyliter.type).to eq :pygments
-
-    hylited = hyliter.call
-    expect(hyliter.call).to include 'FFF'
-    expect(hyliter.call).to include "\e[" # an escape sequence in there somewhere
+    assert_hilights! :pygments, unavailable: [Hylite::Rouge]
   end
 
-
   it 'uses coderay if rouge and pygmentize aren\'t available' do
-    require 'coderay'
-    allow(File).to receive(:exist?).and_return(false)
-    allow(Hylite::ChooseHyliter).to receive(:require).with('rouge').and_raise(LoadError)
-    allow(Hylite::ChooseHyliter).to receive(:require).with('coderay').and_return(true)
-
-    hyliter = Hylite::ChooseHyliter.call("#a { color: #FFF; }" , "css")
-    expect(hyliter.type).to eq :coderay
-
-    hylited = hyliter.call
-    expect(hyliter.call).to include 'FFF'
-    expect(hyliter.call).to include "\e[" # an escape sequence in there somewhere
+    assert_hilights! :coderay, unavailable: [Hylite::Rouge, Hylite::Pygments]
   end
 
-
   it 'tells you how to install these other libs if none of them are available'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hylite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec