From nobody Sun Jan 15 03:14:00 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NvgGx0tgBz2scbJ; Sun, 15 Jan 2023 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NvgGx0NYDz3q1v; Sun, 15 Jan 2023 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673752441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTWuhYjUXwLjK8nURls8qBfp9WkR/ijI8EKLDGVnQ98=; b=nce7W3BJdwd3+5VNz/grECsG6/qh0qhXnrqp59zdzoGw9VzD+4XbekKP/wtKJwOPpSNPE/ VlfL94/zMqGgZ0PbFwSSAFFQtZO7infGgbU9Y+3hvIZDcWgqSdkjPauGYKaJpTOAH6oHek QkQaXET88UeXh/nb7FMyFtYTdOuCyPPtjPZFZvdWbjQCx5QR/OOaD6kYPq6Y13CBF0hYxW isiJmVQxsCWy39G7U38pU2FlUg8VfeRZeec+9xEvFH565pGwMIRqxYczzPIGquTVj6pPUv LbofWRLAi5wHNp/0Jeq8lI320KKV4HUZxj1zlmfM0U+bFve/okcx8B1jLqwkHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673752441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTWuhYjUXwLjK8nURls8qBfp9WkR/ijI8EKLDGVnQ98=; b=NOZ4aWu+FSYCPGp7sS+O1y5SGYHOzZd0qH4Qtnj7VadsNvqlXTJH/ZwzeV2aj+SirCsbgC 9XkBhvajDkmTumS+SXEyreg/QGMyeKUQbwT5ZH9hvFOrG00HnotjEeS9C+3LHQ8iHiZaWJ zyhN71Kcey1tqgHFn1w9ZJppi7xPplt5LkW9AInAyvGFgmXsm/7svIdqlmNhccA+Xyduqn v0Uwju+XrBFPA60COCw512N0fTVvszxRnnZKDwX/cJJzhkRa1OGjAJaZOTIj9ojblBZHBS hN5T9m3l2H7qB6qpG4ZuwIYVDBh0riR2K/af5NrjCEPMbcGX3TD8S4fYUH4lhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673752441; a=rsa-sha256; cv=none; b=rAKnrEGbQt1JRR7dwU5o0dI1g69Trpv/rbRduWkFVHXq+9m8hmxnQvY/fPlRpQWbymEWyc HztJOyoyogf/kGVVuu9GIjdI5i8wODFgfiNIpgAf2FTJfiV2Bp0/k2MMDxY+0HtFrrd+R2 i5gkBQP5plDkROFFKum5qSsneS9yNE2LxZOkAz05JFur3K0ibULIGFhPMITXpZ+uFTvJPO K5lQ+5LW2nR4P0QNEFVcA01O80g15f0yzs7dlKPcZFv9UlmJNoMjXUsE7l8gKQIdGI20Tp vR86yO61Uh7Rnt2XATYFDA+DcRRCBeZedyEud+54I4/Ch5dph2k1ZGHTgLp5aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NvgGw6Z4cz1Bx9; Sun, 15 Jan 2023 03:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30F3E0ld014401; Sun, 15 Jan 2023 03:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30F3E0rn014400; Sun, 15 Jan 2023 03:14:00 GMT (envelope-from git) Date: Sun, 15 Jan 2023 03:14:00 GMT Message-Id: <202301150314.30F3E0rn014400@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 1c0f318b7613 - main - misc/json-tui: New port: JSON terminal UI made in C++ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c0f318b761394f2ee0ea17bb6df7124f901ae47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c0f318b761394f2ee0ea17bb6df7124f901ae47 commit 1c0f318b761394f2ee0ea17bb6df7124f901ae47 Author: Yuri Victorovich AuthorDate: 2023-01-15 02:00:55 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-15 03:13:58 +0000 misc/json-tui: New port: JSON terminal UI made in C++ --- misc/Makefile | 1 + misc/json-tui/Makefile | 25 ++++++++ misc/json-tui/distinfo | 3 + misc/json-tui/files/patch-CMakeLists.txt | 97 ++++++++++++++++++++++++++++++++ misc/json-tui/pkg-descr | 12 ++++ 5 files changed, 138 insertions(+) diff --git a/misc/Makefile b/misc/Makefile index 6603fa0ecfe4..33e6f49aa1db 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -195,6 +195,7 @@ SUBDIR += jargon SUBDIR += jbidwatcher SUBDIR += jojodiff + SUBDIR += json-tui SUBDIR += kbdscan SUBDIR += kcd SUBDIR += kde-thumbnailer-chm diff --git a/misc/json-tui/Makefile b/misc/json-tui/Makefile new file mode 100644 index 000000000000..619a95e04ce3 --- /dev/null +++ b/misc/json-tui/Makefile @@ -0,0 +1,25 @@ +PORTNAME= json-tui +DISTVERSIONPREFIX= v +DISTVERSION= 1.3.0-13 +DISTVERSIONSUFFIX= -g6b38aba +CATEGORIES= misc + +MAINTAINER= yuri@FreeBSD.org +COMMENT= JSON terminal UI made in C++ +WWW= https://github.com/ArthurSonzogni/json-tui + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= args>0:devel/args \ + nlohmann-json>0:devel/nlohmann-json +LIB_DEPENDS= libftxui-component.so:devel/ftxui + +USES= cmake compiler:c++20-lang + +USE_GITHUB= yes +GH_ACCOUNT= ArthurSonzogni + +PLIST_FILES= bin/json-tui + +.include diff --git a/misc/json-tui/distinfo b/misc/json-tui/distinfo new file mode 100644 index 000000000000..2603f6e7c10f --- /dev/null +++ b/misc/json-tui/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1673746734 +SHA256 (ArthurSonzogni-json-tui-v1.3.0-13-g6b38aba_GH0.tar.gz) = dd7f9af11d9cf43418aad4ef79c3cf45c25565ddee6167423c14cc5b11e6df31 +SIZE (ArthurSonzogni-json-tui-v1.3.0-13-g6b38aba_GH0.tar.gz) = 353029 diff --git a/misc/json-tui/files/patch-CMakeLists.txt b/misc/json-tui/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..afefde952465 --- /dev/null +++ b/misc/json-tui/files/patch-CMakeLists.txt @@ -0,0 +1,97 @@ +--- CMakeLists.txt.orig 2023-01-15 01:39:31 UTC ++++ CMakeLists.txt +@@ -1,47 +1,53 @@ + cmake_minimum_required (VERSION 3.11) + ++enable_language(CXX) ++ + # Dependencies ----------------------------------------------------------------- + +-include(FetchContent) +-set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE) +-set(FETCHCONTENT_QUIET FALSE) ++#include(FetchContent) ++#set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE) ++#set(FETCHCONTENT_QUIET FALSE) + +-FetchContent_Declare(ftxui +- GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui +- GIT_TAG b56afce48ccd472cd2c3a53e619de0db1e7227a4 +- GIT_PROGRESS TRUE +- GIT_SHALLOW FALSE +-) ++#FetchContent_Declare(ftxui ++# GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui ++# GIT_TAG b56afce48ccd472cd2c3a53e619de0db1e7227a4 ++# GIT_PROGRESS TRUE ++# GIT_SHALLOW FALSE ++#) + +-FetchContent_Declare(json +- URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz +-) ++#FetchContent_Declare(json ++# URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz ++#) + +-FetchContent_Declare(args +- GIT_REPOSITORY https://github.com/Taywee/args +- GIT_TAG a48e1f880813b367d2354963a58dedbf2b708584 +- GIT_PROGRESS TRUE +- GIT_SHALLOW FALSE +-) ++#FetchContent_Declare(args ++# GIT_REPOSITORY https://github.com/Taywee/args ++# GIT_TAG a48e1f880813b367d2354963a58dedbf2b708584 ++# GIT_PROGRESS TRUE ++# GIT_SHALLOW FALSE ++#) + +-FetchContent_GetProperties(ftxui) +-if(NOT ftxui_POPULATED) +- FetchContent_Populate(ftxui) +- add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL) +-endif() ++#FetchContent_GetProperties(ftxui) ++#if(NOT ftxui_POPULATED) ++# FetchContent_Populate(ftxui) ++# add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL) ++#endif() + +-FetchContent_GetProperties(json) +-if(NOT json_POPULATED) +- FetchContent_Populate(json) +- add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL) +-endif() ++#FetchContent_GetProperties(json) ++#if(NOT json_POPULATED) ++# FetchContent_Populate(json) ++# add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL) ++#endif() + +-FetchContent_GetProperties(args) +-if(NOT args_POPULATED) +- FetchContent_Populate(args) +- add_subdirectory(${args_SOURCE_DIR} ${args_BINARY_DIR} EXCLUDE_FROM_ALL) +-endif() ++#FetchContent_GetProperties(args) ++#if(NOT args_POPULATED) ++# FetchContent_Populate(args) ++# add_subdirectory(${args_SOURCE_DIR} ${args_BINARY_DIR} EXCLUDE_FROM_ALL) ++#endif() + ++find_package(args REQUIRED) ++find_package(ftxui REQUIRED) ++find_package(nlohmann_json REQUIRED) ++ + # Build ------------------------------------------------------------------------ + + configure_file( +@@ -83,7 +89,6 @@ target_link_libraries(json-tui-lib + + target_link_libraries(json-tui + PRIVATE json-tui-lib +- PRIVATE args + ) + + include(cmake/options.cmake) diff --git a/misc/json-tui/pkg-descr b/misc/json-tui/pkg-descr new file mode 100644 index 000000000000..d552040289ab --- /dev/null +++ b/misc/json-tui/pkg-descr @@ -0,0 +1,12 @@ +json-tui is a JSON terminal UI made in C++. + +Features: +* Interactive: Use keyboard or mouse to scroll/expand objects. +* Colors +* Responsive: Adapt to the terminal dimensions. Very long text values are + wrapped on several lines. +* Cross-platform +* The output is displayed inline with the previous commands. Meaning you can + still see the json after leaving json-tui. +* (Vim users): Also support j/k for navigation. +* Table view: Turn arrays of objects into tables.