tsks 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9556deb4b5e30cbe04ad5c58748675d148861575065ba9421c03e9fe65a5a180
-  data.tar.gz: 45bda05308651ffc0301f1b5c25bfdc9eb1f913743ab7a70bd5201cbe04de094
+  metadata.gz: 6fccdeb10c81fd73cbe4e0fd79054461347530f1ecedc43b188ea6a399bccf22
+  data.tar.gz: c3c82813fe5882c7a2c6b5dfa2a13c23cc2bb1e9fd617baafb9a4812f623564e
 SHA512:
-  metadata.gz: f67dc537a7735951d63c1f7b8cb9198e863c33d88971afb4a49cbb4ee9ff87ab338ed581bf11225726f0c2606258924225a2e184d90db7850075ba892c6c2805
-  data.tar.gz: 1ceffcc60b0b7bfab4c1b893232740c3848db7d7d1b3d60d4613a43e48f73c022984f59238b97cd6ed6e853c8ba65092da0cea075b17398fa6f5b0f78b8fc7b3
+  metadata.gz: e686b61f0a2bc64fd9043b1a3141de4dfd01bbce44cf5b3d6540672bc42193b453cf3af2bd624c909b8264f68af3b9859d09e006ac5be85e85e2f663856677a2
+  data.tar.gz: 6f37c91a93ef83854e0efca12e7af0a89c00253907baf79012657582ecff9c93cf739a8b8661cf1701461f599742d970504de30e20d9ae27416f79d3de5efa94

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.4)
+    tsks (0.0.7)
       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

@@ -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/cli.rb

@@ -6,12 +6,16 @@ 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}"
@@ -61,13 +65,13 @@ 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
@@ -91,12 +95,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
@@ -118,12 +122,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
@@ -160,7 +164,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/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

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.4"
+  VERSION = "0.0.7"
 end

data/lib/tsks.rb

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

data/tsks.gemspec

@@ -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.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Luan F. R. Vicente
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2022-04-16 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
@@ -94,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - luanrvmood@gmail.com
 executables:
@@ -126,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
@@ -141,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!)