freshbooks-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d8d73d99463668eb02e32550fe31e0c0ee32f616bd8fbfd9839df01f5a22052
-  data.tar.gz: ce0758e59c4e5631b8d84c87d8c56bdb63e87386021e27de32922e162d0dad55
+  metadata.gz: 1a9fbab3436ac48b76db93a82b5b6ee909ab84e8928bb21ce0941c3547c1174e
+  data.tar.gz: 187a0da5b2fb4eb34f2df616573bc22fa819fa49da38a33b1df5bfab2fa5dba8
 SHA512:
-  metadata.gz: d21f0dd4f0d9704e736aa41b2f574c9d616e097d05a61d5e7eb23a6d39730cc9cb291178381397563e34e71fdbae7716ba25af2d8c34b4fe1da3b409f2ebc56f
-  data.tar.gz: ab9dcae6c63603ddc32aeb4519c6e4022eaa406e53a02293e1d5f7cf7c7546a1f1f3017194b3498bbcfd8de3da03be48b20ac039d8c587b6c15ff4aa7eff11a3
+  metadata.gz: 28163e4059f5d8b5ac7bb6aed4c49b7abdf1e3d3ebae078a4feccead18e6d6989bc5985b9794e9401570c99735bedadce33aa440696ca7e459cc5144a4d167ac
+  data.tar.gz: 5fc2c9c1b53be6557cd30edbfc9ce898f86fa9fbd5fdc19403ab379f5daf18e4e8ed1cb0ac9ffd3aa10bd11a9326ab01942707717cc619adf3d3b6f05b9505cb

data/lib/fb/cli.rb

@@ -3,6 +3,7 @@
 require "thor"
 require "json"
 require "date"
+require "io/console"
 
 module FB
   class Cli < Thor
@@ -11,8 +12,16 @@ module FB
     end
 
     class_option :no_interactive, type: :boolean, default: false, desc: "Disable interactive prompts (auto-detected when not a TTY)"
+    class_option :interactive, type: :boolean, default: false, desc: "Force interactive mode even when not a TTY"
     class_option :format, type: :string, desc: "Output format: table (default) or json"
 
+    no_commands do
+      def invoke_command(command, *args)
+        Spinner.interactive = interactive?
+        super
+      end
+    end
+
     # --- version ---
 
     desc "version", "Print the current version"
@@ -294,12 +303,12 @@ module FB
         client = maps[:clients][e["client_id"].to_s] || e["client_id"].to_s
         project = maps[:projects][e["project_id"].to_s] || "-"
         service = maps[:services][e["service_id"].to_s] || "-"
-        note = (e["note"] || "").slice(0, 50)
+        note = e["note"] || ""
         hours = (e["duration"].to_i / 3600.0).round(2)
         [e["id"].to_s, date, client, project, service, note, "#{hours}h"]
       end
 
-      print_table(["ID", "Date", "Client", "Project", "Service", "Note", "Duration"], rows)
+      print_table(["ID", "Date", "Client", "Project", "Service", "Note", "Duration"], rows, wrap_col: 5)
 
       total = entries.sum { |e| e["duration"].to_i } / 3600.0
       puts "\nTotal: #{total.round(2)}h"
@@ -586,6 +595,7 @@ module FB
 
     def interactive?
       return false if options[:no_interactive]
+      return true if options[:interactive]
       $stdin.tty?
     end
 
@@ -747,15 +757,56 @@ module FB
       input
     end
 
-    def print_table(headers, rows)
+    def print_table(headers, rows, wrap_col: nil)
       widths = headers.each_with_index.map do |h, i|
         [h.length, *rows.map { |r| r[i].to_s.length }].max
       end
 
+      # Word-wrap a specific column if it would exceed terminal width
+      if wrap_col
+        term_width = IO.console&.winsize&.last || ENV["COLUMNS"]&.to_i || 120
+        fixed_width = widths.each_with_index.sum { |w, i| i == wrap_col ? 0 : w } + (widths.length - 1) * 2
+        max_wrap = term_width - fixed_width
+        max_wrap = [max_wrap, 20].max
+        widths[wrap_col] = [widths[wrap_col], max_wrap].min
+      end
+
       fmt = widths.map { |w| "%-#{w}s" }.join("  ")
       puts fmt % headers
       puts widths.map { |w| "-" * w }.join("  ")
-      rows.each { |r| puts fmt % r }
+
+      rows.each do |r|
+        if wrap_col && r[wrap_col].to_s.length > widths[wrap_col]
+          lines = word_wrap(r[wrap_col].to_s, widths[wrap_col])
+          padded = widths.each_with_index.map { |w, i| i == wrap_col ? "" : " " * w }
+          pad_fmt = padded.each_with_index.map { |p, i| i == wrap_col ? "%s" : "%-#{widths[i]}s" }.join("  ")
+          lines.each_with_index do |line, li|
+            if li == 0
+              row = r.dup
+              row[wrap_col] = line
+              puts fmt % row
+            else
+              blank = padded.dup
+              blank[wrap_col] = line
+              puts pad_fmt % blank
+            end
+          end
+        else
+          puts fmt % r
+        end
+      end
+    end
+
+    def word_wrap(text, width)
+      lines = []
+      remaining = text
+      while remaining.length > width
+        break_at = remaining.rindex(" ", width) || width
+        lines << remaining[0...break_at]
+        remaining = remaining[break_at..].lstrip
+      end
+      lines << remaining unless remaining.empty?
+      lines
     end
 
     def print_status_section(title, entries, maps)

data/lib/fb/spinner.rb

@@ -4,15 +4,31 @@ module FB
   module Spinner
     FRAMES = %w[⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏].freeze
 
+    @interactive = nil
+
+    def self.interactive=(value)
+      @interactive = value
+    end
+
+    def self.interactive?
+      return @interactive unless @interactive.nil?
+      $stderr.tty?
+    end
+
     def self.spin(message)
-      done = false
       result = nil
 
+      unless interactive?
+        result = yield
+        return result
+      end
+
+      done = false
       thread = Thread.new do
         i = 0
         while !done
-          print "\r#{FRAMES[i % FRAMES.length]} #{message}"
-          $stdout.flush
+          $stderr.print "\r#{FRAMES[i % FRAMES.length]} #{message}"
+          $stderr.flush
           i += 1
           sleep 0.08
         end
@@ -23,7 +39,7 @@ module FB
       ensure
         done = true
         thread.join
-        print "\r✓ #{message}\n"
+        $stderr.print "\r✓ #{message}\n"
       end
 
       result

data/lib/fb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FB
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freshbooks-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - parasquid