tsks 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ac100edb1bd020860d7f8a63a58e2cca619f8c6c1775db4e9f5d84b5a864ad
-  data.tar.gz: e1e564b30cfb1f4cbe3969dc9b761c13734374a8ee9623818e9d92efd5769f9f
+  metadata.gz: eba37aa1a580178be1d1a37dfa7aac67ee5d133b047a53b186be514ff047b8f4
+  data.tar.gz: 6cf976319e8e70cab7dab0529d3c34cfea6428eb559d03ca1f0115d5e296af1a
 SHA512:
-  metadata.gz: a57c235a7aef701d2a8537f0449213466c905d7432696eb15cdce666270943b1fcf7681613480aa8fece0815962f777ede0f3f81918ddb9b173ccc69ae6a022b
-  data.tar.gz: fed3ec9a4952c847d14c004092de4db6d30d1de4d1b06bfc095b86e4d9aa84ba8b621d2e0f3c9d30658f2f4d4dfcf8beca057c0a457137b82f5354f8f0ead3da
+  metadata.gz: 8b1e46d8649e769ad5d74e0c0f46628f15cf725faf96838d446afaf9cc5eafa2c25abbab5ab8e7bbb306ac240df42b3d3e58e7fea8fc1712517972a09092af77
+  data.tar.gz: 95c1406756b470b2417e3615937ccad9bc3b2ff9622f1e63e8098c6ad55e8d19f80d244d75466627704f997f742d401423588494bf837ee0efec80ce102af409

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tsks (0.0.14)
+    tsks (0.0.16)
       httparty
       sqlite3
       thor

data/README.md

@@ -1,7 +1,5 @@
 # tsks
 
