tsks 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115b558183b18b7ec4798910dfd43d4db49ab4448c94e21aaf9b7097e8dab7dc
-  data.tar.gz: 9f6afae532b9c8b210e3fcb0ea4173ca3b7dc27996eddfd75ebd0b390b022c37
+  metadata.gz: b586fc95fb2c8a9eb61946e455e3f506072f21c0253fae9a501a089942399a8e
+  data.tar.gz: 43a9e769270960a9632794b42489d87f638289981ad4ceb1eaf1964ff3860479
 SHA512:
-  metadata.gz: 94f4083f6f032a6c69fad18afaf27568eab7e453bdc25c4095e57a9c420ff2dc74801a920ae1165e3019d0438b9d34a2325af392333d34846b1839180e92203e
-  data.tar.gz: b5346d0dc286f2cc298388a2ddc8e41a4ec3a1764f77a79241dacff6a9d1ce53545c342df4d850d50ced47f588f93e2513dc61fc47e29accd8aacc21002bc27f
+  metadata.gz: 8c9e0dc7955ba274db1b86258ea7ff25770dab13e77929419a2f907b982161f55b736489e68a38292dba858abb64f7309a3ff6c47de691e6585406e20188f8a2
+  data.tar.gz: 14a1fb179964c41fb4375d1ea0ab94371ae591c9473147223677e82e04f7daaf9617a9813b37c9c8adce32d8fd9cb6ca721338ab0679802d17e906d07cea53d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tsks (0.0.13)
+    tsks (0.0.15)
       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/lib/tsks/actions.rb

@@ -6,7 +6,7 @@ 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
 

data/lib/tsks/cli.rb

@@ -6,6 +6,7 @@ require "tsks/actions"
 
 module Tsks
   class CLI < Thor
+    # @setup_folder = File.expand_path "~/.tsks_tmp"
     @setup_folder = File.expand_path "~/.tsks"
 
     def self.setup_folder
@@ -83,7 +84,7 @@ module Tsks
       if tsks.count > 0
         for tsk in tsks
           tsk_status = Tsks::Actions.get_tsk_status tsk[:status]
-          puts "#{tsk_status} | #{tsk[:local_id]} #{tsk[:tsk]} @#{tsk[:context]}"
+          puts "#{tsk[:id]} | #{tsk_status} #{tsk[:tsk]} @#{tsk[:context]}"
         end
       else
         puts "no tsks found."
@@ -158,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
@@ -175,17 +176,13 @@ module Tsks
                 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
+            # TODO: review this process
+            updated_local_tsks = Tsks::Storage.select_all
             remote_tsks_to_storage = remote_tsks - updated_local_tsks
 
             if remote_tsks_to_storage.count > 0

data/lib/tsks/request.rb

@@ -2,7 +2,8 @@ require "httparty"
 
 module Tsks
   class Request
-    @base_uri = "https://tsks-api.onrender.com/v1"
+    @base_uri = "http://localhost:5000/v1"
+    #@base_uri = "https://tsks-api.onrender.com/v1"
 
     def self.base_uri
       @base_uri

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.13"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Luan Ramos Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,7 +92,6 @@ files:
 - ".env.sample"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md

data/.travis.yml

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