tinylinks 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3190a474ea8e4c3d3591730b77295d59d806034dce59410a5ebc08a9d8c540
-  data.tar.gz: 2019b549e6959fabc443a06414a3e1567cf5f38954a5a583834dd0bb2d9aef04
+  metadata.gz: bd4a470b6c9c25a8e96eb05ae5daaca8f40b3568110c0b70dd3f4e015e70aef3
+  data.tar.gz: b67838e3360ac7487dd844b17d67e3c92a1b04b5fff5bb1781a060f74104d91b
 SHA512:
-  metadata.gz: b6ca05746fc41a5f2ee89a37ce46e60079676bd9b7cc5bacf7c7bce7fdf6251b791f59056efc9ef3d923d05bd04560a03a66bb99cbf664aef652d31266bd1484
-  data.tar.gz: c43ba22c4aeab230476184cc4aaf776b12f40b75e3efeaee1072e24039f39f7265be355dd94744edbc583873d4ca161ea7eb83fc52967b6cc67da05876cceab6
+  metadata.gz: 32d3af576e893be5c0c865d1ac14aa715451c65114611bf0a0ebf2f3df63c4505613920a8ddc25bfca70f0da83a6bc84ce91dfe8ffdb4060fb262cb353de89e5
+  data.tar.gz: 9f391f8ddf3d190b196c9831daefe014f7fed0f5954fcb327ee3471e7d185492d3b0f5975ed0c55814ee2c79f13c2c104a0c4ed3aafb737bcadcbc9c4acb5f16

data/lib/tinylinks/cli.rb

@@ -9,6 +9,7 @@ module Tinylinks
     end
 
     class_option :help, aliases: "-h", type: :boolean, desc: "Show help for a command"
+    class_option :no_color, type: :boolean, default: false, desc: "Disable color output"
 
     no_commands do
       def invoke_command(command, *args)
@@ -19,9 +20,9 @@ module Tinylinks
         super
       rescue Client::ApiError => e
         if e.body.is_a?(Hash) && e.body["errors"]
-          say_error formatter.errors(e.body)
+          say_error error_formatter.errors(e.body)
         else
-          say_error e.message
+          say_error error_colorizer.red(e.message)
         end
         exit 1
       end
@@ -45,7 +46,7 @@ module Tinylinks
       end
       say "Login successful!"
     rescue RuntimeError => e
-      say_error "Login failed: #{e.message}"
+      say_error error_colorizer.red("Login failed: #{e.message}")
       exit 1
     end
 
@@ -57,10 +58,16 @@ module Tinylinks
 
     desc "list", "List links"
     method_option :tags, type: :string, desc: "Filter by tags (comma-separated)"
+    method_option :filter, type: :string, enum: %w[visited unvisited],
+      desc: "Filter by visit status: visited or unvisited"
+    method_option :sort, type: :string, enum: %w[newest oldest most_visited least_visited],
+      desc: "Sort order: newest (default), oldest, most_visited, least_visited"
     method_option :page, type: :numeric, desc: "Page number"
     def list
       params = {}
       params[:tags] = options[:tags] if options[:tags]
+      params[:filter] = options[:filter] if options[:filter]
+      params[:sort] = options[:sort] if options[:sort]
       params[:page] = options[:page] if options[:page]
       data = client.get("/links", params)
       say formatter.link_list(data)
@@ -96,7 +103,7 @@ module Tinylinks
       body[:tags] = options[:tags].split(",").map(&:strip) if options[:tags]
 
       if body.empty?
-        say_error "No changes specified. Use --title, --description, or --tags."
+        say_error error_colorizer.red("No changes specified. Use --title, --description, or --tags.")
         exit 1
       end
 
@@ -142,7 +149,7 @@ module Tinylinks
       @client ||= begin
         token = Auth.new.token
         unless token
-          say_error "Not logged in. Run `tinylinks login` first."
+          say_error error_colorizer.red("Not logged in. Run `tinylinks login` first.")
           exit 1
         end
         Client.new(token: token)
@@ -150,11 +157,23 @@ module Tinylinks
     end
 
     def formatter
