tsks 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0915c80ecccdda0fbe03190ba3430ae42fbbd04047c8f5f755746f23279aaaf3'
-  data.tar.gz: acb17ef0eb9760ad4f8cb061812fd64e65950f3cba38cb57b03e7b9e965dd2c6
+  metadata.gz: bf122781e8faff2a45760d9bf8bb6d546d7158c47433ce4dc487ff7faa57b163
+  data.tar.gz: cb8ab03aa9f5ad004ac243746d2b3b368ccf522fbc734ea20e9c3081c1092882
 SHA512:
-  metadata.gz: a11d81689354f90811165eb4e24d08c76ee2f8d4c5607b8af6ee88e6f66c23037f6e9142adf41ad829d8aa2bbcb9702eb519aacadcaf91268538ae2ed6923e3b
-  data.tar.gz: 31abf6a8ed58a0523472750f763e4b889b4890ca7917b6d6d2ea83bcf26d3eed2d2280591785d2d3087a6d53b4247ea1e133d4a1192a00a71a4e5a3b0227cb78
+  metadata.gz: 738bf65c66226c36d14a56c389e970fb789ac98cff0569f4b58aaf02d178ea6d5542beee6c4204bbb4d26eaf91949118dcc2280fc327c8ff1005d1e55395c2ba
+  data.tar.gz: b763cdfa17b2b5e995eb8fab45fa42034167fa5b48ce9a512be8a2d8a8ff6485a1e60c46f7844e71b07dec4f3527a012e22070075c2075808e4ac09882818d9c

data/.env.sample

@@ -1,2 +1,2 @@
 SETUP_FOLDER=~/.tsks_test
-BASE_API_URI=http://localhost:3000/api/v1
+BASE_API_URI=http://localhost:3000/v1

data/Gemfile

@@ -5,7 +5,8 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "dotenv"
-gem "thor"
-gem "sqlite3"
-gem "httparty"
+gem "dotenv", "~> 2.7.6"
+gem "thor", "~> 1.0.1"
+gem "sqlite3", "~> 1.4.2"
+gem "httparty", "~> 0.18.1"
+gem "uuid", "~> 2.3.9"

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    tsks (0.1.0)
+    tsks (0.0.2)
       httparty
       sqlite3
       thor
+      uuid
 
 GEM
   remote: https://rubygems.org/
@@ -14,6 +15,8 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
@@ -23,7 +26,7 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -33,19 +36,23 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     sqlite3 (1.4.2)
+    systemu (2.6.5)
     thor (1.0.1)
+    uuid (2.3.9)
+      macaddr (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dotenv
-  httparty
+  dotenv (~> 2.7.6)
+  httparty (~> 0.18.1)
   rake (~> 12.0)
   rspec (~> 3.0)
-  sqlite3
-  thor
+  sqlite3 (~> 1.4.2)
+  thor (~> 1.0.1)
   tsks!
+  uuid (~> 2.3.9)
 
 BUNDLED WITH
-   2.1.4
+   2.1.2

data/README.md

@@ -1,12 +1,14 @@
 # tsks-cli
 
-_Yet another command line interface to handle your daily tsks with contexts._
+_A stateful command line interface to help you handle your daily tsks 
+(with contexts!)._
 
 ## Features
 
 * Add tsks, check what is already done and list active or archived tsks
-* Synchronize your tsks and access them from all your devices (In develpoment!)
-* Increase your daily tsks with contexts (see `tsks help add` for more info!)
+* Synchronize your tsks and access them from all your terminals!)
+* Increase your daily tsks management with contexts `tsks add tsk --context=today`
+  (see `tsks help add` for more info!)
 
 ## Installation
 

data/lib/tsks/actions.rb

@@ -0,0 +1,13 @@
+require "tsks/storage"
+
+module Tsks
+  class Actions
+    def self.update_tsks_with_uuid uuid
+      current_tsks = Tsks::Storage.select_all
+
+      for tsk in current_tsks
+        Tsks::Storage.update tsk[:local_id], {user_id: uuid}
+      end
+    end
+  end
+end

data/lib/tsks/cli.rb

@@ -2,6 +2,7 @@ require "thor"
 require "time"
 require "tsks/storage"
 require "tsks/request"
+require "tsks/actions"
 
 module Tsks
   class CLI < Thor
