ineedto 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb0030ac1307cc4a2bab127d24df4c1c597807e66c46aba53aa1954a038d58b
-  data.tar.gz: 6fbe9187814d46efd74fee99cee557062161bfb6aecd759459a202ba9d76c5da
+  metadata.gz: b82885942b51f481340652730bee824d8e6a2ab92a8fea6fe96e11e5b7a68dc4
+  data.tar.gz: 20b160d9ff7726c1b779e6f6cde1e0a99065d0853eb095aea70e8b98c409c479
 SHA512:
-  metadata.gz: b2052b6f4a010b475cc52f7e026f3352c6e9fd16d731d3e8573f9783b7731051d79279495131c0ff3af150f7773e8278eab9291faa91b4d43612f197805be793
-  data.tar.gz: d9a2a9bb02121fd4200a3d4cf36bd4ff79629f998ea3c601f0d0d598be4573705aee5f14bab8c673e6293c1628e1f28eb723e29704afa20f79e4ab3738764294
+  metadata.gz: b4bbc32083fb398c11366c0c2765d556a37efdab9eebb693eab926f85f2b7202902d8cd649f9e9ab302ac97d7ddfed00406e7c4b128372fe884f6ffa79bcde3e
+  data.tar.gz: 8e44ecf516f1e426a535ff11458471371ff57c0391ee73d9bbace5ec8fc4a07577d577ea21a21685164b30e7840c869854872d82b7b1935167be8ee08d1ef442

data/bin/ineedto

@@ -26,30 +26,40 @@ end unless DB.table_exists?(:todos)
 cmd = case ARGV.first
 when "new"
   ARGV.shift
-  Cmd::NewTask.new(DB, logger, STDOUT, STDERR)
+  Cmd::NewTask.new(DB)
 when "complete"
   ARGV.shift
-  Cmd::CompleteTask.new(DB, logger, STDOUT, STDERR)
+  Cmd::CompleteTask.new(DB)
 when "list"
   ARGV.shift
-  Cmd::ListTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::ListTasks.new(DB)
 when "pending"
   ARGV.shift
-  Cmd::PendingTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::PendingTasks.new(DB)
 when "completed"
   ARGV.shift
-  Cmd::CompletedTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::CompletedTasks.new(DB)
 when "search"
   ARGV.shift
-  Cmd::SearchTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::SearchTasks.new(DB)
 when "today"
   ARGV.shift
-  Cmd::TodayTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::TodayTasks.new(DB)
 when "clean"
   ARGV.shift
-  Cmd::CleanTasks.new(DB, logger, STDOUT, STDERR)
+  Cmd::CleanTasks.new(DB)
 else
-  Cmd::Root.new(logger, STDOUT, STDERR)
+  Cmd::Root.new
+end
+
+begin
+  puts cmd.(ARGV)
+rescue Cmd::CmdError => e
+  puts e.message
+  exit(1)
+rescue => e 
+  puts "Failed to execute cmd"
+  puts e
+  exit(1)
 end
 
-cmd.(ARGV) 

data/lib/cmd.rb

@@ -9,6 +9,8 @@ require_relative 'cmd/today'
 require_relative 'cmd/clean'
 
 module Cmd
-  VERSION = "0.0.1"
+  class CmdError < StandardError; end
+
+  VERSION = "0.0.2"
   DATE_FORMAT = "%Y-%m-%d"
 end

data/lib/cmd/clean.rb

@@ -3,37 +3,31 @@ require 'terminal-table'
 
 module Cmd
   class CleanTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
-      _ = parse(argv)
-      todos = @db[:todos].delete
-      @stdout.puts("Tasks cleaned up succesffully")
+      parse(argv)
+      @out || begin
+        todos = @db[:todos].delete
+        "Tasks cleaned up succesffully"
+      end
     end
 
     private
 
     def parse(args)
