nineteen_ninetynine 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5aed33e8c56b694e833f420ec1bdd7785ab715873ded1f97f8a4d1595dd976
-  data.tar.gz: c11198f5a0bd7992a64e363f034445dd4139c8a119ea8634a5fadf2fadde47f9
+  metadata.gz: cd4cf054fe4f43f913dc3fa062f9b2c62c1c83c150665b28c78fff9e71e09d23
+  data.tar.gz: 8fb116cb44eae5301f1e860acddf2ffc801eab82aa2057fd9872c24291fa9917
 SHA512:
-  metadata.gz: 718255d94b08fe308f1297e90d129fc6a4cd2480629fc46c3d62b31ac7c79c75758ad83fcb102bf778f4eeb83ecd324e97efbbf0a7463e20d5e9416168cf9a90
-  data.tar.gz: 42cdaf0db130b93cde2b9c5aa6cbee2c15781e2b65b915a9967ef2decddd700c83f0380555b99da0ea76bc432f395289baad914459ad6f8f9897a32f77b381d7
+  metadata.gz: 416ef2cf0289d38f2795604047ade18837a8ef8000fa310bc59f133a6ba54f5baff2d3f886bf8f6db4f4a78314937157c08107640abe0dde111df8ba9e707547
+  data.tar.gz: ddddd0b688b6448553e3114254d471ea92368e8b8e921fa3bda14580c5d51aa77316a1550f5106afc972570a5e7468fc5859405ac18a100b1f7f2646ebaf87e2

data/README.md

@@ -1,24 +1,34 @@
 # NineteenNinetynine
 
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/nineteen_ninetynine`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+```
+gem install nineteen_ninetynine
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+nineteen_ninetynine
+```
+
+You can display icon images by installing `imgcat` or `wezterm imgcat`, `img2sixel`.
+
+## TODO
+
+- [ ] Specify relay server url from environment variable
+- [ ] Test!(more test!)
+- [ ] Debug mode
+- [ ] Expand the image on the terminal
+- [ ] Expand the URL(OGP) on the terminal
+- [ ] Write event
+- [ ] Implementation `:show {event,user} $aa` command
+- [ ] Implementation `:replay $aa` command
+- [ ] Implementation of user name suggestions
+- [ ] Add alternative `nineteen_ninetynine` command (`$ 1999`)
+- [ ] Implementation for reconnecting to the relay server
+- [ ] Implementation for some options
 
 ## Development
 

data/lib/nineteen_ninetynine/core.rb

@@ -69,6 +69,15 @@ module NineteenNinetynine
       @last_data_received_at = time
     end
 
+    def error(e)
+      case e
+      when Exception
+        insert "[ERROR] #{e.message}\n    #{e.backtrace.join("\n    ")}".c(:notice)
+      else
+        insert "[ERROR] #{e}".c(:notice)
+      end
+    end
+
     def start_stream
       users = create_users
       notes = create_notes

data/lib/nineteen_ninetynine/event/profile.rb

@@ -37,10 +37,6 @@ module NineteenNinetynine
         "#{XDG_CONFIG_DIR}/icons"
       end
 
-      def icon
-        `wezterm imgcat --height 1 #{@icon_path}`.strip
-      end
-
       def download_icon_image
         if @picture_url.start_with?("data:image/")
           File.write(icon_path, Base64.decode64(@picture_url.split(",")[1]))
@@ -57,7 +53,7 @@ module NineteenNinetynine
             puts "unknown"
             puts @picture_url
           end
-        rescue SocketError, Net::OpenTimeout => e
+        rescue SocketError, Net::OpenTimeout, OpenSSL::SSL::SSLError => e
           # ignore
         end
         else

data/lib/nineteen_ninetynine/img2cat.rb