-      @formatter ||= Formatter.new
+      @formatter ||= Formatter.new(color: color_enabled?($stdout))
+    end
+
+    def error_formatter
+      @error_formatter ||= Formatter.new(color: color_enabled?($stderr))
+    end
+
+    def error_colorizer
+      @error_colorizer ||= Colorizer.new(enabled: color_enabled?($stderr))
     end
 
     def say_error(message)
       $stderr.puts message
     end
+
+    def color_enabled?(io)
+      !options[:no_color] && io.tty? && ENV["NO_COLOR"].nil?
+    end
   end
 end

data/lib/tinylinks/colorizer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Tinylinks
+  class Colorizer
+    def initialize(enabled: true)
+      @enabled = enabled
+    end
+
+    def bold(text)  = wrap(text, 1)
+    def dim(text)   = wrap(text, 2)
+    def red(text)   = wrap(text, 31)
+    def green(text) = wrap(text, 32)
+    def cyan(text)  = wrap(text, 36)
+
+    private
+
+    def wrap(text, code)
+      return text unless @enabled
+      "\e[#{code}m#{text}\e[0m"
+    end
+  end
+end

data/lib/tinylinks/formatter.rb

@@ -2,33 +2,60 @@
 
 module Tinylinks
   class Formatter
+    def initialize(color: false)
+      @c = Colorizer.new(enabled: color)
+    end
+
     def link(data)
       lines = []
-      lines << "#{data["title"] || "(untitled)"} [##{data["id"]}]"
-      lines << "  #{data["url"]}"
-      lines << "  #{data["description"]}" if data["description"] && !data["description"].empty?
-      lines << "  tags: #{data["tags"].join(", ")}" if data["tags"] && !data["tags"].empty?
+      lines << @c.bold("#{data["title"] || "(untitled)"} [##{data["id"]}]")
+      lines << "  #{@c.cyan(data["url"])}"
+      lines << "  #{@c.dim(data["description"])}" if data["description"] && !data["description"].empty?
+      meta = meta_line(data)
+      lines << "  #{meta}" if meta
       lines.join("\n")
     end
 
     def link_list(data)
+      return @c.dim("No results found") if data["links"].empty?
+
       lines = data["links"].map { |l| link(l) }
-      lines << pagination(data["meta"]) if data["meta"]
+      lines << @c.dim(pagination(data["meta"])) if data["meta"]
       lines.join("\n\n")
     end
 
     def tags(data)
-      data["tags"].map { |t| "#{t["name"]} (#{t["count"]})" }.join("\n")
+      return @c.dim("No results found") if data["tags"].empty?
+
+      data["tags"].map { |t| "#{@c.green(t["name"])} #{@c.dim("(#{t["count"]})")}" }.join("\n")
     end
 
     def errors(data)
       data["errors"].flat_map do |field, messages|
-        messages.map { |msg| "#{field} #{msg}" }
+        messages.map { |msg| @c.red("#{field} #{msg}") }
       end.join("\n")
     end
 
     private
 
+    def meta_line(data)
+      parts = []
+      parts << "tags: #{@c.green(data["tags"].join(", "))}" if data["tags"] && !data["tags"].empty?
+      if data.key?("visit_count") && !data["visit_count"].nil?
+        parts << @c.dim(visits_label(data["visit_count"]))
+      end
+      return if parts.empty?
+      parts.join(@c.dim(" · "))
+    end
+
+    def visits_label(count)
+      case count
+      when 0 then "never visited"
+      when 1 then "1 visit"
+      else "#{count} visits"
+      end
+    end
+
     def pagination(meta)
       "Page #{meta["page"]} of #{meta["total_pages"]} (#{meta["total_items"]} total)"
     end

data/lib/tinylinks.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Tinylinks
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
   BASE_URL = "https://links.pati.to"
   API_BASE = "#{BASE_URL}/api/v1"
 end
 
+require_relative "tinylinks/colorizer"
 require_relative "tinylinks/client"
 require_relative "tinylinks/auth"
 require_relative "tinylinks/formatter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinylinks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jaime Rodas
@@ -34,6 +34,7 @@ files:
 - lib/tinylinks/auth.rb
 - lib/tinylinks/cli.rb
 - lib/tinylinks/client.rb
+- lib/tinylinks/colorizer.rb
 - lib/tinylinks/formatter.rb
 homepage: https://github.com/jaimerodas/tinylinks-cli
 licenses:
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: CLI for TinyLinks
 test_files: []