wip-cli 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6769807e30279443f27ef2ebdee3380ba941aade21d5787338ea28e0eb81c2d
-  data.tar.gz: 61e38788589c5ca17f83c86d725a52687f1b5793cc1647f291577c4bfcdea2e3
+  metadata.gz: bb9c05cd1f964991c2b44e8d235846ebaf3da18dd2ab0c47d8731801a75c4232
+  data.tar.gz: 6d439e90a3ad971779e7cabbde4f4790f4a3884286c9ec70d97954f8e13ec81d
 SHA512:
-  metadata.gz: 8e6d780083b9b5da3fa9c4a3865c4ddcb7a9b1cd0c2466e19dfbe87719dbd1403d419ad72ef413ef2a8765e00e9e465039cc116fc25c27c59a093ca58f3749fd
-  data.tar.gz: 6e702061b7662cc33d7e4bd54605659666f974e89e002e94df889725bbb392b8cb2ec0f7f2529b806a2e75f5f2904349b2252f6d664e36a95ae96d8c131d8d81
+  metadata.gz: '059174a36ae832449877c49cf88695c9530006c04737702dc60e593e092194ebb5aa8af38c0e648eda813cbd01f829a6aa135bb81d7b5c7e316c0ae041f53f97'
+  data.tar.gz: f2a19480b29b25bb41dc0ad35336e127b737bbfa0ecf671fff8ea2dd8e596fbb08a09aa2a178274901743d74f29175e3107bc0958373a8bb607b763458675ec4

data/.gitignore

@@ -10,4 +10,5 @@
 .byebug_history
 # rspec failure tracking
 .rspec_status
-.ruby-version
+.ruby-version
+.vscode

data/CHANGELOG.md

@@ -2,8 +2,20 @@
 
 ## [Unreleased]
 
+## [1.2.0] - 2020-11-12
+
+### Added
+
+- Added options to uncomplete a todo: `wip complete -u 123 `
+- Added command to delete a todo: `wip delete 123`
+- Added command to get any users todos: `wip todos -u sowenjub`
+- Added command to get viewer todos: `wip todos`
+- Added method to get viewer: `Wip::User.viewer`
+
 ## [1.1.0] - 2020-11-11
 
+### Changed
+
 - Renamed command from wipco to wip
 - Renamed gem from wipco to wip-cli
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wip-cli (1.1.0)
+    wip-cli (1.2.0)
       thor (~> 1.0)
 
 GEM
@@ -35,4 +35,4 @@ DEPENDENCIES
   wip-cli!
 
 BUNDLED WITH
-   2.1.1
+   2.1.4

data/README.md

