tsks 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf122781e8faff2a45760d9bf8bb6d546d7158c47433ce4dc487ff7faa57b163
-  data.tar.gz: cb8ab03aa9f5ad004ac243746d2b3b368ccf522fbc734ea20e9c3081c1092882
+  metadata.gz: db9ce658ad547edd5932aef5cf8915bfec4ecf2cffa432fdc9c6682e1626a7de
+  data.tar.gz: d4bd382ab9592760d95af9e0640518ba811c9a353ca045b9d0a3bffa264479c5
 SHA512:
-  metadata.gz: 738bf65c66226c36d14a56c389e970fb789ac98cff0569f4b58aaf02d178ea6d5542beee6c4204bbb4d26eaf91949118dcc2280fc327c8ff1005d1e55395c2ba
-  data.tar.gz: b763cdfa17b2b5e995eb8fab45fa42034167fa5b48ce9a512be8a2d8a8ff6485a1e60c46f7844e71b07dec4f3527a012e22070075c2075808e4ac09882818d9c
+  metadata.gz: 480d699bdc149396e4e1cf716173dda23fb3f0506ceb8a0f911c35f4ed980b4567a7aa18ee6d0153e636d799448c80dac2520fd2d41cd195635197f17f38cbd4
+  data.tar.gz: e97aae640703c31732a1582d16c65351ef0c1868f9f13ccfdd1cc1397559509330e4023300bc199a30cd40674e57451ee055ef808110787902dd9eac76b95a22

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tsks (0.0.2)
+    tsks (0.0.6)
       httparty
       sqlite3
       thor
@@ -11,7 +11,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    dotenv (2.7.6)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -45,7 +44,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  dotenv (~> 2.7.6)
   httparty (~> 0.18.1)
   rake (~> 12.0)
   rspec (~> 3.0)
@@ -55,4 +53,4 @@ DEPENDENCIES
   uuid (~> 2.3.9)
 
 BUNDLED WITH
-   2.1.2
+   2.2.22

data/README.md

@@ -1,14 +1,17 @@
-# tsks-cli
+# tsks
 
