formatador 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371ea2974db0d03751e1a559433313ef4f7e7c2c46cabba41f004dba91632065
-  data.tar.gz: 05ee97c7103cb73f5a6ee26e135a828f2c8d738937409a933c379f66b0f2cd76
+  metadata.gz: c7691580892da9215dfc4bbe6523203fef95cd0c57a25652af464d208e1a7a64
+  data.tar.gz: 8e99624363cc7a8b76d2cc699664618d184ffdffe16ca4d4b3ce73927aa3e5d0
 SHA512:
-  metadata.gz: dbec7dda7093e08b69ff2372fbbff210cc7d6bde6f2d03e6ca5bf4ed03ff0e75ed7791c4a53812f7f1804c11ed801fbad3acadc71dd48a769977f42cde522ddc
-  data.tar.gz: 54c7902a6d39b65d929c02f9f66c490f27753c3aec04d27c3921b33f8d3a49bc9524965d52eaac0fdd14a7892f0797d38f0e5c758d6c55dd026d465517160e4b
+  metadata.gz: 240f470bb912d51efd07d5916ba31ca06694db82058146ad1d5403959966bc8c4c7c409b5d53958ac6232a87d46ff299e9640a7b5b4333bbff527fdf0055f604
+  data.tar.gz: 10800e56b00b910904da64dc8a8b64d01e717ffcc91ec19d4ac4e3c4e94ce903921722707ca16cc675c082bff888e170b1324da5426f7f8e7c1668de64448b37

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2013 [CONTRIBUTORS.md](https://github.com/geemus/formatador/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2009-2022 [CONTRIBUTORS.md](https://github.com/geemus/formatador/blob/master/CONTRIBUTORS.md)
 
 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

data/README.md

@@ -2,7 +2,7 @@
 
 STDOUT text formatting
 
-[![Build Status](https://travis-ci.org/geemus/formatador.svg)](http://travis-ci.org/geemus/formatador)
+[![Build Status](https://github.com/geemus/formatador/actions/workflows/ruby.yml/badge.svg)](https://github.com/geemus/formatador/actions/workflows/ruby.yml)
 
 ## Quick and dirty
 
@@ -123,7 +123,7 @@ formatador.display_line('one level of indentation')
 
 (The MIT License)
 
-Copyright (c) 2015 [geemus (Wesley Beary)](http://github.com/geemus)
+Copyright (c) 2022 [geemus (Wesley Beary)](http://github.com/geemus)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -84,7 +84,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "sudo gem install pkg/#{name}-#{version}.gem"
+  sh "gem install pkg/#{name}-#{version}.gem"
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"

data/changelog.txt

@@ -1,3 +1,8 @@
+v1.0.0 01/20/21
+===============
+
+release v1, it's been stable for ages
+
 v0.3.0 06/17/21
 ===============
 

data/formatador.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '0.3.0'
-  s.date              = '2021-06-17'
+  s.version           = '1.1.0'
+  s.date              = '2022-01-24'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -77,8 +77,4 @@ Gem::Specification.new do |s|
     tests/tests_helper.rb
   ]
   # = MANIFEST =
-
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^[spec|tests]\/.*_[spec|tests]\.rb/ }
 end

data/lib/formatador/table.rb

@@ -1,13 +1,13 @@
 class Formatador
-  def display_table(hashes, keys = nil, &block)
+  def display_table(hashes, keys = nil, **options, &block)
     new_hashes = hashes.inject([]) do |accum,item|
       accum << :split unless accum.empty?
       accum << item
     end
-    display_compact_table(new_hashes, keys, &block)
+    display_compact_table(new_hashes, keys, **options, &block)
   end
 
-  def display_compact_table(hashes, keys = nil, &block)
+  def display_compact_table(hashes, keys = nil, **options, &block)
     headers = keys || []
     widths = {}
 
@@ -59,12 +59,12 @@ class Formatador
 
     hashes.each do |hash|
       if hash.respond_to? :keys
-        columns = []
-        headers.each do |header|
+        columns = headers.map do |header|
           datum = calculate_datum(header, hash)
           width = widths[header] - length(datum)
           width = width < 0 ? 0 : width
-          columns << "#{datum}#{' ' * width}"
+
+          datum.is_a?(Numeric) && options[:numeric_rjust] ? "#{' ' * width}#{datum}" : "#{datum}#{' ' * width}"
         end
         display_line("| #{columns.join(' | ')} |")
       else

data/lib/formatador.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
 
 class Formatador
 
-  VERSION = '0.3.0'
+  VERSION = '1.1.0'
 
   STYLES = {
     :"\/"             => "0",
@@ -119,7 +119,7 @@ class Formatador
     string.gsub(PARSE_REGEX, '').gsub(INDENT_REGEX) { indentation }
   end
 
-  %w{display display_line display_lines display_table display_compact_table indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
+  %w{display display_line display_lines indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         Thread.current[:formatador] ||= new
@@ -128,4 +128,13 @@ class Formatador
     DEF
   end
 
+  %w{display_table display_compact_table}.each do |method|
+    eval <<-DEF
+      def self.#{method}(*args, **kwargs, &block)
+        Thread.current[:formatador] ||= new
+        Thread.current[:formatador].#{method}(*args, **kwargs, &block)
+      end
+    DEF
+  end
+
 end

data/tests/table_tests.rb

@@ -94,6 +94,36 @@ output = Formatador.parse(output)
     end
   end
 
+output = <<-OUTPUT
+    +-------------------------+----------------+
+    | [bold]right-justify a numeric[/] | [bold]standard value[/] |
+    +-------------------------+----------------+
+    |                   12345 | value          |
+    +-------------------------+----------------+
+OUTPUT
+output = Formatador.parse(output)
+
+  tests("#display_table([{'right-justify a numeric' => 12345, 'standard value' => 'standard value'}], numeric_rjust: true)").returns(output) do
+    capture_stdout do
+      Formatador.display_table([{'right-justify a numeric' => 12345, 'standard value' => 'value'}], numeric_rjust: true)
+    end
+  end
+
+output = <<-OUTPUT
+    +--------+------------+
+    | [bold]header[/] | [bold]nested.key[/] |
+    +--------+------------+
+    |  12345 | value      |
+    +--------+------------+
+OUTPUT
+output = Formatador.parse(output)
+
+  tests("#display_table([{:header => 12345, :nested => {:key => value}}], [:header, :'nested.key'], numeric_rjust: true)").returns(output) do
+    capture_stdout do
+      Formatador.display_table([{:header => 12345, :nested => {:key => 'value'}}], [:header, :'nested.key'], numeric_rjust: true)
+    end
+  end
+
 
 output = <<-OUTPUT
     +------+
@@ -106,7 +136,7 @@ output = <<-OUTPUT
 OUTPUT
   output = Formatador.parse(output)
 
-  tests("#display_table([{:a => 1}, {:a => 2}])").returns(output) do
+  tests("#display_table([{:a => 1}, {:a => '震度'}])").returns(output) do
     capture_stdout do
       Formatador.display_table([{:a => 1}, {:a => "震度"}])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatador
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 2
 summary: Ruby STDOUT text formatting