-[![build](https://dl.circleci.com/status-badge/img/gh/luanrv/tsks-cli/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/luanrv/tsks-cli/tree/main)
-
 A stateful command line interface to help you handle your daily tsks (with
 synchronisation and contexts!).
 

data/bin/build

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -euo pipefail
+bundle exec rake build

data/lib/tsks/actions.rb

@@ -6,12 +6,12 @@ module Tsks
       current_tsks = Tsks::Storage.select_all
 
       for tsk in current_tsks
-        Tsks::Storage.update tsk[:local_id], {user_id: user_id}
+        Tsks::Storage.update_by({rowid: tsk[:rowid]}, {user_id: user_id})
       end
     end
 
     def self.update_server_for_removed_tsks token
-      tsks_uuids = Tsks::Storage.select_removed_uuids
+      tsks_uuids = Tsks::Storage.select_removed_tsk_ids
 
       if !tsks_uuids.empty?
         for id in tsks_uuids

data/lib/tsks/cli.rb

@@ -84,7 +84,7 @@ module Tsks
       if tsks.count > 0
         for tsk in tsks
           tsk_status = Tsks::Actions.get_tsk_status tsk[:status]
-          puts "#{tsk[:id]} #{tsk_status} | #{tsk[:tsk]} @#{tsk[:context]}"
+          puts "#{tsk[:id]} | #{tsk_status} #{tsk[:tsk]} @#{tsk[:context]}"
         end
       else
         puts "no tsks found."
@@ -159,8 +159,8 @@ module Tsks
       token = File.read File.join CLI.setup_folder, "token"
       Tsks::Actions.update_tsks_with_user_id user_id
       Tsks::Actions.update_server_for_removed_tsks token
-      Tsks::Storage.delete_removed_uuids
-      local_tsks = Tsks::Storage.select_all local_id=false
+      Tsks::Storage.delete_removed_tsk_ids
+      local_tsks = Tsks::Storage.select_all
 
       begin
         get_res = Tsks::Request.get "/tsks", token
@@ -168,26 +168,33 @@ module Tsks
 
         if get_res[:tsks]
           if get_res[:ok] == true
-            local_tsks_to_post = local_tsks - remote_tsks
+            raw_local_tsks = local_tsks.map {|t| t.reject{|k,_| k == :rowid}}
+            local_tsks_to_post = raw_local_tsks - remote_tsks
+
+            tsks_to_post = []
+            for local_tsk in local_tsks
+              for local_tsk_to_post in local_tsks_to_post
+                if local_tsk[:tsk] == local_tsk_to_post[:tsk]
+                  tsks_to_post.append local_tsk
+                end
+              end
+            end
 
-            if local_tsks_to_post.count > 0
-              for tsk in local_tsks_to_post
+            if tsks_to_post.count > 0
+              for tsk in tsks_to_post
                 post_res = Tsks::Request.post "/tsks", token, {tsk: tsk}
                 posted_tsk = post_res[:tsk]
 
                 if posted_tsk
-                  # TODO: write tests for Storage.select_local_id
-                  tsk_local_id = Tsks::Storage.select_local_id({tsk: posted_tsk[:tsk],
-                                                                created_at: posted_tsk[:created_at],
-                                                                updated_at: posted_tsk[:updated_at]})
-
-                  Tsks::Storage.update tsk_local_id, {id: posted_tsk[:id]}
+                  Tsks::Storage.update_by({rowid: tsk[:rowid]}, {id: posted_tsk[:id]})
                 end
               end
             end
 
-            updated_local_tsks = Tsks::Storage.select_all local_id=false
-            remote_tsks_to_storage = remote_tsks - updated_local_tsks
+            # TODO: review this process
+            updated_local_tsks = Tsks::Storage.select_all
+            raw_updated_local_tsks = updated_local_tsks.map {|t| t.reject{|k,_| k == :rowid}}
+            remote_tsks_to_storage = remote_tsks - raw_updated_local_tsks
 
             if remote_tsks_to_storage.count > 0
               Tsks::Storage.insert_many remote_tsks_to_storage

data/lib/tsks/storage.rb

@@ -1,5 +1,4 @@
 require "sqlite3"
-require "uuid"
 
 module Tsks
   class Storage
@@ -7,8 +6,8 @@ module Tsks
       storage = get_storage_instance
       storage.execute <<-SQL
         CREATE TABLE tsks (
-          id VARCHAR PRIMARY KEY UNIQUE,
-          user_id INTEGER DEFAULT 1,
+          id INTEGER PRIMARY KEY UNIQUE,
+          user_id INTEGER DEFAULT 0,
           tsk VARCHAR NOT NULL,
           status VARCHAR DEFAULT todo,
           context VARCHAR DEFAULT inbox,
@@ -19,7 +18,7 @@ module Tsks
 
       storage.execute <<-SQL
         CREATE TABLE removed_tsks (
-          tsk_id VARCHAR UNIQUE NOT NULL
+          tsk_id INTEGER UNIQUE NOT NULL
         )
       SQL
     end
@@ -62,7 +61,7 @@ module Tsks
       end
     end
 
-    def self.update local_id, params=nil
+    def self.update tsk_id, params=nil
       storage = get_storage_instance
 
       if params && params.count == 1
@@ -73,13 +72,24 @@ module Tsks
         storage.execute(
           "UPDATE tsks SET " \
           "#{params.keys.first}=? " \
-          "WHERE rowid=?",
-          [params.values.first, local_id])
+          "WHERE id=?",
+          [params.values.first, tsk_id])
       else
-        storage.execute "UPDATE tsks SET status='done' WHERE rowid=?", local_id
+        storage.execute "UPDATE tsks SET status='done' WHERE id=?", tsk_id
       end
     end
 
+    # TODO: write tests
+    def self.update_by tsk_params, params=nil
+      storage = get_storage_instance
+
+      storage.execute(
+        "UPDATE tsks SET " \
+        "#{params.keys.first}=? " \
+        "WHERE #{tsk_params.keys.first}=?",
+        [params.values.first, tsk_params.values.first])
+    end
+
     def self.select_by params
       storage = get_storage_instance
 
@@ -100,23 +110,10 @@ module Tsks
       tsks = structure_tsks raw_tsks
     end
 
-    # TODO: write tests for Storage.select_local_id
-    def self.select_local_id params
-      storage = get_storage_instance
-
-      tsk = storage.execute(
-        "SELECT rowid, * FROM tsks WHERE #{params.keys.first}=? AND #{params.keys[1]}=? AND #{params.keys.last}=?",
-        params.values.first, params.values[1], params.values.last)
-
-      tsk_local_id = tsk[0][0]
-    end
-
-    def self.select_all local_id=true
+    def self.select_all
       storage = get_storage_instance
-      raw_tsks = local_id ?
-        storage.execute("SELECT rowid, * FROM tsks") :
-        storage.execute("SELECT * FROM tsks")
-      tsks = structure_tsks(raw_tsks, local_id=local_id)
+      raw_tsks = storage.execute("SELECT rowid, * FROM tsks")
+      tsks = structure_tsks raw_tsks
     end
 
     def self.select_active
@@ -125,17 +122,18 @@ module Tsks
       tsks = structure_tsks raw_tsks
     end
 
-    def self.delete local_id
+    def self.delete tsk_id
       storage = get_storage_instance
-      removed_tsks = storage.execute("SELECT * FROM tsks WHERE rowid=?", local_id)
+      removed_tsks = storage.execute("SELECT * FROM tsks WHERE id=?", tsk_id)
+
       if removed_tsks.empty?
         return false
       end
       storage.execute("INSERT INTO removed_tsks (tsk_id) VALUES (?)", removed_tsks[0][0])
-      storage.execute("DELETE FROM tsks WHERE rowid=?", local_id)
+      storage.execute("DELETE FROM tsks WHERE id=?", tsk_id)
     end
 
-    def self.select_removed_uuids
+    def self.select_removed_tsk_ids
       storage = get_storage_instance
       result = storage.execute("SELECT * FROM removed_tsks")
 
@@ -146,7 +144,7 @@ module Tsks
       return tsk_ids
     end
 
-    def self.delete_removed_uuids
+    def self.delete_removed_tsk_ids
       storage = get_storage_instance
       storage.execute("DELETE FROM removed_tsks")
     end
@@ -157,30 +155,19 @@ module Tsks
       SQLite3::Database.new File.join CLI.setup_folder, "tsks.db"
     end
 
-    def self.structure_tsks tsks, local_id=true
+    def self.structure_tsks tsks
       structured_tsks = []
 
       for tsk in tsks
         t = {}
-
-        if local_id
-           t[:local_id] = tsk[0]
-           t[:id] = tsk[1]
-           t[:user_id] = tsk[2]
-           t[:tsk] = tsk[3]
-           t[:status] = tsk[4]
-           t[:context] = tsk[5]
-           t[:created_at] = tsk[6]
-           t[:updated_at] = tsk[7]
-        else
-           t[:id] = tsk[0]
-           t[:user_id] = tsk[1]
-           t[:tsk] = tsk[2]
-           t[:status] = tsk[3]
-           t[:context] = tsk[4]
-           t[:created_at] = tsk[5]
-           t[:updated_at] = tsk[6]
-        end
+        t[:rowid] = tsk[0]
+        t[:id] = tsk[1]
+        t[:user_id] = tsk[2]
+        t[:tsk] = tsk[3]
+        t[:status] = tsk[4]
+        t[:context] = tsk[5]
+        t[:created_at] = tsk[6]
+        t[:updated_at] = tsk[7]
 
         structured_tsks.append t
       end

data/lib/tsks/version.rb

@@ -1,3 +1,3 @@
 module Tsks
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Luan Ramos Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,11 +92,11 @@ files:
 - ".env.sample"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/build
 - bin/console
 - bin/install
 - bin/release

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.1.4