-_A stateful command line interface to help you handle your daily tsks 
-(with contexts!)._
+A stateful command line interface to help you handle your daily tsks (with 
+synchronisation and contexts!).
+
+[![build](https://travis-ci.com/luanrvmood/tsks.svg?branch=master)](https://travis-ci.com/luanrvmood/tsks)
 
 ## Features
 
 * Add tsks, check what is already done and list active or archived tsks
-* 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!)
+* Synchronise your tsks and access them from all your terminals! 
+  (soon accessible from a webapp as well)
+* Increase your daily tsks management with contexts using 
+  `tsks add tsk --context=today` (see `tsks help add` for more info)
 
 ## Installation
 
@@ -20,8 +23,8 @@ gem install tsks
 
 After follow the step above you should be able to run `tsks` from your terminal. 
 
-_It's important to notice that you will need to run `tsks init` before any other 
-command to setup stuffs like the storage._
+_It's important to notice that you will need to run `tsks init` to setup stuffs 
+like the storage before any other command._
 
 ### Adding new tsks
 
@@ -32,13 +35,13 @@ tsks add "My first tsk"
 **Adding with context**
 
 ```sh
-tsks add "Bootstraps my pet project environment --context=Personal"
+tsks add "Bootstraps my pet project environment" --context=Today
 ```
 
-### Checking done tsks
+### Marking tsks as done 
 
 ```sh
-tsks done 2 # Where 2 is the id
+tsks done 2 # Where 2 is the tsk id
 ```
 
 ### Listing your tsks
@@ -50,7 +53,7 @@ tsks list
 **Filtering by context**
 
 ```sh
-tsks list --context=Personal
+tsks list --context=Today
 ```
 
 **Or tsks already done**
@@ -61,11 +64,11 @@ tsks list --done
 **Tip:** It's possible to combine the flags `--done` and `--context` when 
 listing.
 
-### Synchronizing your tsks
+### Synchronising your tsks
 
 As easy as running `tsks sync`. This command will fetch your tsks from the API, 
-then filter what is not synced yet from local, and then update both remote and 
-local tsks with most recent data.
+then filter what is not synchronised yet from local, then update both 
+remote and local tsks with most recent data.
 
 #### To be able to sync you will need to login or register an account
 
@@ -87,7 +90,9 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 `rake spec` to run the tests. You can also run `bin/console` for an interactive
 prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`.
+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).
 
 ## Contributing
 

data/lib/tsks/actions.rb

@@ -9,5 +9,15 @@ module Tsks
         Tsks::Storage.update tsk[:local_id], {user_id: uuid}
       end
     end
+
+    def self.update_server_for_removed_tsks token
+      tsks_uuids = Tsks::Storage.select_removed_uuids
+
+      if !tsks_uuids.empty?
+        for id in tsks_uuids
+          Tsks::Request.delete "/tsks/#{id}", token
+        end
+      end
+    end
   end
 end

data/lib/tsks/cli.rb

@@ -6,12 +6,21 @@ require "tsks/actions"
 
 module Tsks
   class CLI < Thor
-    @setup_folder = File.expand_path ENV["SETUP_FOLDER"] || "~/.tsks"
+    @setup_folder = File.expand_path "~/.tsks"
 
     def self.setup_folder
       @setup_folder
     end
 
+    def self.setup_folder= folder_path
+      @setup_folder = folder_path
+    end
+
+    desc "version", ""
+    def version
+      puts "tsks #{Tsks::VERSION}"
+    end
+
     desc "init", "Setup tsks folder and storage"
     def init
       if File.directory? CLI.setup_folder
@@ -82,16 +91,22 @@ module Tsks
         return puts "tsks was not initialized yet."
       end
 
-      res = Tsks::Request.post "/register", {email: options[:email],
-                                             password: options[:password]}
-
-      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."
+      begin
+        res = Tsks::Request.post "/register", {email: options[:email],
+                                               password: options[:password]}
+
+        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[:ok] == false
+          puts "This e-mail is already registered."
+        end
+      rescue Errno::ECONNREFUSED, SocketError
+        puts "Failed to connect to the API."
+      rescue JSON::ParserError
+        puts "Error on reading data from the API."
       end
     end
 
@@ -103,16 +118,22 @@ module Tsks
         return puts "tsks was not initialized yet."
       end
 
-      res = Tsks::Request.post "/login", {email: options[:email],
-                                          password: options[:password]}
-
-      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."
+      begin
+        res = Tsks::Request.post "/login", {email: options[:email],
+                                            password: options[:password]}
+
+        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[:ok] == false
+          puts "Invalid e-mail or password."
+        end
+      rescue Errno::ECONNREFUSED, SocketError
+        puts "Failed to connect to the API."
+      rescue JSON::ParserError
+        puts "Error on reading data from the API."
       end
     end
 
@@ -127,30 +148,52 @@ module Tsks
       end
 
       user_id = File.read File.join CLI.setup_folder, "user_id"
+      token = File.read File.join CLI.setup_folder, "token"
       Tsks::Actions.update_tsks_with_uuid user_id
+      Tsks::Actions.update_server_for_removed_tsks token
+      Tsks::Storage.delete_removed_uuids
       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
       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"
-        remote_tsks.append tsk
-      end
-
-      if get_res && get_res[:status_code] == 200
-        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}
+      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
+
+          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}
+            end
+
+            remote_tsks_to_storage = remote_tsks - local_tsks
+            if remote_tsks_to_storage.count > 0
+              Tsks::Storage.insert_many remote_tsks_to_storage
+            end
+
+            puts "Your tsks were succesfully synchronized."
+          end
         end
+      rescue Errno::ECONNREFUSED, SocketError
+        puts "Failed to connect to the API."
+      rescue JSON::ParserError
+        puts "Error on reading data from the API."
+      end
+    end
 
-        remote_tsks_to_storage = remote_tsks - local_tsks
-        if remote_tsks_to_storage.count > 0
-          Tsks::Storage.insert_many remote_tsks_to_storage
-        end
+    desc "remove ID", "..."
+    def remove id
+      if !File.directory? CLI.setup_folder
+        return puts "tsks was not initialized yet."
+      end
 
-        puts "Your tsks were succesfully synchronized."
+      op_status = Tsks::Storage.delete id
+      if !op_status
+        puts "The specified tsk do not exist."
       end
     end
   end

data/lib/tsks/request.rb

@@ -2,7 +2,7 @@ require "httparty"
 
 module Tsks
   class Request
-    @base_uri = ENV["BASE_API_URI"] || "https://tsks-api.herokuapp.com/v1"
+    @base_uri = "https://tsks-api.herokuapp.com/v1"
 
     def self.base_uri
       @base_uri
@@ -27,6 +27,12 @@ module Tsks
       parsed_res = parse_response res.body
     end
 
+    def self.delete endpoint, token
+      uri = URI "#{Request.base_uri}#{endpoint}"
+      res = HTTParty.delete uri, headers: {authorization: "Bearer #{token}"}
+      parsed_res = parse_response res.body
+    end
+
     private
 
     def self.parse_response body

data/lib/tsks/storage.rb

@@ -16,6 +16,12 @@ module Tsks
           updated_at VARCHAR NOT NULL
         )
       SQL
+
+      storage.execute <<-SQL
+        CREATE TABLE removed_tsks (
+          tsk_uuid VARCHAR UNIQUE NOT NULL
+        )
+      SQL
     end
 
     def self.insert tsk, ctx=nil
@@ -103,6 +109,34 @@ module Tsks
       tsks = structure_tsks(raw_tsks, local_id=local_id)
     end
 
+    def self.delete local_id
+      storage = get_storage_instance
+      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("DELETE FROM tsks WHERE rowid=?", local_id)
+    end
+
+    def self.select_removed_uuids
+      storage = get_storage_instance
+      result = storage.execute("SELECT * FROM removed_tsks")
+
+      tsk_uuids = []
+      for item in result
+        tsk_uuids.append item[0]
+      end
+      return tsk_uuids
+    end
+
+    def self.delete_removed_uuids
+      storage = get_storage_instance
+      storage.execute("DELETE FROM removed_tsks")
+    end
+
     private
 
     def self.get_storage_instance

data/lib/tsks/version.rb

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

data/lib/tsks.rb

@@ -1,4 +1,3 @@
-require "dotenv/load"
 require "tsks/version"
 require "tsks/cli"
 

data/tsks.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |spec|
   spec.version       = Tsks::VERSION
   spec.authors       = ["Luan F. R. Vicente"]
   spec.email         = ["luanrvmood@gmail.com"]
-  spec.summary       = "A stateful command line interface to help you handle your daily tsks (with contexts!)"
+  spec.summary       = "A stateful command line interface to help you handle your daily tsks (with synchronisation and 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"
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "dotenv"
   spec.add_dependency "thor"
   spec.add_dependency "sqlite3"
   spec.add_dependency "httparty"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Luan F. R. Vicente
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -145,5 +131,5 @@ rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A stateful command line interface to help you handle your daily tsks (with
-  contexts!)
+  synchronisation and contexts!)
 test_files: []