jott 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1639bd8ac86e7f5ef1bfb9cf52fc49178a531c07b4af9f27d12458735a58286c
-  data.tar.gz: 3123edf823387da542d590cb9cebf2c894f9246092ba90ca952056b7c1c16831
+  metadata.gz: cbe57b0abd9bbab0015e3e3979403190e3747df1dbd4cbddfcaa6a5ecb9a31ee
+  data.tar.gz: a7240c6740a2fe368ef2ccba37d7c0c9a2fd78701da6b98532d6af906df921a3
 SHA512:
-  metadata.gz: fd829bbef8f58064e3146dfcdf5170b07d25fe385b0857e01bd1515a8b682f0e3f5b6f21b0141ad32e122117366b1382f23bfd1b452fbf961bf414955de59050
-  data.tar.gz: 3d5e921a5936491370bbb5f0c7eeaf722257c495b579365fc86979e57f858f8e18fec524e07c2eeaa361e362817e415c5094bf423f4b8bc49b748534bd4a62e6
+  metadata.gz: cdf341a7c114d92b80501cfafb8113a44fe6a21f0bb474861d70331d4be52796b8902b29c4906a5761699f2f3ab87dde37bbd8d7e8d0e4fe4bb66c2be7eea0dd
+  data.tar.gz: 2467e581e4058f9a07a9cdc6a8f8b459044560b7d1546df934848a399ff38b722c03c9dce999e5de512bdf0fb061040634dffa1bf207250e1a6e399cc77bd2b2

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile.lock

@@ -14,10 +14,10 @@ GEM
     diff-lcs (1.5.0)
     json (2.6.3)
     parallel (1.22.1)