@@ -21,7 +22,7 @@ module Tsks
       Tsks::Storage.init
     end
 
-    desc "add TSK", "Add a new tsk (Use --context to specify one i.g. Work)"
+    desc "add TSK", "Add a new tsk (Use --context to specify one e.g. Work)"
     option :context
     def add tsk
       if !File.directory? CLI.setup_folder
@@ -66,7 +67,7 @@ module Tsks
 
       if tsks.count > 0
         for tsk in tsks
-          puts "#{tsk[:id]} @#{tsk[:context]} #{tsk[:tsk]}"
+          puts "#{tsk[:local_id]} @#{tsk[:context]} #{tsk[:tsk]}"
         end
       else
         puts "No tsks found."
@@ -86,6 +87,8 @@ module Tsks
 
       if res && res[:status_code] == 201
         File.write File.join(CLI.setup_folder, "token"), res[:token]
+        File.write File.join(CLI.setup_folder, "user_id"), res[:user_id]
+        Tsks::Actions.update_tsks_with_uuid res[:user_id]
         puts "Succesfully registered."
       elsif res && res[:status_code] == 409
         puts "This e-mail is already registered."
@@ -105,6 +108,8 @@ module Tsks
 
       if res && res[:status_code] == 200
         File.write File.join(CLI.setup_folder, "token"), res[:token]
+        File.write File.join(CLI.setup_folder, "user_id"), res[:user_id]
+        Tsks::Actions.update_tsks_with_uuid res[:user_id]
         puts "Succesfully logged in."
       elsif res && res[:status_code] == 403
         puts "Invalid e-mail or password."
@@ -121,11 +126,13 @@ module Tsks
         return puts "Please, login before try to sync."
       end
 
+      user_id = File.read File.join CLI.setup_folder, "user_id"
+      Tsks::Actions.update_tsks_with_uuid user_id
+      local_tsks = Tsks::Storage.select_all local_id=false
+
       token = File.read File.join CLI.setup_folder, "token"
       get_res = Tsks::Request.get "/tsks", token
-      local_tsks = Tsks::Storage.select_all
       remote_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"

data/lib/tsks/storage.rb

@@ -1,4 +1,5 @@
 require "sqlite3"
+require "uuid"
 
 module Tsks
   class Storage