@@ -22,11 +22,20 @@ Or install it yourself as:
 
 Define an ENV var named `WIP_API_KEY` with your [api key](https://wip.co/api).
 
-`wip todo "Grab a cup of ☕️"`
+### Adding a todo & completing it
 
-`wip complete 123`
+* `wip todo "Grab a cup of ☕️"`
+* `wip complete 123`
+* `wip complete -u 123` to uncomplete a todo
+* `wip delete 123`
 
-`wip done "Installed wip-cli gem"`
+And to log a completed todo:
+* `wip done "Installed wip-cli gem"`
+
+### Managing todos
+
+You can list your todos (see `wip help todos` for all the options):
+`wip todos -u sowenjub -f "#nomeattoday" -l 10`
 
 ## Development
 

data/bin/console

@@ -3,7 +3,6 @@
 require "bundler/setup"
 require "byebug"
 require "wip"
-require "wip/todo"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/wip.rb

@@ -1,3 +1,6 @@
+require "wip/helpers/graphql_helper"
+require "wip/todo"
+require "wip/user"
 require "wip/version"
 
 module Wip

data/lib/wip/auth.rb

@@ -1,7 +1,7 @@
-require "wip"
-
-class Wip::Auth
-  def self.api_key
-    ENV['WIP_API_KEY']
+module Wip
+  class Auth
+    def self.api_key
+      ENV['WIP_API_KEY']
+    end
   end
 end

data/lib/wip/cli.rb

@@ -7,8 +7,9 @@ class Wip::CLI < Thor
   class_option :verbose, :type => :boolean, :aliases => "-v"
 
   desc "complete [ID]", "Mark a todo as completed"
+  method_option :undo, type: :boolean, aliases: '-u'
   def complete(todo_id)
-    todo = Wip::Todo.complete(todo_id)
+    todo = options.undo ? Wip::Todo.uncomplete(todo_id) : Wip::Todo.complete(todo_id)
     puts todo.description
   end
 
@@ -18,9 +19,29 @@ class Wip::CLI < Thor
     puts todo.description
   end
 
+  desc "delete [ID]", "Delete a todo"
+  def delete(todo_id)
+    todo = Wip::Todo.delete(todo_id)
+    puts todo.description
+  end
+
   desc "todo [BODY]", "Create a new todo"
   def todo(body)
     todo = Wip::Todo.create(body: body)
     puts todo.description
   end
+
+  desc "todos", "List viewer todos"
+  method_option :completed, type: :boolean, aliases: '-c'
+  method_option :filter, type: :string, aliases: '-f'
+  method_option :limit, type: :numeric, aliases: '-l', default: 5
+  method_option :order, type: :string, aliases: '-o', default: "completed_at:desc"
+  method_option :username, type: :string, aliases: '-u'
+  def todos
+    todos_options = options.slice("completed", "filter", "limit", "order")
+    user = options.username.nil? ? Wip::User.viewer(todos: todos_options) : Wip::User.find(username: options.username, todos: todos_options)
+    user.todos.each do |todo|
+      puts todo.description
+    end
+  end
 end

data/lib/wip/client.rb

@@ -3,7 +3,7 @@ require "uri"
 require "json"
 require "wip"
 require "wip/auth"
-require "byebug"
+
 class Wip::Client
   API_ENDPOINT = "https://wip.co/graphql"
 

data/lib/wip/helpers/graphql_helper.rb

@@ -0,0 +1,11 @@
+module Wip
+  class GraphqlHelper
+    def self.query_conditions(**args)
+      return "" if args.empty?
+      args.collect do |k,v|
+        value = v.kind_of?(String) ? "\"#{v}\"" : v
+        [k, value].join(":")
+      end.join(", ").yield_self{ |s| '(%s)' % s }
+    end
+  end
+end

data/lib/wip/todo.rb

@@ -3,18 +3,27 @@ require "wip"
 require "wip/client"
 
 class Wip::Todo
-  attr_accessor :id, :body, :completed_at
+
+  ATTRIBUTES = %i(id body completed_at)
+
+  attr_accessor *ATTRIBUTES
+  attr_accessor :deleted
   attr_reader :client
 
+  def self.collection_query(**args)
+    conditions = Wip::GraphqlHelper.query_conditions(**args)
+    %{ todos#{conditions} { #{default_selection} } }
+  end
+
+  def self.default_selection
+    ATTRIBUTES.join("\n ")
+  end
+
   def self.find(id)
     client = Wip::Client.new
     find_query = %{
       {
-        todo(id: \"#{id}\") {
-          id
-          body
-          completed_at
-        }
+        todo(id: \"#{id}\") {#{default_selection}}
       }
     }
     client.request find_query
@@ -37,6 +46,18 @@ class Wip::Todo
     todo
   end
 
+  def self.uncomplete(id)
+    todo = find id
+    todo.uncomplete
+    todo
+  end
+
+  def self.delete(id)
+    todo = find id
+    todo.delete
+    todo
+  end
+
 
   def initialize(id: nil, body: nil, completed_at: nil)
     @id = id
@@ -58,7 +79,7 @@ class Wip::Todo
   end
 
   def icon
-    done? ? "✅" : "🚧"
+    deleted ? "🗑" : (done? ? "✅" : "🚧")
   end
 
   def complete
@@ -68,6 +89,13 @@ class Wip::Todo
     end
   end
 
+  def uncomplete
+    client.request uncomplete_query
+    client.data("uncompleteTodo").tap do |params|
+      @completed_at = nil
+    end
+  end
+
   def save
     client.request create_query
     client.data("createTodo").tap do |params|
@@ -75,6 +103,11 @@ class Wip::Todo
     end
   end
 
+  def delete
+    client.request delete_query
+    @deleted = !client.data("deleteTodo").nil?
+  end
+
   private
     def create_query
       %{
@@ -88,6 +121,14 @@ class Wip::Todo
       }
     end
 
+    def delete_query
+      %{
+        mutation deleteTodo {
+          deleteTodo(id: #{id})
+        }
+      }
+    end
+
     def complete_query
       %{
         mutation completeTodo {
@@ -100,6 +141,18 @@ class Wip::Todo
       }
     end
 
+    def uncomplete_query
+      %{
+        mutation uncompleteTodo {
+          uncompleteTodo(id: #{id}) {
+            id
+            body
+            completed_at
+          }
+        }
+      }
+    end
+
     def to_params
       [:body, :completed_at].collect do |key|
         value = send(key).nil? ? "null" : "\"#{send(key)}\""

data/lib/wip/user.rb

@@ -0,0 +1,79 @@
+require "date"
+require "wip"
+require "wip/client"
+
+class Wip::User
+  attr_accessor :avatar_url, :best_streak, :completed_todos_count, :first_name, :id, :last_name, :streak, :streaking, :time_zone, :url, :username, :todos
+
+  def self.default_selection(todos: {})
+    todos_selection = Wip::Todo.collection_query(**todos)
+    %{
+      avatar_url
+      best_streak
+      completed_todos_count
+      first_name
+      id
+      last_name
+      streak
+      streaking
+      time_zone
+      #{todos_selection}
+      url
+      username
+    }
+  end
+
+  def self.viewer(todos: {})
+    client = Wip::Client.new
+    find_query = %{
+      {
+        viewer {#{default_selection(todos: todos)}}
+      }
+    }
+    client.request find_query
+    parse client.data("viewer")
+  end
+
+  def self.find(id = nil, username: nil, todos: {})
+    client = Wip::Client.new
+    find_by = id.nil? ? "username: \"#{username}\"" : "id: #{id}"
+    find_query = %{
+      {
+        user(#{find_by}) {#{default_selection(todos: todos)}}
+      }
+    }
+    client.request find_query
+    parse client.data("user")
+  end
+
+  def initialize(avatar_url: nil, best_streak: nil, completed_todos_count: nil, first_name: nil, id: nil, last_name: nil, streak: nil, streaking: nil, time_zone: nil, url: nil, username: nil, todos: [])
+    @avatar_url = avatar_url
+    @best_streak = best_streak
+    @completed_todos_count = completed_todos_count
+    @first_name = first_name
+    @id = id
+    @last_name = last_name
+    @streak = streak
+    @streaking = streaking
+    @time_zone = time_zone
+    @url = url
+    @username = username
+    @todos = todos
+  end
+
+  def self.parse(data)
+    new.tap do |user|
+      data.each do |key, raw_value|
+        value = case key
+        when "id"
+          raw_value.to_i
+        when "todos"
+          raw_value.collect { |v| Wip::Todo.parse v }
+        else
+          raw_value
+        end
+        user.send("#{key}=", value)
+      end
+    end
+  end
+end

data/lib/wip/version.rb

@@ -1,3 +1,3 @@
 module Wip
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wip-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Arnaud Joubay
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -89,7 +89,9 @@ files:
 - lib/wip/auth.rb
 - lib/wip/cli.rb
 - lib/wip/client.rb
+- lib/wip/helpers/graphql_helper.rb
 - lib/wip/todo.rb
+- lib/wip/user.rb
 - lib/wip/version.rb
 - wip-cli.gemspec
 homepage: https://github.com/sowenjub/wip-cli