tsks 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d73c826d7b403aedb18560d1a278b7031bf685379f2a933a566eb2e868132d8
-  data.tar.gz: d06f2629e6baf5396d91e732f9aeb1504256a93c984bc560c43c57ffea2baaeb
+  metadata.gz: 5642476a95ebd615e61b0461eb61f2ea9a3408d249b3a85ba1ea2e028427badc
+  data.tar.gz: 65e8fea2affb40c031b86aed5db037426eacf8d953deaf8f13a7a3b2d0d633bf
 SHA512:
-  metadata.gz: bf19e1134320717d80ea4eb4f1a5bad44e0979ee3cc37adcc3f83e5ffcaf69bde1e5896ab367e61c1210c3a4eb0f03475540bfed1bc46fa8748bb053fc89e9e0
-  data.tar.gz: 10f11a8fa09923a383ce3ce61ec3715bd3c7139a5e3411352f6b5985888869b303827585637514990c9cabda0be9aa09fbed5df570f417198c69cd43fec3feaf
+  metadata.gz: 1f6093f9d0a12c050e0384d316dfbf388ef39c4eb2b02cb3677e5b468f9ff71f8cafb85b937aed67c3cabbf9bb026931b5d84fe762759fd0bb3f798d8a643beb
+  data.tar.gz: 1287812074eab7b75d580be496b52d34c915505b45a8b7c6254e3135939a02e89295893b34a625a62cde190ab48d685fbb3e52ae0da807ba4b8838b76f3b3db5

data/.circleci/config.yml

@@ -0,0 +1,32 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  ruby: circleci/ruby@1.4.0
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    docker:
+      - image: cimg/ruby:3.1.0
+    executor: ruby/default
+    steps:
+      - checkout
+      - run:
+          name: bundle install
+          command: bundle install
+      - run:
+          name: test
+          command: ./bin/test
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  sample: # This is the name of the workflow, feel free to change it to better match your workflow.
+    # Inside the workflow, you define the jobs you want to run.
+    jobs:
+      - build

data/.env.sample

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

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,6 @@
 # tsks
 
-[![build](https://app.travis-ci.com/luanramosvicente/tsks.svg?branch=main)](https://travis-ci.com/luanrvmood/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!).
@@ -85,7 +85,7 @@ Or this to register an account:
 tsks register --email=sample@mail.com --password=secret
 ```
 
-## Development
+## Developing
 
 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
@@ -94,6 +94,12 @@ 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 in your machine).
 
+## Releasing
+
+```sh
+./bin/release
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/luanrvmood/tsks.

data/bin/install

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle exec rake install

data/bin/release

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+bundle exec rake build
+git commit -am 'feat: new release'
+bundle exec rake release

data/bin/test

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -euo pipefail
+bundle exec rake spec

data/lib/tsks/actions.rb

@@ -2,11 +2,11 @@ require "tsks/storage"
 
 module Tsks
   class Actions
-    def self.update_tsks_with_uuid uuid
+    def self.update_tsks_with_user_id user_id
       current_tsks = Tsks::Storage.select_all
 
       for tsk in current_tsks
-        Tsks::Storage.update tsk[:local_id], {user_id: uuid}
+        Tsks::Storage.update tsk[:local_id], {user_id: user_id}
       end
     end
 
@@ -22,10 +22,10 @@ module Tsks
 
     def self.get_tsk_status status
       available_status = {
-        todo: '+',
-        done: '-',
-        doing: '*',
-        freezed: '||',
+        todo: '-',
+        done: '*',
+        doing: '+',
+        freezed: '!',
         archived: 'x',
       }
 

data/lib/tsks/cli.rb

@@ -21,7 +21,7 @@ module Tsks
       puts "tsks #{Tsks::VERSION}"
     end
 
-    desc "init", "Setup tsks folder and storage"
+    desc "init", "setup tsks folder and storage"
     def init
       if File.directory? CLI.setup_folder
         return puts "tsks was already initialized."
@@ -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. Work)"
     option :context
     def add tsk
       if !File.directory? CLI.setup_folder
@@ -45,16 +45,19 @@ module Tsks
       end
     end
 
-    desc "done ID", "Mark a tsk you have already done"
+    desc "done ID", "mark a tsk you have already done"
     def done id
       if !File.directory? CLI.setup_folder
         return puts "tsks was not initialized yet."
       end
 
-      Tsks::Storage.update id
+      op_status = Tsks::Storage.update id
+      if !op_status
+        puts "the specified tsk do not exist."
+      end
     end
 
-    desc "list", "See all active tsks, filter by context or that are done"
+    desc "list", "see all active tsks, filter by context or that are done"
     option :done, type: :boolean
     option :context
     def list
@@ -71,7 +74,7 @@ module Tsks
       elsif options[:context]
         tsks = Tsks::Storage.select_by({context: options[:context]})
       else
-        tsks = Tsks::Storage.select_by({status: 'todo'})
+        tsks = Tsks::Storage.select_active
       end
 
       if tsks.count > 0
@@ -80,11 +83,11 @@ module Tsks
           puts "#{tsk_status} | #{tsk[:local_id]} #{tsk[:tsk]} @#{tsk[:context]}"
         end
       else
-        puts "No tsks found."
+        puts "no tsks found."
       end
     end
 
-    desc "register", "Register an e-mail to be able to sync your tsks"
+    desc "register", "register an e-mail to be able to sync your tsks"
     option :email, required: true
     option :password, required: true
     def register
@@ -94,24 +97,24 @@ module Tsks
 
       begin
         res = Tsks::Request.post "/signup", {email: options[:email],
-                                               password: options[:password]}
+                                             password: options[:password]}
 
         if res && res[:ok] == true