-      options = {}
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: ineedto clean"
 
         opts.on("-h", "--help", "Show help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
       end
       parser.parse!(args)
-      options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/complete.rb

@@ -3,22 +3,21 @@ require 'optparse'
 
 module Cmd
   class CompleteTask
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(args)
       options = parse(args)
-      todo = @db[:todos].where(id: options[:id]).first
-      if todo.nil?
-        @stderr.puts "Not found"
-        exit(1)
+      @out || begin 
+        todo = @db[:todos].where(id: options[:id]).first
+        if todo.nil?
+          "Not found"
+        else
+          @db[:todos].where(id: options[:id]).update(done: true, completed_on: Date.today)
+          "Task completed"
+        end
       end
-      @db[:todos].where(id: options[:id]).update(done: true, completed_on: Date.today)
-      @stdout.puts "Task completed"
     end
 
     private
@@ -29,8 +28,7 @@ module Cmd
         opts.banner = "Usage: ineedto complete"
 
         opts.on("--h", "--help", "Show this help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
 
         opts.on("-t ID", "--task ID", Integer, "Task to complete") do |id|
@@ -39,10 +37,8 @@ module Cmd
       end
       parser.parse!(args)
       options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/completed.rb

@@ -3,24 +3,22 @@ require 'terminal-table'
 
 module Cmd
   class CompletedTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
-      _ = parse(argv)
-      todos = @db[:todos].where(done: true).all
-      table = Terminal::Table.new do |t|
-        t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
-        todos.each do |todo|
-          t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on].strftime(DATE_FORMAT)]
+      parse(argv)
+      @out || begin 
+        todos = @db[:todos].where(done: true).all
+        table = Terminal::Table.new do |t|
+          t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
+          todos.each do |todo|
+            t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on].strftime(DATE_FORMAT)]
+          end
         end
+        table
       end
-
-      @stdout.puts(table)
     end
 
     private
@@ -31,16 +29,13 @@ module Cmd
         opts.banner = "Usage: todo completed"
 
         opts.on("-h", "--help", "Show help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
       end
       parser.parse!(args)
       options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/list.rb

@@ -3,44 +3,38 @@ require 'terminal-table'
 
 module Cmd
   class ListTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
-      _ = parse(argv)
-      todos = @db[:todos].all
-      table = Terminal::Table.new do |t|
-        t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
-        todos.each do |todo|
-          t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+      parse(argv)
+      @out || begin
+        todos = @db[:todos].all
+        table = Terminal::Table.new do |t|
+          t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
+          todos.each do |todo|
+            t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+          end
         end
-      end
 
-      @stdout.puts(table)
+        table
+      end
     end
 
     private
 
     def parse(args)
-      options = {}
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: ineedto list"
 
         opts.on("-h", "--help", "Show help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
       end
       parser.parse!(args)
-      options
     rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/new.rb

@@ -18,39 +18,36 @@ module Cmd
   end
 
   class NewTask
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
       @contract = NewTaskContract.new
+      @out = nil
     end
 
     def call(args)
       options = parse(args)
-      errors = @contract.(options).errors(full: true).to_h
-      unless errors.empty?
-        table = Terminal::Table.new do |t|
-          errors.each do |field, errors|
-            row = []
-            row.push(field)
-            errors.each do |err|
-              row.push(err)
+      @out || begin 
+        errors = @contract.(options).errors(full: true).to_h
+        unless errors.empty?
+          table = Terminal::Table.new do |t|
+            errors.each do |field, errors|
+              row = []
+              row.push(field)
+              errors.each do |err|
+                row.push(err)
+              end
+              t.add_row(row)
             end
-            t.add_row(row)
           end
+          "Failed to create task\n" + table.to_s
+        else
+          options[:done] = false
+          @db[:todos].insert(options)
+          "Task added successfully"
         end
-        @stderr.puts "Failed to create task"
-        @stderr.puts table
-        return
       end
-      options[:done] = false
-      @db[:todos].insert(options)
-      @stdout.puts "Task added successfully"
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
 
     private
@@ -61,8 +58,7 @@ module Cmd
         opts.banner = "Usage: ineedto new"
 
         opts.on("-h", "--help", "Prints this help") do
-          puts opts
-          exit
+          @out = opts.help
         end
 
         opts.on("-n", "--name NAME", "Task Name") do |name|
@@ -79,10 +75,8 @@ module Cmd
       end
       parser.parse(args)
       options
-    rescue => e
-      @stderr.puts("Failed to parse arguments")
-      @logger.debug(e.message)
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/pending.rb

@@ -4,44 +4,38 @@ require 'terminal-table'
 
 module Cmd
   class PendingTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
-      _ = parse(argv)
-      todos = @db[:todos].where(done: false).all
-      table = Terminal::Table.new do |t|
-        t.headings = ["ID", "Priority", "Name", "Done", "Due Date"]
-        todos.each do |todo|
-          t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT)]
+      parse(argv)
+      @out || begin
+        todos = @db[:todos].where(done: false).all
+        table = Terminal::Table.new do |t|
+          t.headings = ["ID", "Priority", "Name", "Done", "Due Date"]
+          todos.each do |todo|
+            t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT)]
+          end
         end
