tsks 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5642476a95ebd615e61b0461eb61f2ea9a3408d249b3a85ba1ea2e028427badc
-  data.tar.gz: 65e8fea2affb40c031b86aed5db037426eacf8d953deaf8f13a7a3b2d0d633bf
+  metadata.gz: 115b558183b18b7ec4798910dfd43d4db49ab4448c94e21aaf9b7097e8dab7dc
+  data.tar.gz: 9f6afae532b9c8b210e3fcb0ea4173ca3b7dc27996eddfd75ebd0b390b022c37
 SHA512:
-  metadata.gz: 1f6093f9d0a12c050e0384d316dfbf388ef39c4eb2b02cb3677e5b468f9ff71f8cafb85b937aed67c3cabbf9bb026931b5d84fe762759fd0bb3f798d8a643beb
-  data.tar.gz: 1287812074eab7b75d580be496b52d34c915505b45a8b7c6254e3135939a02e89295893b34a625a62cde190ab48d685fbb3e52ae0da807ba4b8838b76f3b3db5
+  metadata.gz: 94f4083f6f032a6c69fad18afaf27568eab7e453bdc25c4095e57a9c420ff2dc74801a920ae1165e3019d0438b9d34a2325af392333d34846b1839180e92203e
+  data.tar.gz: b5346d0dc286f2cc298388a2ddc8e41a4ec3a1764f77a79241dacff6a9d1ce53545c342df4d850d50ced47f588f93e2513dc61fc47e29accd8aacc21002bc27f

data/Gemfile.lock

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

data/lib/tsks/cli.rb

@@ -31,7 +31,7 @@ module Tsks
       Tsks::Storage.init
     end
 
-    desc "add TSK", "add a new tsk (Use --context to specify one e.g. Work)"
+    desc "add TSK", "add a new tsk (Use --context to specify one e.g. --context=work)"
     option :context
     def add tsk
       if !File.directory? CLI.setup_folder
@@ -45,7 +45,7 @@ module Tsks
       end
     end
 
-    desc "done ID", "mark a tsk you have already done"
+    desc "done ID", "mark a tsk you have done"
     def done id
       if !File.directory? CLI.setup_folder
         return puts "tsks was not initialized yet."
@@ -59,6 +59,7 @@ module Tsks
 
     desc "list", "see all active tsks, filter by context or that are done"
     option :done, type: :boolean
+    option :all, type: :boolean
     option :context
     def list
       if !File.directory? CLI.setup_folder
@@ -73,6 +74,8 @@ module Tsks
         tsks = Tsks::Storage.select_by({status: 'done'})
       elsif options[:context]
         tsks = Tsks::Storage.select_by({context: options[:context]})
+      elsif options[:all]
+        tsks = Tsks::Storage.select_all
       else
         tsks = Tsks::Storage.select_active
       end
@@ -158,25 +161,33 @@ module Tsks
       Tsks::Storage.delete_removed_uuids
       local_tsks = Tsks::Storage.select_all local_id=false
 
-      remote_tsks = []
       begin
         get_res = Tsks::Request.get "/tsks", token
-        if get_res[:tsks]
-          for tsk in get_res[:tsks]
-            tsk[:created_at] = Time.parse(tsk[:created_at]).strftime "%F %T"
-            tsk[:updated_at] = Time.parse(tsk[:updated_at]).strftime "%F %T"
-            remote_tsks.append tsk
-          end
+        remote_tsks = get_res[:tsks]
 
+        if get_res[:tsks]
           if get_res[:ok] == true
             local_tsks_to_post = local_tsks - remote_tsks
+
             if local_tsks_to_post.count > 0
               for tsk in local_tsks_to_post
-                Tsks::Request.post "/tsks", token, {tsk: tsk}
+                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]}
+                end
               end
             end
 
-            remote_tsks_to_storage = remote_tsks - local_tsks
+            updated_local_tsks = Tsks::Storage.select_all local_id=false
+            remote_tsks_to_storage = remote_tsks - updated_local_tsks
+
             if remote_tsks_to_storage.count > 0
               Tsks::Storage.insert_many remote_tsks_to_storage
             end

data/lib/tsks/storage.rb

@@ -7,7 +7,7 @@ module Tsks
       storage = get_storage_instance
       storage.execute <<-SQL
         CREATE TABLE tsks (
-          id VARCHAR PRIMARY KEY UNIQUE NOT NULL,
+          id VARCHAR PRIMARY KEY UNIQUE,
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
           status VARCHAR DEFAULT todo,
@@ -19,27 +19,26 @@ module Tsks
 
       storage.execute <<-SQL
         CREATE TABLE removed_tsks (
-          tsk_uuid VARCHAR UNIQUE NOT NULL
+          tsk_id VARCHAR UNIQUE NOT NULL
         )
       SQL
     end
 
     def self.insert tsk, ctx=nil
       storage = get_storage_instance
-      now = Time.now.strftime "%F %T"
-      uuid = UUID.new.generate
+      now = Time.now.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
 
       if ctx
         storage.execute("
-          INSERT INTO tsks (id, tsk, status, context, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?)",
-          [uuid, tsk, 'todo', ctx, now, now]
+          INSERT INTO tsks (tsk, status, context, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)",
+          [tsk, 'todo', ctx, now, now]
          )
       else
         storage.execute("
-          INSERT INTO tsks (id, tsk, status, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?)",
-          [uuid, tsk, 'todo', now, now]
+          INSERT INTO tsks (tsk, status, created_at, updated_at)
+          VALUES (?, ?, ?, ?)",
+          [tsk, 'todo', now, now]
          )
       end
     end
@@ -101,6 +100,17 @@ 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
       storage = get_storage_instance
       raw_tsks = local_id ?
@@ -117,13 +127,11 @@ module Tsks
 
     def self.delete local_id
       storage = get_storage_instance
-      removed_tsks = storage
-                      .execute("SELECT * FROM tsks WHERE rowid=?", local_id)
+      removed_tsks = storage.execute("SELECT * FROM tsks WHERE rowid=?", local_id)
       if removed_tsks.empty?
         return false
       end
-      storage
-        .execute("INSERT INTO removed_tsks (tsk_uuid) VALUES (?)", removed_tsks[0][0])
+      storage.execute("INSERT INTO removed_tsks (tsk_id) VALUES (?)", removed_tsks[0][0])
       storage.execute("DELETE FROM tsks WHERE rowid=?", local_id)
     end
 
@@ -131,11 +139,11 @@ module Tsks
       storage = get_storage_instance
       result = storage.execute("SELECT * FROM removed_tsks")
 
-      tsk_uuids = []
+      tsk_ids = []
       for item in result
-        tsk_uuids.append item[0]
+        tsk_ids.append item[0]
       end
-      return tsk_uuids
+      return tsk_ids
     end
 
     def self.delete_removed_uuids

data/lib/tsks/version.rb

@@ -1,3 +1,3 @@
 module Tsks
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Luan Ramos Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec