tsks 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f7497ae6a59643d79502f8bb6ff5eb6a09b56e8d2ff2663f8c8edefeac4d77
-  data.tar.gz: 534fe43eed703d5b7a00b19a056569acbd2b6513bbb750ca71fe08e059a8cdd2
+  metadata.gz: bc64bfc231b5bdddc48e461c610e21564cb6e84cacf98ec865669c9f9326aa4d
+  data.tar.gz: bdf3d97cb380ebd6e014b99a86557af4db94716339a2c6d7fc7ef40f664aa652
 SHA512:
-  metadata.gz: 1d06f1380203bd0b9459ef13a378406bbe06f9c3b57ca3e11a5c16d0134e6ddf6919fe10e989409cd324fa4dce7fd2305dab6d5ff2d3f722b713f2740737e837
-  data.tar.gz: a0977da59193c4b7e6748a9933f26b40154806573e9001abefe168d39c5c73d965bbe4578e3e497acb1716aa69513aabf46b372cb9d40c5d4eddacec4799852c
+  metadata.gz: '0301898a19b38ca228ced6c841cefbc24a8ce595ccaa54ee8a9b5c616f27e278e5c592e37cde8498927b5fad1664a15d23dca9d0f14985bb3703129b3b661430'
+  data.tar.gz: d3c2d5f445335576c3be41ef095b432f52a75f7c8acee1346ed5fc2823cd904fbe6c8a9b35b6ef5145f58aa3709a82ec2a6f0205f973c61ec473dc397c3f9c3a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tsks (0.0.5)
+    tsks (0.0.8)
       httparty
       sqlite3
       thor
@@ -53,4 +53,4 @@ DEPENDENCIES
   uuid (~> 2.3.9)
 
 BUNDLED WITH
-   2.1.2
+   2.2.22

data/README.md

@@ -91,10 +91,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`
-(This command installs the current tsks version **v0.0.2** in your machine
-path).
+(This command installs the current tsks version in your machine).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at 
-https://github.com/luanrvmood/tsks-cli.
+Bug reports and pull requests are welcome on GitHub at https://github.com/luanrvmood/tsks.

data/lib/tsks/actions.rb

@@ -19,5 +19,17 @@ module Tsks
         end
       end
     end
+
+    def self.get_tsk_status status
+      available_status = {
+        todo: '+',
+        done: '-',
+        doing: '*',
+        freezed: '||',
+        archived: 'x',
+      }
+
+      available_status[status.to_sym]
+    end
   end
 end

data/lib/tsks/cli.rb

@@ -65,18 +65,19 @@ module Tsks
       tsks = nil
 
       if options[:done] && options[:context]
-        tsks = Tsks::Storage.select_by({done: 1, context: options[:context]})
+        tsks = Tsks::Storage.select_by({status: 'done', context: options[:context]})
       elsif options[:done]
-        tsks = Tsks::Storage.select_by({done: 1})
+        tsks = Tsks::Storage.select_by({status: 'done'})
       elsif options[:context]
         tsks = Tsks::Storage.select_by({context: options[:context]})
       else
-        tsks = Tsks::Storage.select_by({done: 0})
+        tsks = Tsks::Storage.select_by({status: 'todo'})
       end
 
       if tsks.count > 0
         for tsk in tsks
-          puts "#{tsk[:local_id]} @#{tsk[:context]} #{tsk[:tsk]}"
+          tsk_status = Tsks::Actions.get_tsk_status tsk[:status]
+          puts "#{tsk_status} | #{tsk[:local_id]} #{tsk[:tsk]} @#{tsk[:context]}"
         end
       else
         puts "No tsks found."
@@ -95,12 +96,12 @@ module Tsks
         res = Tsks::Request.post "/register", {email: options[:email],
                                                password: options[:password]}
 
-        if res && res[:status_code] == 201
+        if res && res[:ok] == true
           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
+        elsif res && res[:ok] == false
           puts "This e-mail is already registered."
         end
       rescue Errno::ECONNREFUSED, SocketError
@@ -122,12 +123,12 @@ module Tsks
         res = Tsks::Request.post "/login", {email: options[:email],
                                             password: options[:password]}
 
-        if res && res[:status_code] == 200
+        if res && res[:ok] == true
           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
+        elsif res && res[:ok] == false
           puts "Invalid e-mail or password."
         end
       rescue Errno::ECONNREFUSED, SocketError
@@ -164,7 +165,7 @@ module Tsks
             remote_tsks.append tsk
           end
 
-          if get_res[:status_code] == 200
+          if get_res[:ok] == true
             local_tsks_to_post = local_tsks - remote_tsks
             if local_tsks_to_post.count > 0
               Tsks::Request.post "/tsks", token, {tsks: local_tsks_to_post}

data/lib/tsks/storage.rb

@@ -10,8 +10,8 @@ module Tsks
           id VARCHAR PRIMARY KEY UNIQUE NOT NULL,
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
+          status VARCHAR DEFAULT todo,
           context VARCHAR DEFAULT Inbox,
-          done BOOLEAN DEFAULT false,
           created_at VARCHAR NOT NULL,
           updated_at VARCHAR NOT NULL
         )
@@ -31,15 +31,15 @@ module Tsks
 
       if ctx
         storage.execute("
-          INSERT INTO tsks (id, tsk, context, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?)",
-          [uuid, tsk, ctx, now, now]
+          INSERT INTO tsks (id, tsk, status, context, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?, ?)",
+          [uuid, tsk, 'todo', ctx, now, now]
          )
       else
         storage.execute("
-          INSERT INTO tsks (id, tsk, created_at, updated_at)
-          VALUES (?, ?, ?, ?)",
-          [uuid, tsk, now, now]
+          INSERT INTO tsks (id, tsk, status, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)",
+          [uuid, tsk, 'todo', now, now]
          )
       end
     end
@@ -50,13 +50,13 @@ module Tsks
       for tsk in tsks
         storage.execute("
           INSERT INTO tsks
-          (id, user_id, tsk, context, done, created_at, updated_at) VALUES
+          (id, user_id, tsk, status, context, created_at, updated_at) VALUES
           (?, ?, ?, ?, ?, ?, ?)",
           [tsk[:id],
            tsk[:user_id],
            tsk[:tsk],
+           tsk[:status],
            tsk[:context],
-           tsk[:done],
            tsk[:created_at],
            tsk[:updated_at]]
         )
@@ -77,7 +77,7 @@ module Tsks
           "WHERE rowid=?",
           [params.values.first, local_id])
       else
-        storage.execute "UPDATE tsks SET done=true WHERE rowid=?", local_id
+        storage.execute "UPDATE tsks SET status='done' WHERE rowid=?", local_id
       end
     end
 
@@ -154,16 +154,16 @@ module Tsks
            t[:id] = tsk[1]
            t[:user_id] = tsk[2]
            t[:tsk] = tsk[3]
-           t[:context] = tsk[4]
-           t[:done] = tsk[5]
+           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[:context] = tsk[3]
-           t[:done] = tsk[4]
+           t[:status] = tsk[3]
+           t[:context] = tsk[4]
            t[:created_at] = tsk[5]
            t[:updated_at] = tsk[6]
         end

data/lib/tsks/version.rb

@@ -1,3 +1,3 @@
 module Tsks
-  VERSION = "0.0.5"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Luan F. R. Vicente
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - luanrvmood@gmail.com
 executables:
@@ -112,7 +112,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/luanrvmood/tsks
   source_code_uri: https://github.com/luanrvmood/tsks
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A stateful command line interface to help you handle your daily tsks (with
   synchronisation and contexts!)