-      end
 
-      @stdout.puts(table)
+        table
+      end
     end
 
     private
 
     def parse(args)
-      options = {}
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: ineedto pending"
 
         opts.on("-h", "--help", "Show help and exit") do
-          puts opts
-          exit(0)
+          @out = opts.help
         end
       end
       parser.parse!(args)
-      options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/root.rb

@@ -2,32 +2,22 @@ require 'optparse'
 
 module Cmd
   class Root
-    def initialize(logger, stdout, stderr)
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
-    end
-
     def call(args)
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: ineedto [new|complete|list|pending|completed|today|search]"
 
         opts.on("-h", "--help", "Prints this help") do
-          @stdout.opts
-          exit
+          @out = opts.help
         end
 
         opts.on("-v", "--version", "Prints version") do
-          @stdout.puts VERSION
-          exit
+          @out = VERSION
         end
       end
       parser.parse!(args)
-      @stdout.puts parser
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+      @out || parser.help
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/search.rb

@@ -5,24 +5,23 @@ require 'sequel'
 
 module Cmd
   class SearchTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
       options = parse(argv)
-      todos = @db[:todos].where(Sequel.ilike(:name, "%#{options[:q]}%")).all
-      table = Terminal::Table.new do |t|
-        t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
-        todos.each do |todo|
-          t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+      @out || begin 
+        todos = @db[:todos].where(Sequel.ilike(:name, "%#{options[:q]}%")).all
+        table = Terminal::Table.new do |t|
+          t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
+          todos.each do |todo|
+            t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+          end
         end
-      end
 
-      @stdout.puts(table)
+        table
+      end
     end
 
     private
@@ -33,8 +32,7 @@ module Cmd
         opts.banner = "Usage: ineedto search"
 
         opts.on("-h", "--help", "Show help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
 
         opts.on("-q", "--query [QUERY]", "Search tasks using q") do |q|
@@ -43,10 +41,8 @@ module Cmd
       end
       parser.parse!(args)
       options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

data/lib/cmd/today.rb

@@ -3,44 +3,38 @@ require 'terminal-table'
 
 module Cmd
   class TodayTasks
-    def initialize(db, logger, stdout, stderr)
+    def initialize(db)
       @db = db
-      @logger = logger
-      @stdout = stdout
-      @stderr = stderr
     end
 
     def call(argv)
-      _ = parse(argv)
-      todos = @db[:todos].where(due_date: Date.today).all
-      table = Terminal::Table.new do |t|
-        t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
-        todos.each do |todo|
-          t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+      parse(argv)
+      @out || begin 
+        todos = @db[:todos].where(due_date: Date.today).all
+        table = Terminal::Table.new do |t|
+          t.headings = ["ID", "Priority", "Name", "Done", "Due Date", "Completed On"]
+          todos.each do |todo|
+            t.add_row [todo[:id], todo[:priority], todo[:name], todo[:done], todo[:due_date].strftime(DATE_FORMAT), todo[:completed_on] && todo[:completed_on].strftime(DATE_FORMAT)]
+          end
         end
-      end
 
-      @stdout.puts(table)
+        table
+      end
     end
 
     private
 
     def parse(args)
-      options = {}
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: ineedto today"
 
         opts.on("-h", "--help", "Show help and exit") do
-          @stdout.puts opts
-          exit(0)
+          @out = opts.help
         end
       end
       parser.parse!(args)
-      options
-    rescue => e
-      @stderr.puts e.message
-      @stderr.puts parser
-      exit(1)
+    rescue OptionParser::ParseError => e
+      raise CmdError, e.message
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ineedto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Filip Kostovski