RubyGems - viewworkbook - Versions diffs - 1.0 → 1.2 - Mend

viewworkbook 1.0 → 1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf982468005b8fada83fa4ab8bec2977fcf98c4d5758233aa58f86608396de36
-  data.tar.gz: efdb779b9b3f8431fada873ec0644af79b84de2f5a1f23253179dc73e8de6f30
+  metadata.gz: 85b7c9328b02b372b95e8381b81bf5bb759715a7dc808401465f2d9cad87270c
+  data.tar.gz: 451a5a49bca0f59daace157bfee46330079c27726f708c50653c228010504688
 SHA512:
-  metadata.gz: 74c90225643b12b3ad80eb2e600f01fc8b2d840f89d4cc4c6e59feb1aa9bb57e459a4953a3f3be1342eca935bff15cdd851aa982875d03cebf0e4cdd5288308c
-  data.tar.gz: 0f6e429179e1e87ea7a571ee9e6fa569bbff0e0d11090c1bc1ec0be8c942666a32ef7f0cd75adf7a23fb5350cf3cab91e03a9b1d443135f6e5dab176104bc031
+  metadata.gz: faf90e01169b447c1e58f04c27d7de25fcb8744a0d06ba379f1e33de8a1843b64aea0521d290f9d24dcaa9b6eebac59d0b56780d5fec081640db262181a0b2ed
+  data.tar.gz: 6885f8edb5e6cf4c21a32ca56d3e8c2ffb6dfaff4459e0824080fb00c59c15e7803c1145eed05e2dc1515f6d88db1b7acc13d17e037e424f06338f2874776c61

data/bin/viewworkbook CHANGED Viewed

@@ -25,9 +25,19 @@ BasicLogging::set_level BasicLogging::INFO
 # BasicLogging::set_target "/tmp/viewworkbook.log"
 # BasicLogging::set_level BasicLogging::DEBUG
+def usage
+  msg = '' << 'Usage: '
+  msg << yellow("\n\tviewworkbook [file]")
+  msg << "\n\tWhere \"file\" is a spreadsheet file."
+  puts msg
+end
 if(ARGV.compact.empty?)
   puts purple("\n\tYou must name a valid spreadsheet file! Aborting\n")
+  usage
   puts
   exit false
 end
 ViewWorkBook.new(ARGV[0])

data/changes.txt ADDED Viewed

@@ -0,0 +1,5 @@
+V. 1.2
+    Missing dependency added to gemfile: io-console
+V. 1.1
+    Ruby-FileMagic replaced by Marcel

data/doc/html/viewworkbook.html CHANGED Viewed

@@ -1,67 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <meta name="generator" content="vim - Vi Improved, a programmer's editor; HTML Tidy for Linux version 5.8.0
+  <meta name="generator" content="vim - Vi Improved, a programmer's editor; HTML Tidy for Linux version 5.9.20
 "/>
    <meta charset="utf-8" />
+  <link rel="preload" as="font" crossorigin="" href=
+  "https://www.uplawski.eu/fonts/Classica/Classica-Book.ttf" type=
+  "font/ttf" />
+  <link rel="preload" as="font" crossorigin="" href=
+  "https://www.uplawski.eu/fonts/Classica/Classica-Bold.ttf" type=
+  "font/ttf" />
+  <link rel="preload" as="font" crossorigin="" href=
+  "https://www.uplawski.eu/fonts/Classica/Classica-BookOblique.ttf"
+  type="font/ttf" />
+  <link rel="preload" as="font" crossorigin="" href=
+  "https://www.uplawski.eu/fonts/Fertigo_PRO.otf" type=
+  "font/otf" />
+  <link rel="icon" type="/image/x-icon" href=
+  "images/favicon_Schreibfeder.ico" />
    <meta name="viewport" content=
   "width=device-width, initial-scale=1" />
   <title>Viewworkbook</title>
