samovar 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c0bd9487cfc9b45d64ca2f1e807ce0e89b6b4408ef9ed812eb6fd3f04b376c6
-  data.tar.gz: 7145b36d633509be0f83db27f2f875109ac0623f9d46fac397933e3ac0196a6d
+  metadata.gz: c1e5553e013cfe19724bdbdb1cb1c989025216e737e6b7591068f97fc4059fb3
+  data.tar.gz: 7430857e0d0d389b041056d2cac1f532d6215014ed06b4f60fc2a8e0fdc4161f
 SHA512:
-  metadata.gz: fcf6d2a20f71d11d82855526be7f9e888ec332cdf80bb8999fa4467f5030e4ba8ee18cd9fa710f0e3c2083be4222ea4dd2db44b3b7a435bb41cd8e10692371a9
-  data.tar.gz: f75f223d7e5db75dc352f18f384b53e4935937353ef213b77949b963305ba717c7054d38c036e1f6c43a6bea448093154d7a90a8926670fd0c5109387bd66fc8
+  metadata.gz: 9a47b68e6b5c28c2539d9089d51752320a289056f762693edef1b7ec84dff3f8befc3f5196700f95243ca3bb1461413e1fc74c3d6d6619c816eeb873f5491800
+  data.tar.gz: b083e569e8f23de9da31c302dbd1526b32cbfbb9d6087430f0103ff68d3ca3de204d87bf4f541179f3c2b56f3f71c10b4ac0c32331a1261d740f5f3d7a88445e

data/lib/samovar/command/system.rb

@@ -20,7 +20,8 @@
 
 require_relative '../failure'
 
-require 'time'
+require_relative 'terminal'
+
 require 'shellwords'
 
 module Samovar
@@ -49,7 +50,7 @@ module Samovar
 		def log_system(args, options)
 			# Print out something half-decent:
 			command_line = Shellwords.join(args)
-			puts Rainbow(command_line).color(:blue)
+			terminal.puts command_line, style: :command
 		end
 	end
 end

data/lib/samovar/command/terminal.rb

@@ -0,0 +1,32 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'time'
+
+module Samovar
+	class Command
+		def terminal(output = $stderr)
+			Event::Terminal.for(output).tap do |terminal|
+				terminal[:command] = terminal.style(:blue)
+				terminal[:summary] = terminal.style(:magenta)
+			end
+		end
+	end
+end

data/lib/samovar/command/track_time.rb

@@ -20,6 +20,8 @@
 
 require 'time'
 
+require_relative 'terminal'
+
 module Samovar
 	class Command
 		def track_time
@@ -31,7 +33,7 @@ module Samovar
 			elapsed_time = end_time - start_time
 			
 			$stdout.flush
-			$stderr.puts Rainbow("Elapsed Time: %0.3fs" % elapsed_time).magenta
+			terminal.puts("Elapsed Time: %0.3fs" % elapsed_time, style: :summary)
 		end
 	end
 end

data/lib/samovar/output.rb

@@ -19,7 +19,8 @@
 # THE SOFTWARE.
 
 require 'mapping/model'
-require 'rainbow'
+
+require 'event/terminal'
 
 module Samovar
 	module Output
@@ -141,17 +142,21 @@ module Samovar
 				@rows = rows
 				@output = output
 				@width = 80
+				
+				@terminal = Event::Terminal.for(@output)
+				@terminal[:header] = @terminal.style(:blue, nil, :bright)
+				@terminal[:description] = @terminal.style(:blue)
 			end
 			
 			map(Header) do |header, rows|
-				@output.puts unless header == @rows.first
-				@output.puts "#{rows.indentation}#{Rainbow(header.object.command_line(header.name)).bright}"
-				@output.puts "#{rows.indentation}\t#{Rainbow(header.object.description).blue}"
-				@output.puts
+				@terminal.puts unless header == @rows.first
+				@terminal.puts "#{rows.indentation}#{header.object.command_line(header.name)}", style: :header
+				@terminal.puts "#{rows.indentation}\t#{header.object.description}", style: :description
+				@terminal.puts
 			end
 			
 			map(Row) do |row, rows|
-				@output.puts "#{rows.indentation}#{row.align(rows.columns)}"
+				@terminal.puts "#{rows.indentation}#{row.align(rows.columns)}"
 			end
 			
 			map(Rows) do |items|

data/lib/samovar/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Samovar
-	VERSION = "1.9.2"
+	VERSION = "1.10.0"
 end

data/samovar.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency "mapping", "~> 1.0"
-	spec.add_dependency "rainbow", ">= 2.0", "< 4.0"
+	spec.add_dependency "event"
 
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping
@@ -25,25 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +110,7 @@ files:
 - lib/samovar.rb
 - lib/samovar/command.rb
 - lib/samovar/command/system.rb
+- lib/samovar/command/terminal.rb
 - lib/samovar/command/track_time.rb
 - lib/samovar/failure.rb
 - lib/samovar/flags.rb
@@ -154,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Samovar is a flexible option parser excellent support for sub-commands and