shell2html 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb1bc4e0dc68a7c3c76db7a1aaba7de6e85c634
-  data.tar.gz: fe087019cd925c77d4cd3243642f530dccf413dd
+  metadata.gz: c11597cc04491645e7a641e45273f91331050793
+  data.tar.gz: fd19db170d10c0c595eb9f441ec23e3423111b5c
 SHA512:
-  metadata.gz: 2215133ce6fa7ac128ae86eab2d640d87ce9b180a6519e6fba020d79ea2abdfa9d858a838bc639470bacdb0f3af08e1038088e344d5a82321b56d19fbd1f4e59
-  data.tar.gz: 8348b33514269583c6735c1f728ead1315ab6fb0c5af9563f3ae30d61937e26b2c70aa6a455e2f6ebd683f33ce22797076a2161f412f2dae0767eeaa8b733536
+  metadata.gz: e0dd2aecb503f5e305884eb2249a6498b99665d7a011e69b4085bd19bc758eae8b8116cb0d62c66423176c1b4c061aae682fde4b91ef5fe6c9cc58afc0f80dcd
+  data.tar.gz: 813ff40b118bece38dceeccb140a4d7a2fc37e3d6c2bead148524f2902af172b2bbc0dcfdfa355d903351adfa03405117504d565fc696b180ad84f50555b449e

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/.travis.yml

@@ -3,4 +3,4 @@ bundler_args: --path vendor
 cache: bundler
 rvm:
   - 1.9.3
-  - 2.1.1
+  - 2.2.3

data/CHANGELOG.md

@@ -1,6 +1,12 @@
-Shell to HTML
+shell2html
 ==================
 
+v0.0.6 - 2015-11-23
+-------------------
+- added a `shell2css` executable to render css
+- use `shell2css sass` to print out sass version of the css
+- made `shell2html` work with stdin or with a filename as argument
+
 v0.0.5 - 2014-08-19
 -------------------
 - added a link on urls with a custom style

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 mose
+Copyright (c) 2014-2015 mose
 
 MIT License
 

data/README.md