-  <style type="text/css">
-  /*<![CDATA[*/
-  /*
-  :Author: Michael Uplawski
-  :Contact: michael.uplawski@uplawski.eu
-  :License: WTFPL 2.0, see http://www.wtfpl.net/about/
-  Stylesheet for use with Docutils.
-  */
-  body {
-  background-color:#300020;
-  font-family: Verdana,Helvetica,Univers;
-  color:#f0f0f0;
-  color:#f0f0f0;
-  }
-  h1 {color:cyan;font-size:1.5em;}
-  h1.title {color:#a0a0f0;font-size:2em;}
-  h2 {color:#ffffa0;}
-  p, ul.simple, ol.simple, dt {margin-left:2em;}
-  p.first {font-weight:bold;}
-  dd {margin-left:4em;}
-  td {color:#f0f080;}
-  /* correct left margin of nested block tags*/
-  dd {}
-  dd p, li p {margin-left:0;}
-  dd * ul {margin-left:0 ! important; }
-  dd ul {margin-left:0 ! important; }
-  dd dl dt, dd dl dd {margin-left:0 ! important;}
-  dt {font-weight:bold;}
-  dt, dd {color:#f0f0f0}
-  tt.docutils {color:#000080;
-  background-color:#a080a0;
-  padding-left:3px;
-  padding-right:3px;
-  white-space:nowrap;
-  }
-  a.external {color:#ff90ff;}
-  blockquote {background-color:#400020;
-  padding:0.5em;
-  border-radius:1em;
-  border-style:dotted;
-  border-width:0.5pt;
-  }
-  /*]]>*/
-  </style>
+  <link rel="stylesheet" href="../html/viewworkbook.css" type=
+  "text/css" />
+  <link rel="stylesheet" href="../html/fonts.css" type=
+  "text/css" />
 </head>
 <body>
   <main id="viewworkbook">
@@ -392,11 +355,22 @@
           </dd>
         </dl>
       </blockquote>
-    </section>
-    <section id="section-1">
-      <h2><strong>Ω</strong>
-      </h2>
+      <section id="this-document">
+        <h3>This document</h3>
+        <p>©Michael Uplawski &lt;<a class="reference external"
+        href="mailto:michael.uplawski@uplawski.eu">michael.uplawski@uplawski.eu</a>&gt;</p>
+        <p>License: <a class="reference external" href=
+        "https://creativecommons.org/licenses/by-nd/4.0/">CC BY-ND
+        4.0</a></p>
+        <p>Date: 2026-04-26</p>
+        <p><strong>Ω</strong>
+        </p>
+      </section>
     </section>
   </main>
 </body>

data/doc/man/viewworkbook.1.gz CHANGED Viewed

Binary file

data/lib/sheetdata.rb CHANGED Viewed

@@ -15,7 +15,7 @@
  ***************************************************************************/
 =end
-require 'filemagic'
+require 'marcel'
 require 'roo'
 require 'roo-xls'
@@ -33,6 +33,7 @@ XLS_MIME  = "application/vnd.ms-excel"
 XLSX_MIME = "application/zip"
 CSV_MIME  = "text/plain"
 # SoftMaker Office
+PMD_MIME = "application/x-ole-storage"
 PMDX_MIME = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
 =begin
@@ -50,15 +51,13 @@ class SheetData
     @@file = file
     if !@@workbook
       begin
-        fm = FileMagic.mime
-        mtype = fm.fd(File.new(file) ).split(';')[0]
-        fm = FileMagic.fm
-        magic = fm.fd(File.new(file) ).split(';')[0]
+        mtype = Marcel::MimeType.for(File.new(file) )
         @@workbook = case mtype
                      when ODS_MIME
                        debug('ODS')
                        Roo::Spreadsheet::open(@@file, extension: :ods )
-                     when (XLS_MIME)
+                     when XLS_MIME, PMD_MIME
                        debug('XLS')
                        Roo::Spreadsheet::open(@@file, extension: :xls )
                      when XLSX_MIME, PMDX_MIME
@@ -67,7 +66,7 @@ class SheetData
                      when CSV_MIME
                        raise IOError.new('CSV is not yet supported, sorry')
                      else
-                       raise IOError.new('Mime-Type is ' << mtype << ' and Magic sais: ' << magic << ". Is this supposed to be a spreadsheet?")
+                       raise IOError.new('Mime-Type is ' << mtype << ". Is this supposed to be a spreadsheet?")
                      end
       rescue Exception => ex
         msg = 'ERROR! File %s is not supported: %s' %[@@file, ex.message]

data/lib/translating.rb CHANGED Viewed

@@ -19,7 +19,6 @@
 RD = File.expand_path(File.dirname(__FILE__) ) +  File::SEPARATOR if !defined?(RD)
 require 'yaml'
-require_relative 'file_checking'
 # A way to produce translated text in a ruby-program.
@@ -40,7 +39,7 @@ module Translating
       r = ENV['LANG']
       if(r)
         @@lang = r[0, 2]
-      elsif( !File_Checking::file_check(@@lang_file, [:exist?, :readable?]) && File::size(@@lang_file) >= 2)
+      elsif( File::exist?(@@lang_file) && File::readable?(@@lang_file) && File::size(@@lang_file) >= 2)
         File::open(@@lang_file, 'r') {|f| @@lang = f.readline}
         @@lang.chomp!.downcase! if @@lang
       end

data/lib/viewworkbook.rb CHANGED Viewed

@@ -17,14 +17,12 @@
 require 'tempfile'
 require_relative 'basic_logging'
-require_relative 'file_checking'
 require_relative 'sheetinterface'
 require_relative 'sheetdata'
 require_relative 'color_output'
 class ViewWorkBook
   include BasicLogging
-  include File_Checking
   attr_reader :workbook
@@ -35,8 +33,14 @@ class ViewWorkBook
     debug('workbook file will be ' << (path ? path : 'N I L'))
     if(wb)
-      msg = file_check(path, :exist?, :file?, :readable?)
-      if(!msg)
+      msg = ''
+      [:exist?, :file?, :readable?].each do |cond|
+        if ! File.send(cond, path)
+          msg = "\n\t not " << cond.to_s.split('?')[0]
+        end
+      end
+      if(msg.empty?)
         begin
           @workbook = SheetData.workbook(path)
           view_sheet if @workbook

data/viewworkbook.gemspec CHANGED Viewed

@@ -1,27 +1,30 @@
+require_relative 'lib/version'
+require 'date'
 Gem::Specification.new do |s|
-  s.name        = 'viewworkbook'
-  s.version     = '1.0'
-  s.date        = '2026-04-10'
-  s.summary     = "Content can – again – be writtenn to a text-file, "
-  s.summary << "Ruby 4.0 compatibility, "
-  s.summary << "Minor Bug-fix."
+  s.name        = PROGNAME
+  s.version     = VERSION
+  s.date        = Date.today.strftime('%F')
+  s.summary     = SUMMARY
   s.description = "View spreadsheet files in a text-console."
-  s.authors     = ["Michael Uplawski"]
-  s.email       = 'michael.uplawski@uplawski.eu'
-  s.files  	=  %w~action.rb scrollable.rb cell.rb column.rb row.rb color_output.rb menu.rb sheetdata.rb translating.rb user_input.rb file_checking.rb basic_logging.rb sheetinterface.rb translations viewworkbook.rb~.collect{|f| 'lib/' << f} +
+  s.authors     = AUTHORS
+  s.email       = EMAIL
+  s.files  	=  %w~action.rb scrollable.rb cell.rb column.rb row.rb color_output.rb menu.rb sheetdata.rb translating.rb user_input.rb basic_logging.rb sheetinterface.rb translations viewworkbook.rb~.collect{|f| 'lib/' << f} +
     %w~license.txt rst/viewworkbook.rst man/viewworkbook.1.gz html/viewworkbook.html~.collect{|f| 'doc/' << f} +
-    %w~busy_function_test.rb busy_indicator.rb~.collect{|f| 'lib/busy_indicator/' << f} + ["README.md", "viewworkbook.gemspec"]
+    %w~busy_function_test.rb busy_indicator.rb~.collect{|f| 'lib/busy_indicator/' << f} + ["README.md", "viewworkbook.gemspec", "changes.txt"]
   s.homepage    = 'http://rubygems.org/gems/viewworkbook'
-  s.requirements = 'roo, roo-xls, ruby-filemagic'
-  s.add_runtime_dependency 'roo', '~> 2.10', '>= 2.10.1'
-  s.add_runtime_dependency 'roo-xls', '~> 1.2', '>= 1.2.0'
-  s.add_runtime_dependency 'ruby-filemagic', '~> 0.7', '>= 0.7.3'
+  s.requirements = 'roo, roo-xls, marcel'
+  s.add_runtime_dependency 'roo', '~> 3.0', '>= 3.0.0'
+  s.add_runtime_dependency 'roo-xls', '~> 2.0', '>= 2.0.0'
+  s.add_runtime_dependency 'marcel', '~> 1.2', '>= 1.2.1'
+  s.add_runtime_dependency 'io-console', '~> 0.9', '>= 0.9.2'
   s.executables = 'viewworkbook'
-  s.license     = 'Nonstandard'
+  s.license     = 'WTFPL'
   s.required_ruby_version = '>= 4.0'
   s.metadata = {
     "homepage_uri" => 'https://www.uplawski.eu/software/viewworkbook/',
-    "documentation_uri" => 'https://www.uplawski.eu/software/viewworkbook/viewworkbook.html'
+    "documentation_uri" => 'https://www.uplawski.eu/software/viewworkbook/viewworkbook.html',
+    "changelog_uri" => 'https://www.uplawski.eu/software/viewworkbook/changes.txt'
   }
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: viewworkbook
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Michael Uplawski
 bindir: bin
 cert_chain: []
-date: 2026-04-10 00:00:00.000000000 Z
+date: 2026-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -15,22 +15,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: roo-xls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -38,7 +58,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,27 +68,27 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: ruby-filemagic
+  name: io-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.9.2
 description: View spreadsheet files in a text-console.
 email: michael.uplawski@uplawski.eu
 executables:
@@ -78,6 +98,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/viewworkbook
+- changes.txt
 - doc/html/viewworkbook.html
 - doc/license.txt
 - doc/man/viewworkbook.1.gz
@@ -89,7 +110,6 @@ files:
 - lib/cell.rb
 - lib/color_output.rb
 - lib/column.rb
-- lib/file_checking.rb
 - lib/menu.rb
 - lib/row.rb
 - lib/scrollable.rb
@@ -102,10 +122,11 @@ files:
 - viewworkbook.gemspec
 homepage: http://rubygems.org/gems/viewworkbook
 licenses:
-- Nonstandard
+- WTFPL
 metadata:
   homepage_uri: https://www.uplawski.eu/software/viewworkbook/
   documentation_uri: https://www.uplawski.eu/software/viewworkbook/viewworkbook.html
+  changelog_uri: https://www.uplawski.eu/software/viewworkbook/changes.txt
 rdoc_options: []
 require_paths:
 - lib
@@ -120,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- roo, roo-xls, ruby-filemagic
-rubygems_version: 4.0.10
+- roo, roo-xls, marcel
+rubygems_version: 4.0.18
 specification_version: 4
-summary: Content can – again – be writtenn to a text-file,Ruby 4.0 compatibility,
-  Minor Bug-fix.
+summary: View spreadsheets in a terminal
 test_files: []

data/lib/file_checking.rb DELETED Viewed

@@ -1,112 +0,0 @@
-#encoding: UTF-8
-=begin
-/***************************************************************************
- *   ©2011-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
-=end
-require 'filemagic'
-=begin
-A module to facilitate frequently occuring checks on
-file-system objects
-=end
-module File_Checking
-  @@text_messages  = {
-    :exist? => "does not exist!",
-    :exist => "does not exist!",
-    :readable? => "is not readable!",
-    :readable => "is not readable!",
-    :executable? => "is not executable!",
-    :executable => "is not executable!",
-    :writable? => "is not writable!",
-    :writable => "is not writable!",
-    :directory? => "is not a directory!",
-    :directory => "is not a directory!",
-    :file? => "is not a file!",
-    :file => "is not a file!",
-    :type => "is not of the sought file-type (not '%s', but '%s')!",
-    :type? => "is not of the sought file-type (not '%s', but '%s')!",
-    :mime => "does not have the sought mime-type (not '%s', but '%s')!",
-    :mime? => "does not have the sought mime-type (not '%s', but '%s')!",
-  }
-  # Checks if the file with the name from the first
-  # parameter has the properties, listed in the second.
-  # The messages parameter is an array of one or several
-  # of :exist?, :readable?, :writable?, :directory?  or
-  # their string-representations, respectively.
-  # Returns nil in case of success, otherwise an
-  # informative message, describing the first negative
-  # test-result.
-  def file_check(file, *messages)
-    File_Checking.file_check(file, *messages)
-  end
-  # Checks if the file with the name from the first
-  # parameter has the properties, listed in the second.
-  # The messages parameter is an array of one or all
-  # of :exist?, :readable?, :writable?, :directory? or
-  # their string-representations, respectively.
-  # Returns nil in case of success, otherwise an
-  # informative message, describing the first negative
-  # test-result.
-  def self.file_check(file, *messages)
-    msg = nil
-    if(file && messages.respond_to?(:to_ary) && !messages.empty?)
-      messages.each do |k|
-        if(! k.to_s.end_with?('?'))
-          k = (k.to_s << '?').to_sym
-        end
-        @log.debug ('checking ' << k.to_s) if @log
-        if(msg == nil && File.respond_to?(k) && ! File.send(k, file.to_s))
-          msg = "#{file} #{@@text_messages[k.to_sym]}"
-        end
-      end
-    end
-    msg
-  end
-  def self.mime_check(file, mime_type)
-    fm = FileMagic.mime
-    fd = fm.fd(File.new(file) ).split(';')[0]
-    if fd != mime_type.strip
-             return file.dup << ' ' << (@@text_messages[:mime] %[mime_type, fd])
-    end
-    return nil
-  end
-  def self.magic_check(file, magic)
-    fm = FileMagic.fm
-    fd = fm.fd(File.new(file) ).split(';')[0]
-    if fd != magic.strip
-             return file.dup << ' ' << (@@text_messages[:type] %[magic, fd])
-    end
-    return nil
-  end
-end # module
-=begin
-# example
-include File_Checking
-msg = file_check('some_file.txt', [:exist?, :readable?, 'writable'])
-# same as
-# msg = file_check('some_file.txt', [:exist, :readable, 'writable?'])
-msg ||= magic_check('some_file.txt', [:type?], 'OpenDocument Text'
-msg ||= mime_check('some_file.txt', [:mime?], 'application/vnd.oasis.opendocument.text'
-puts msg if msg
-=end
-# E O F