-    parser (3.2.1.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -32,20 +32,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.48.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    sqlite3 (1.6.1-x86_64-linux)
+    sqlite3 (1.6.2-x86_64-linux)
     thor (1.2.1)
     unicode-display_width (2.4.2)
 

data/README.md

@@ -1,4 +1,9 @@
-# Jott
+![E8BFE9C9-1977-478D-92AD-5509D48835EC](https://user-images.githubusercontent.com/19267892/235329218-9b7d9721-9414-4341-8dd6-b91fe39d3204.png)
+
+
+[![Test](https://github.com/seita1996/jott/actions/workflows/test.yml/badge.svg)](https://github.com/seita1996/jott/actions/workflows/test.yml)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+![Gem](https://img.shields.io/gem/dt/jott?color=orange)
 
 A CLI application that allows you to create small memos.
 It can be installed as a Ruby Gem, and you can create, delete and display memos with the jott command.
@@ -14,7 +19,12 @@ $ gem install jott
 Create a new memo
 
 ```
-$ jott add 'This is first memo'
+$ jott add This is first memo
+
+or
+
+$ jott add
+-> open your editor
 ```
 
 List memos
@@ -23,6 +33,22 @@ List memos
 $ jott ls
 ```
 
+Edit the memo
+
+```
+$ jott edit 1 This is updated memo
+
+or
+
+$ jott edit 1
+-> open your editor
+
+or
+
+$ jott edit
+-> open your editor (last memo)
+```
+
 Delete the memo
 
 ```
@@ -35,6 +61,18 @@ Clear all memos
 $ jott clear
 ```
 
+Set the editor
+
+```
+$ jott set-editor vim
+```
+
+Check config
+
+```
+$ jott config
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/jott.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   # spec.description = "TODO: Write a longer description or delete this line."
   spec.homepage = "https://rubygems.org/gems/jott"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 3.1"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 

data/lib/jott/cli.rb

@@ -1,5 +1,7 @@
 require 'colorize'
+require 'tempfile'
 require 'thor'
+require_relative 'config'
 require_relative 'memo'
 require_relative 'version'
 
@@ -12,7 +14,15 @@ class CLI < Thor
   end
 
   desc "add", "Add a new memo"
-  def add(text)
+  def add(*str)
+    if str.empty? # open text editor
+      tempfile = Tempfile.new
+      system(editor, tempfile.path)
+      text = File.read(tempfile.path)
+      tempfile.unlink
+    else # add memo from command line
+      text = str.join(" ")
+    end
     title = text[0, 30]
     Memo.new.create(title:, body: text)
     puts "Added new memo: #{title}".colorize(:green)
@@ -24,6 +34,31 @@ class CLI < Thor
     puts "Deleted the memo: #{id}".colorize(:green)
   end
 
+  desc "edit", "open the memo with text editor and update"
+  def edit(*args)
+    id = args.first
+    id = Memo.new.last[0][0] if id.nil?
+    str = args[1..-1]
+    memo = Memo.new.find(id)
+
+    if str.nil? || str.empty? # open text editor
+      tempfile = Tempfile.new
+      File.open(tempfile.path, "w") do |f|
+        f.puts memo[0][2]
+      end
+      system(editor, tempfile.path)
+      data = File.read(tempfile.path)
+      Memo.new.update(id: id, title: data[0, 30], body: data)
+      tempfile.unlink
+      puts "Edited the memo: #{id}".colorize(:green)
+    else # add memo from command line
+      text = str.join(" ")
+      title = text[0, 30]
+      Memo.new.update(id: id, title: title, body: text)
+      puts "Edited the memo: #{id}".colorize(:green)
+    end
+  end
+
   desc "list", "list all memos"
   def ls
     memos = Memo.new.all
@@ -32,10 +67,33 @@ class CLI < Thor
     end
   end
 
+  desc "show", "show memo ID"
+  def show(id)
+    memo = Memo.new.find(id)
+    puts "#{memo[0][2]}"
+  end
+
+  desc "set-editor", "Set the default editor"
+  def set_editor(editor)
+    Config.new.set_editor(editor)
+    puts "Set editor: #{editor}".colorize(:green)
+  end
+
+  desc "config", "Show the current configuration"
+  def config
+    puts "editor: #{editor}"
+  end
+
   desc "version", "show version"
   def version
     puts "jott version #{Jott::VERSION}"
   end
+
+  private
+
+  def editor
+    Config.new.editor
+  end
 end
 
 CLI.start(ARGV)

data/lib/jott/config.rb

@@ -0,0 +1,30 @@
+class Config
+  attr_reader :editor
+
+  def initialize
+    @file_path = File.join("#{File.dirname(__FILE__)}", "jott.config")
+    unless File.exist?(@file_path)
+      File.new(@file_path, "w")
+    end
+    @editor = get_editor
+  end
+
+  def get_editor
+    File.open(@file_path, "r") do |file|
+      file.each_line do |line|
+        if line.include?("editor")
+          return line.split(":")[1].strip
+        else
+          return "vi"
+        end
+      end
+    end
+  end
+
+  def set_editor(editor)
+    File.open(@file_path, "w") do |file|
+      file.puts "editor: #{editor}"
+    end
+    @editor = editor
+  end
+end

data/lib/jott/memo.rb

@@ -19,6 +19,7 @@ class Memo
   end
 
   def create(title:, body:)
+    title = title.gsub(/\n/, "")
     @db.execute("INSERT INTO memos(title, body) VALUES (?, ?)", [title, body])
   end
 
@@ -26,7 +27,16 @@ class Memo
     @db.execute("DELETE FROM memos WHERE id = ?", id)
   end
 
+  def find(id)
+    @db.execute("SELECT * FROM memos WHERE id = ?", id)
+  end
+
   def last
     @db.execute("SELECT max(id), * FROM memos")
   end
+
+  def update(id:, title:, body:)
+    title = title.gsub(/\n/, "")
+    @db.execute("UPDATE memos SET title = ?, body = ? WHERE id = ?", [title, body, id])
+  end
 end

data/lib/jott/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jott
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jott
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - seita1996
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -91,6 +91,7 @@ files:
 - ".editorconfig"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -102,6 +103,7 @@ files:
 - jott.gemspec
 - lib/jott.rb
 - lib/jott/cli.rb
+- lib/jott/config.rb
 - lib/jott/memo.rb
 - lib/jott/version.rb
 - sig/jott.rbs
@@ -119,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: CLI application for a little note