@@ -0,0 +1,18 @@
+module NineteenNinetynine
+  module Img2cat
+    def executable_img2cat_command
+      @executable_img2cat_command ||= nil
+    end
+
+    def determine_img2cat_command
+      # TODO: use exit code, supressess STDOUT
+      if system("which", "wezterm")
+        @executable_img2cat_command = "wezterm imgcat"
+      elsif system("which", "imgcat")
+        @executable_img2cat_command = "imgcat"
+      elsif system("which", "img2sixel")
+        @executable_img2cat_command = "img2sixel"
+      end
+    end
+  end
+end

data/lib/nineteen_ninetynine/utils.rb

@@ -2,7 +2,6 @@ require 'bech32'
 
 module NineteenNinetynine
   module Utils
-
     def self.scripted_pubkey(pubkey)
       addr = CustomAddr.new(pubkey)
       addr.to_scriptpubkey

data/lib/nineteen_ninetynine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NineteenNinetynine
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/nineteen_ninetynine.rb

@@ -6,6 +6,7 @@ require_relative "nineteen_ninetynine/core"
 require_relative "nineteen_ninetynine/ext"
 require_relative "nineteen_ninetynine/renderer"
 require_relative "nineteen_ninetynine/id_var"
+require_relative "nineteen_ninetynine/img2cat"
 require_relative "nineteen_ninetynine/initializer"
 require_relative "nineteen_ninetynine/output"
 require_relative "nineteen_ninetynine/subscriber"
@@ -31,6 +32,7 @@ module NineteenNinetynine
   extend Renderer
   extend Output
   extend IdVar
+  extend Img2cat
 
   User = Data.define :name, :pubkey
 
@@ -42,10 +44,11 @@ module NineteenNinetynine
   unless Dir.exist?(XDG_CONFIG_DIR)
     FileUtils.mkdir_p(XDG_CONFIG_DIR)
     FileUtils.mkdir_p(XDG_CONFIG_DIR + "/icons")
-    FileUtils.cp(File.dirname(__FILE__) + "../assets/default.png", XDG_CONFIG_DIR + "/icons/default.png")
   end
+  FileUtils.cp(File.dirname(__FILE__) + "/assets/default.png", XDG_CONFIG_DIR + "/icons/default.png")
 
   init do
+    determine_img2cat_command
     self.id_var ||= IdVar::Gen.new
     outputs.clear
     output_filters.clear
@@ -70,7 +73,7 @@ module NineteenNinetynine
 
       if /\n/ =~ text
         text.prepend("\n")
-        text.gsub!(/\n/, "\n       " + "|".c(:info))
+        text.gsub!(/\n/, "\n          " + "|".c(:info))
         text << "\n      "
       else
         text.gsub!(/\s+/, ' ')
@@ -98,11 +101,12 @@ module NineteenNinetynine
       # end
 
       mark = item._mark || ""
+      icon = `#{@executable_img2cat_command} --height 1 #{item.user.icon_path}`.strip
 
       status = [
         item.date.strftime("%H:%M").c(:info),
         mark + id.c(:info),
-        "#{item.user.icon}#{item.user.name.c(color_of(item.user.name))}:",
+        "#{icon}#{item.user.name.c(color_of(item.user.name))}:",
         text,
         info.join(' - ').c(:info),
       ].compact.join(" ")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nineteen_ninetynine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuya Fujiwara
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,7 @@ files:
 - lib/nineteen_ninetynine/event/profile.rb
 - lib/nineteen_ninetynine/ext.rb
 - lib/nineteen_ninetynine/id_var.rb
+- lib/nineteen_ninetynine/img2cat.rb
 - lib/nineteen_ninetynine/initializer.rb
 - lib/nineteen_ninetynine/output.rb
 - lib/nineteen_ninetynine/renderer.rb
@@ -92,7 +93,7 @@ metadata:
   homepage_uri: https://ason.as
   source_code_uri: https://github.com/asonas/nineteen_ninetynine
   changelog_uri: https://github.com/asonas/nineteen_ninetynine
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: nineteen_ninetynine is nostr client
 test_files: []