@@ -6,7 +7,7 @@ module Tsks
       storage = get_storage_instance
       storage.execute <<-SQL
         CREATE TABLE tsks (
-          id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
+          id VARCHAR PRIMARY KEY UNIQUE NOT NULL,
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
           context VARCHAR DEFAULT Inbox,
@@ -19,18 +20,20 @@ module Tsks
 
     def self.insert tsk, ctx=nil
       storage = get_storage_instance
-      now = Time.now.strftime "%Y-%m-%e %H:%M:%S"
+      now = Time.now.strftime "%F %T"
+      uuid = UUID.new.generate
 
       if ctx
         storage.execute("
-          INSERT INTO tsks (tsk, context, created_at, updated_at)
-          VALUES (?, ?, ?, ?)",
-          [tsk, ctx, now, now]
+          INSERT INTO tsks (id, tsk, context, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)",
+          [uuid, tsk, ctx, now, now]
          )
       else
         storage.execute("
-          INSERT INTO tsks (tsk, created_at, updated_at) VALUES (?, ?, ?)",
-          [tsk, now, now]
+          INSERT INTO tsks (id, tsk, created_at, updated_at)
+          VALUES (?, ?, ?, ?)",
+          [uuid, tsk, now, now]
          )
       end
     end
@@ -40,9 +43,11 @@ module Tsks
 
       for tsk in tsks
         storage.execute("
-          INSERT INTO tsks (id, tsk, context, done, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?)",
+          INSERT INTO tsks
+          (id, user_id, tsk, context, done, created_at, updated_at) VALUES
+          (?, ?, ?, ?, ?, ?, ?)",
           [tsk[:id],
+           tsk[:user_id],
            tsk[:tsk],
            tsk[:context],
            tsk[:done],
@@ -52,9 +57,22 @@ module Tsks
       end
     end
 
-    def self.update id
+    def self.update local_id, params=nil
       storage = get_storage_instance
-      storage.execute "UPDATE tsks SET done=true WHERE id=?", id
+
+      if params && params.count == 1
+        # NOTE
+        # there is only a currently in use case covered by this conditional
+        # ant that is ok for now, but we should make sure it is updated when
+        # Storage.update starting to be called from many different ways.
+        storage.execute(
+          "UPDATE tsks SET " \
+          "#{params.keys.first}=? " \
+          "WHERE rowid=?",
+          [params.values.first, local_id])
+      else
+        storage.execute "UPDATE tsks SET done=true WHERE rowid=?", local_id
+      end
     end
 
     def self.select_by params
@@ -64,23 +82,25 @@ module Tsks
 
       if params.count == 2
         raw_tsks = storage.execute(
-          "SELECT * FROM tsks " \
+          "SELECT rowid, * FROM tsks " \
           "WHERE #{params.keys.first}=? and #{params.keys.last}=?",
           [params.values.first, params.values.last]
         )
       else
         raw_tsks = storage.execute(
-          "SELECT * FROM tsks WHERE #{params.keys.first}=?",
+          "SELECT rowid, * FROM tsks WHERE #{params.keys.first}=?",
           params.values.first)
       end
 
       tsks = structure_tsks raw_tsks
     end
 
-    def self.select_all
+    def self.select_all local_id=true
       storage = get_storage_instance
-      raw_tsks = storage.execute "SELECT * FROM tsks"
-      tsks = structure_tsks raw_tsks
+      raw_tsks = local_id ?
+        storage.execute("SELECT rowid, * FROM tsks") :
+        storage.execute("SELECT * FROM tsks")
+      tsks = structure_tsks(raw_tsks, local_id=local_id)
     end
 
     private
@@ -89,17 +109,30 @@ module Tsks
       SQLite3::Database.new File.join CLI.setup_folder, "tsks.db"
     end
 
-    def self.structure_tsks tsks
+    def self.structure_tsks tsks, local_id=true
       structured_tsks = []
 
       for tsk in tsks
-        t = {id: tsk[0],
-             user_id: tsk[1],
-             tsk: tsk[2],
-             context: tsk[3],
-             done: tsk[4],
-             created_at: tsk[5],
-             updated_at: tsk[5]}
+        t = {}
+
+        if local_id
+           t[:local_id] = tsk[0]
+           t[:id] = tsk[1]
+           t[:user_id] = tsk[2]
+           t[:tsk] = tsk[3]
+           t[:context] = tsk[4]
+           t[:done] = 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[:context] = tsk[3]
+           t[:done] = tsk[4]
+           t[:created_at] = tsk[5]
+           t[:updated_at] = tsk[6]
+        end
 
         structured_tsks.append t
       end

data/lib/tsks/version.rb

@@ -1,3 +1,3 @@
 module Tsks
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/tsks.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |spec|
   spec.version       = Tsks::VERSION
   spec.authors       = ["Luan F. R. Vicente"]
   spec.email         = ["luanrvmood@gmail.com"]
-  spec.summary       = ""
-  spec.homepage      = "https://github.com/luanrvmood/tsks-cli"
+  spec.summary       = "A stateful command line interface to help you handle your daily tsks (with contexts!)"
+  spec.homepage      = "https://github.com/luanrvmood/tsks"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["homepage_uri"] = spec.homepage
@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "sqlite3"
   spec.add_dependency "httparty"
+  spec.add_dependency "uuid"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luan F. R. Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - luanrvmood@gmail.com
@@ -100,17 +114,18 @@ files:
 - bin/setup
 - exe/tsks
 - lib/tsks.rb
+- lib/tsks/actions.rb
 - lib/tsks/cli.rb
 - lib/tsks/request.rb
 - lib/tsks/storage.rb
 - lib/tsks/version.rb
 - tsks.gemspec
-homepage: https://github.com/luanrvmood/tsks-cli
+homepage: https://github.com/luanrvmood/tsks
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/luanrvmood/tsks-cli
-  source_code_uri: https://github.com/luanrvmood/tsks-cli
+  homepage_uri: https://github.com/luanrvmood/tsks
+  source_code_uri: https://github.com/luanrvmood/tsks
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -129,5 +144,6 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: ''
+summary: A stateful command line interface to help you handle your daily tsks (with
+  contexts!)
 test_files: []