@@ -2,6 +2,7 @@ Shell2html
 ===============
 
 [![Gem Version](https://img.shields.io/gem/v/shell2html.svg)](http://rubygems.org/gems/shell2html)
+[![Downloads](http://img.shields.io/gem/dt/shell2html.svg)](https://rubygems.org/gems/shell2html)
 [![Build Status](https://img.shields.io/travis/mose/shell2html.svg)](https://travis-ci.org/mose/shell2html)
 [![Coverage Status](https://img.shields.io/coveralls/mose/shell2html.svg)](https://coveralls.io/r/mose/shell2html?branch=master)
 [![Dependency Status](https://img.shields.io/gemnasium/mose/shell2html.svg)](https://gemnasium.com/mose/shell2html)
@@ -9,9 +10,9 @@ Shell2html
 
 ----
 
-A ruby lib for conversion between bash colors and HTML. It was created to help the Shellplay tool to export html from colored shell output.
+A ruby lib for conversion between bash colors and HTML. It was created to help the [Shellplay](https://github.com/mose/shellplay) tool to export html from colored shell output.
 
-Code is still experimental, use at your own risk. But "it works for me".
+Code is still experimental, use at your own risk. But "it works for me". An example of usage is visible on http://mose.com/20140814-dokku/
 
 Installation
 -------------------
@@ -39,8 +40,6 @@ puts Shell2html.to_html("\e[33m>\e[0m\e[1;31m some colored thing.\e[0m")
 Commandline command
 -------------------
 
-(not functionnal yet)
-
 There is a command `shell2html` provided in this lib for commandline execution.
 
     shell2html <file>
@@ -48,7 +47,9 @@ There is a command `shell2html` provided in this lib for commandline execution.
 
 The html is output in stdout.
 
-An example of usage is visible on http://mose.com/20140814-dokku/
+Another command `shell2css` will print out the CSS associated with the generated html.
+
+Use `shell2css sass` to generate a Sass version instead.
 
 Contributing
 -----------------
@@ -60,4 +61,4 @@ Contributing
 
 Copyright
 ----------------
-(c) Copyright 2014 mose. Distributed under MIT license
+(c) Copyright 2014-2015 mose. Distributed under MIT license

data/bin/shell2css

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'shell2html'
+
+if ARGV.count > 0 and ARGV[0] == 'sass'
+  puts Shell2html.sass
+else
+  puts Shell2html.css
+end

data/bin/shell2html

@@ -5,4 +5,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'shell2html'
 
-puts "Nothing there yet."
+if ARGV.count > 0
+  file = ARGV[0]
+  if !File.exists? file
+    puts "File #{file} Not found"
+    exit(1)
+  end
+  puts Shell2html.to_html(File.read(file))
+else
+  txt = $stdin.read
+  puts Shell2html.to_html(txt)
+end
+

data/lib/shell2html.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Shell2html
 
   module_function
@@ -67,6 +69,7 @@ module Shell2html
           key.split(';').each do |i|
             css << COLORS["#{i.to_i}"] if COLORS["#{i.to_i}"]
           end
+          count = 1
           if css.count > 0
             if inline
               span_style = css.map do |c|
@@ -76,15 +79,12 @@ module Shell2html
                 end
                 o
               end.flatten.join(';')
-              count = 1
               "#{'</span>' * count}<span style=\"#{span_style}\">#{t}"
             else
-              count = 1
               span_class = css.map { |c| c[:css] }.join(' ')
               "#{'</span>' * count}<span class=\"#{span_class}\">#{t}"
             end
           else
-            count = 1
             "#{'</span>' * count}<span>#{t}"
           end
         end
@@ -99,17 +99,23 @@ module Shell2html
     COLORS.each do |_, c|
       o = []
       css = c[:style].each do |k, v|
-        o << "#{k}:#{v}"
+        o << "#{k}: #{v}"
       end
       back << ".#{c[:css]} { #{o.join(';')} }"
     end
-    back.join("\n")
-  end
-
-  def to_sass(text)
+    back.join("\n") + "\n"
   end
 
-  def to_scss(text)
+  def sass
+    back = []
+    COLORS.each do |_, c|
+      o = []
+      back << ".#{c[:css]}"
+      c[:style].each do |k, v|
+        back << "  #{k}: #{v}"
+      end
+    end
+    back.join("\n") + "\n"
   end
 
 end

data/shell2html.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["mose"]
   spec.email         = ["mose@mose.com"]
   spec.summary       = %q{A ruby lib for transforming bash colors into html.}
-  spec.description   = %q{A ruby lib for transforming bash colors into html. Parses escape chars an output sp.}
+  spec.description   = %q{A ruby lib for transforming bash colors into html. Parses escape chars and outputs html.}
   spec.homepage      = "https://github.com/mose/shell2html"
   spec.license       = "MIT"
 
@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coveralls'

data/spec/files/colors.css

@@ -0,0 +1,42 @@
+.sh_bold { font-weight: bold }
+.sh_dim { opacity: .5 }
+.sh_underlined { border-bottom: 1px solid rgba(255,255,255,.6);padding-bottom: 1px }
+.sh_blink { text-decoration: blink }
+.sh_inverted { font-weight: bold }
+.sh_hidden { opacity: 0 }
+.sh_fg_default { color: #ffffff }
+.sh_fg_black { color: #000000 }
+.sh_fg_red { color: #cd0000 }
+.sh_fg_green { color: #00cd00 }
+.sh_fg_yellow { color: #cdcd00 }
+.sh_fg_blue { color: #1e90ff }
+.sh_fg_magenta { color: #cd00cd }
+.sh_fg_cyan { color: #00cdcd }
+.sh_fg_lightgray { color: #e5e5e5 }
+.sh_fg_darkgray { color: #4c4c4c }
+.sh_fg_lightred { color: #ff0000 }
+.sh_fg_lightgreen { color: #00ff00 }
+.sh_fg_lightyellow { color: #ffff00 }
+.sh_fg_lightblue { color: #4682b4 }
+.sh_fg_lightmagenta { color: #ff00ff }
+.sh_fg_lightcyan { color: #00ffff }
+.sh_fg_white { color: #ffffff }
+.sh_bg_default { background-color: #000000 }
+.sh_bg_black { background-color: #000000 }
+.sh_bg_red { background-color: #cd0000 }
+.sh_bg_green { background-color: #00cd00 }
+.sh_bg_yellow { background-color: #cdcd00 }
+.sh_bg_blue { background-color: #1e90ff }
+.sh_bg_magenta { background-color: #cd00cd }
+.sh_bg_cyan { background-color: #00cdcd }
+.sh_bg_lightgray { background-color: #e5e5e5 }
+.sh_bg_darkgray { background-color: #4c4c4c }
+.sh_bg_lightred { background-color: #ff0000 }
+.sh_bg_lightgreen { background-color: #00ff00 }
+.sh_bg_lightyellow { background-color: #ffff00 }
+.sh_bg_lightblue { background-color: #4682b4 }
+.sh_bg_lightmagenta { background-color: #ff00ff }
+.sh_bg_lightcyan { background-color: #00ffff }
+.sh_bg_white { background-color: #ffffff }
+.sh_a { color: inherit;text-decoration: inherit }
+.sh_a:hover { background-color: #ffffff;color: #000000 }

data/spec/files/colors.sass

@@ -0,0 +1,87 @@
+.sh_bold
+  font-weight: bold
+.sh_dim
+  opacity: .5
+.sh_underlined
+  border-bottom: 1px solid rgba(255,255,255,.6)
+  padding-bottom: 1px
+.sh_blink
+  text-decoration: blink
+.sh_inverted
+  font-weight: bold
+.sh_hidden
+  opacity: 0
+.sh_fg_default
+  color: #ffffff
+.sh_fg_black
+  color: #000000
+.sh_fg_red
+  color: #cd0000
+.sh_fg_green
+  color: #00cd00
+.sh_fg_yellow
+  color: #cdcd00
+.sh_fg_blue
+  color: #1e90ff
+.sh_fg_magenta
+  color: #cd00cd
+.sh_fg_cyan
+  color: #00cdcd
+.sh_fg_lightgray
+  color: #e5e5e5
+.sh_fg_darkgray
+  color: #4c4c4c
+.sh_fg_lightred
+  color: #ff0000
+.sh_fg_lightgreen
+  color: #00ff00
+.sh_fg_lightyellow
+  color: #ffff00
+.sh_fg_lightblue
+  color: #4682b4
+.sh_fg_lightmagenta
+  color: #ff00ff
+.sh_fg_lightcyan
+  color: #00ffff
+.sh_fg_white
+  color: #ffffff
+.sh_bg_default
+  background-color: #000000
+.sh_bg_black
+  background-color: #000000
+.sh_bg_red
+  background-color: #cd0000
+.sh_bg_green
+  background-color: #00cd00
+.sh_bg_yellow
+  background-color: #cdcd00
+.sh_bg_blue
+  background-color: #1e90ff
+.sh_bg_magenta
+  background-color: #cd00cd
+.sh_bg_cyan
+  background-color: #00cdcd
+.sh_bg_lightgray
+  background-color: #e5e5e5
+.sh_bg_darkgray
+  background-color: #4c4c4c
+.sh_bg_lightred
+  background-color: #ff0000
+.sh_bg_lightgreen
+  background-color: #00ff00
+.sh_bg_lightyellow
+  background-color: #ffff00
+.sh_bg_lightblue
+  background-color: #4682b4
+.sh_bg_lightmagenta
+  background-color: #ff00ff
+.sh_bg_lightcyan
+  background-color: #00ffff
+.sh_bg_white
+  background-color: #ffffff
+.sh_a
+  color: inherit
+  text-decoration: inherit
+.sh_a:hover
+  background-color: #ffffff
+  color: #000000

data/spec/lib/shell2html_spec.rb

@@ -14,24 +14,34 @@ describe Shell2html do
     context 'when we need css classes, ' do
 
       context 'when we input a text with an unknown foreground color, ' do
-        it { expect(subject.to_html(unknown_text)).to eq '<span>text</span>' }
+        it { expect(subject.to_html(unknown_text)).to eq '</span><span>text</span>' }
       end
 
       context 'when we input a text with a simple foreground color, ' do
-        it { expect(subject.to_html(blue_text)).to eq '<span class="sh_fg_blue">text</span>' }
+        it { expect(subject.to_html(blue_text)).to eq '</span><span class="sh_fg_blue">text</span>' }
       end
 
       context 'when we input a text with a bold foreground color, ' do
-        it { expect(subject.to_html(bold_blue_text)).to eq '<span class="sh_bold sh_fg_blue">text</span>' }
+        it { expect(subject.to_html(bold_blue_text)).to eq '</span><span class="sh_bold sh_fg_blue">text</span>' }
       end
     end
 
     context 'when we need inline styles, ' do
       context 'when we input a text with a simple foreground color, ' do
-        it { expect(subject.to_html(blue_text,true)).to eq '<span style="color:#1e90ff">text</span>' }
+        it { expect(subject.to_html(blue_text,true)).to eq '</span><span style="color:#1e90ff">text</span>' }
       end
     end
 
   end
 
+  describe '.css' do
+    let(:expected) { File.read(File.expand_path('../../files/colors.css', __FILE__)) }
+    it { expect(subject.css).to eq expected }
+  end
+
+  describe '.sass' do
+    let(:expected) { File.read(File.expand_path('../../files/colors.sass', __FILE__)) }
+    it { expect(subject.sass).to eq expected }
+  end
+
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shell2html
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,25 +53,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A ruby lib for transforming bash colors into html. Parses escape chars
-  an output sp.
+  and outputs html.
 email:
 - mose@mose.com
 executables:
+- shell2css
 - shell2html
 extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/shell2css
 - bin/shell2html
 - lib/shell2html.rb
 - shell2html.gemspec
+- spec/files/colors.css
+- spec/files/colors.sass
 - spec/lib/shell2html_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mose/shell2html
@@ -108,10 +99,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A ruby lib for transforming bash colors into html.
 test_files:
+- spec/files/colors.css
+- spec/files/colors.sass
 - spec/lib/shell2html_spec.rb
 - spec/spec_helper.rb