-          File.write File.join(CLI.setup_folder, "token"), res[:auth_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."
+          File.write File.join(CLI.setup_folder, "token"), res[:user][:auth_token]
+          File.write File.join(CLI.setup_folder, "user_id"), res[:user][:id]
+          Tsks::Actions.update_tsks_with_user_id res[:user][:id]
+          puts "succesfully registered."
         elsif res && res[:ok] == false
-          puts "This e-mail is already registered."
+          puts "this e-mail is already registered."
         end
       rescue Errno::ECONNREFUSED, SocketError
-        puts "Failed to connect to the API."
+        puts "failed to connect to API."
       rescue JSON::ParserError
-        puts "Error on reading data from the API."
+        puts "error on reading data from API."
       end
     end
 
-    desc "login", "Login to be able to sync your tsks"
+    desc "login", "login to be able to sync your tsks"
     option :email, required: true
     option :password, required: true
     def login
@@ -121,36 +124,36 @@ module Tsks
 
       begin
         res = Tsks::Request.post "/signin", {email: options[:email],
-                                            password: options[:password]}
+                                             password: options[:password]}
 
         if res && res[:ok] == true
-          File.write File.join(CLI.setup_folder, "token"), res[:auth_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."
+          File.write File.join(CLI.setup_folder, "token"), res[:user][:auth_token]
+          File.write File.join(CLI.setup_folder, "user_id"), res[:user][:id]
+          Tsks::Actions.update_tsks_with_user_id res[:user][:id]
+          puts "succesfully logged in."
         elsif res && res[:ok] == false
-          puts "Invalid e-mail or password."
+          puts "invalid e-mail or password."
         end
       rescue Errno::ECONNREFUSED, SocketError
-        puts "Failed to connect to the API."
+        puts "failed to connect to API."
       rescue JSON::ParserError
-        puts "Error on reading data from the API."
+        puts "error on reading data from API."
       end
     end
 
-    desc "sync", "Synchronize your tsks"
+    desc "sync", "synchronize your tsks"
     def sync
       if !File.directory? CLI.setup_folder
         return puts "tsks was not initialized yet."
       end
 
       if !File.exist? File.join CLI.setup_folder, "token"
-        return puts "Please, login before try to sync."
+        return puts "please, login before try to sync."
       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_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
@@ -178,13 +181,13 @@ module Tsks
               Tsks::Storage.insert_many remote_tsks_to_storage
             end
 
-            puts "Your tsks were succesfully synchronized."
+            puts "your tsks were succesfully synchronized."
           end
         end
       rescue Errno::ECONNREFUSED, SocketError
-        puts "Failed to connect to the API."
+        puts "failed to connect to API."
       rescue JSON::ParserError
-        puts "Error on reading data from the API."
+        puts "error on reading data from API."
       end
     end
 
@@ -196,7 +199,19 @@ module Tsks
 
       op_status = Tsks::Storage.delete id
       if !op_status
-        puts "The specified tsk do not exist."
+        puts "the specified tsk do not exist."
+      end
+    end
+
+    desc "doing ID", "mark a tsk you started doing"
+    def doing id
+      if !File.directory? CLI.setup_folder
+        return puts "tsks was not initialized yet."
+      end
+
+      op_status = Tsks::Storage.update id, {status: 'doing'}
+      if !op_status
+        puts "the specified tsk do not exist."
       end
     end
   end

data/lib/tsks/request.rb

@@ -2,9 +2,7 @@ require "httparty"
 
 module Tsks
   class Request
-    #@base_uri = "https://tsks-api.herokuapp.com/v1"
-    # TODO: tmp for dev purposes
-    @base_uri = "http://localhost:3000/v1"
+    @base_uri = "https://tsks-api.onrender.com/v1"
 
     def self.base_uri
       @base_uri

data/lib/tsks/storage.rb

@@ -11,7 +11,7 @@ module Tsks
           user_id INTEGER DEFAULT 1,
           tsk VARCHAR NOT NULL,
           status VARCHAR DEFAULT todo,
-          context VARCHAR DEFAULT Inbox,
+          context VARCHAR DEFAULT inbox,
           created_at VARCHAR NOT NULL,
           updated_at VARCHAR NOT NULL
         )
@@ -109,6 +109,12 @@ module Tsks
       tsks = structure_tsks(raw_tsks, local_id=local_id)
     end
 
+    def self.select_active
+      storage = get_storage_instance
+      raw_tsks = storage.execute("SELECT rowid, * FROM tsks WHERE status NOT LIKE 'done'")
+      tsks = structure_tsks raw_tsks
+    end
+
     def self.delete local_id
       storage = get_storage_instance
       removed_tsks = storage

data/lib/tsks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsks
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Luan Ramos Vicente
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-05-19 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:
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".env.sample"
 - ".gitignore"
 - ".rspec"
@@ -97,7 +98,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/install
+- bin/release
 - bin/setup
+- bin/test
 - exe/tsks
 - lib/tsks.rb
 - lib/tsks/actions.rb
@@ -112,7 +116,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/luanrv/tsks
   source_code_uri: https://github.com/luanrv/tsks
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.6
+signing_key: 
 specification_version: 4
 summary: A stateful command line interface to help you handle your daily tsks (with
   synchronisation and contexts)