Skip to content
This repository has been archived by the owner on Mar 16, 2022. It is now read-only.

Commit

Permalink
Improve formating using Rubocop
Browse files Browse the repository at this point in the history
  • Loading branch information
@madeindjs
madeindjs committed Mar 20, 2019
1 parent e7d894c commit 22c1a90
Show file tree
Hide file tree
Showing 10 changed files with 175 additions and 189 deletions.
10 changes: 5 additions & 5 deletions bin/todotxt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env ruby

libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
libdir = File.join(File.dirname(File.dirname(__FILE__)), 'lib')
$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)

args = ARGV.clone

#if args.empty?
#args.push "ls"
#end
# if args.empty?
# args.push "ls"
# end

require "todotxt"
require 'todotxt'
Todotxt::CLI.start(args)
16 changes: 8 additions & 8 deletions lib/todotxt.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)

module Todotxt
autoload :Todo, "todotxt/todo"
autoload :TodoList, "todotxt/todolist"
autoload :TodoFile, "todotxt/todofile"
autoload :CLI, "todotxt/cli"
autoload :CLIHelpers, "todotxt/clihelpers"
autoload :Config, "todotxt/config"
autoload :Todo, 'todotxt/todo'
autoload :TodoList, 'todotxt/todolist'
autoload :TodoFile, 'todotxt/todofile'
autoload :CLI, 'todotxt/cli'
autoload :CLIHelpers, 'todotxt/clihelpers'
autoload :Config, 'todotxt/config'
end

require "todotxt/regex"
require "todotxt/version"
require 'todotxt/regex'
require 'todotxt/version'
162 changes: 81 additions & 81 deletions lib/todotxt/cli.rb
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,41 @@
require "thor"
require "rainbow"
require "chronic"
require "parseconfig"
require 'thor'
require 'rainbow'
require 'chronic'
require 'parseconfig'

module Todotxt
CFG_PATH = File.expand_path("~/.todotxt.cfg")
CFG_PATH = File.expand_path('~/.todotxt.cfg')

class CLI < Thor
include Thor::Actions
include Todotxt::CLIHelpers

def self.source_root
File.join File.dirname(__FILE__), "..", "..", "conf"
File.join File.dirname(__FILE__), '..', '..', 'conf'
end

def initialize(*args)
super
# Allow testing colors, rainbow usually detects whether
# the output goes to a TTY, but Aruba/Cucumber is not a
# the output goes to a TTY, but Aruba/Cucumber is not a
# TTY, so we enforce it here, based on an environment var
Sickill::Rainbow.enabled = true if ENV["FORCE_COLORS"] == "TRUE"
Sickill::Rainbow.enabled = true if ENV['FORCE_COLORS'] == 'TRUE'

# Open config file and render config.
@config = Config.new options
@list = nil
unless ["help", "generate_config", "generate_txt"].include? ARGV[0]
unless %w[help generate_config generate_txt].include? ARGV[0]
ask_and_create @config unless @config.file_exists?
if @config.deprecated? and options[:file]
error_and_exit "You are using an old config, which has no support for mulitple files. Please update your configuration."
if @config.deprecated? && options[:file]
error_and_exit 'You are using an old config, which has no support for mulitple files. Please update your configuration.'
end

ask_and_create @config.file unless @config.file.exists?
@list = TodoList.new @config.file
end

end

class_option :file, :type => :string, :desc => "Use a different file than todo.txt
class_option :file, type: :string, desc: "Use a different file than todo.txt
E.g. use 'done' to have the action performed on the file you set for 'done' in the todotxt
configuration under [files]."

Expand All @@ -46,57 +45,57 @@ def initialize(*args)
# Listing
#

desc "list | ls [SEARCH]", "List all todos, or todos matching SEARCH"
method_option :done, :type => :boolean, :aliases => "-d", :desc => "Include todo items that have been marked as done"
method_option :simple, :type => :boolean, :desc => "Simple output (for scripts, etc)"
method_option :all, :type => :boolean, :aliases => "-a", :desc => "List items from all files"
def list search=""
desc 'list | ls [SEARCH]', 'List all todos, or todos matching SEARCH'
method_option :done, type: :boolean, aliases: '-d', desc: 'Include todo items that have been marked as done'
method_option :simple, type: :boolean, desc: 'Simple output (for scripts, etc)'
method_option :all, type: :boolean, aliases: '-a', desc: 'List items from all files'
def list(search = '')
if options[:all]
@config.files.each do |file|
count = @list.todos.count || 0
@list.todos += TodoList.new(file[1], count).todos unless file[0] == "todo"
@list.todos += TodoList.new(file[1], count).todos unless file[0] == 'todo'
end
end

@list.filter(search, :with_done => (options[:done] ? true : false))
render_list :simple => !!options[:simple]
@list.filter(search, with_done: (options[:done] ? true : false))
render_list simple: !!options[:simple]
end
map "ls" => :list
map 'ls' => :list

desc "lsdone | lsd", "List all done items"
def lsdone search=""
@list.filter(search, :only_done => true)
desc 'lsdone | lsd', 'List all done items'
def lsdone(search = '')
@list.filter(search, only_done: true)

render_list
end
map "lsd" => :lsdone
map 'lsd' => :lsdone

desc "listproj | lsproj", "List all projects"
desc 'listproj | lsproj', 'List all projects'
def listproj
@list.projects.each { |p| say p }
end
map "lsproj" => :listproj
map 'lsproj' => :listproj

desc "lscon | lsc", "List all contexts"
desc 'lscon | lsc', 'List all contexts'
def lscon
@list.contexts.each { |c| say c }
end
map "lsc" => :lscon
map 'lsc' => :lscon

desc "due", "List due items"
desc 'due', 'List due items'
def due
if ENV["date"] # Allow testing to "freeze" the date
today = DateTime.parse(ENV["date"]).to_date
else
today = DateTime.now.to_date
end
today = if ENV['date'] # Allow testing to "freeze" the date
DateTime.parse(ENV['date']).to_date
else
DateTime.now.to_date
end

puts "Due today (#{today.strftime("%Y-%m-%d")})".bright
puts "Due today (#{today.strftime('%Y-%m-%d')})".bright
@list.on_date(today).each { |todo| puts format_todo(todo) }
puts "\nPast-due items".bright
@list.before_date(today).each { |todo| puts format_todo(todo) }
puts "\nDue 7 days in advance".bright
((today+1)..(today+7)).each do |day|
((today + 1)..(today + 7)).each do |day|
@list.on_date(day).each { |todo| puts format_todo(todo) }
end
end
Expand All @@ -105,7 +104,7 @@ def due
# Todo management
#

desc "add | a TEXT", "Add a new Todo item"
desc 'add | a TEXT', 'Add a new Todo item'
def add(str, *str2)
string = "#{str} #{str2.join(' ')}"
todo = @list.add string
Expand All @@ -114,10 +113,10 @@ def add(str, *str2)

@list.save
end
map "a" => :add
map 'a' => :add

desc "do ITEM#[, ITEM#, ITEM#, ...]", "Mark ITEM# as done"
def do line1, *lines
desc 'do ITEM#[, ITEM#, ITEM#, ...]', 'Mark ITEM# as done'
def do(line1, *lines)
lines.unshift(line1).each do |line|
todo = @list.find_by_line line
if todo
Expand All @@ -131,8 +130,8 @@ def do line1, *lines
end
end

desc "undo | u ITEM#[, ITEM#, ITEM#, ...]", "Mark ITEM# item as not done"
def undo line1, *lines
desc 'undo | u ITEM#[, ITEM#, ITEM#, ...]', 'Mark ITEM# item as not done'
def undo(line1, *lines)
lines.unshift(line1).each do |line|
todo = @list.find_by_line line
if todo
Expand All @@ -145,10 +144,10 @@ def undo line1, *lines
end
end
end
map "u" => :undo
map 'u' => :undo

desc "pri | p ITEM# PRIORITY", "Set priority of ITEM# to PRIORITY"
def pri line, priority
desc 'pri | p ITEM# PRIORITY', 'Set priority of ITEM# to PRIORITY'
def pri(line, priority)
todo = @list.find_by_line line
if todo
todo.prioritize priority
Expand All @@ -159,10 +158,10 @@ def pri line, priority
error "No todo found at line #{line}"
end
end
map "p" => :pri
map 'p' => :pri

desc "dp | depri ITEM#[, ITEM#, ITEM#, ...]", "Remove priority for ITEM#"
def dp line1, *lines
desc 'dp | depri ITEM#[, ITEM#, ITEM#, ...]', 'Remove priority for ITEM#'
def dp(line1, *lines)
lines.unshift(line1).each do |line|
todo = @list.find_by_line line
if todo
Expand All @@ -175,10 +174,10 @@ def dp line1, *lines
end
end
end
map "depri" => :dp
map 'depri' => :dp

desc "append | app ITEM# STRING", "Append STRING to ITEM#"
def append line, str, *str2
desc 'append | app ITEM# STRING', 'Append STRING to ITEM#'
def append(line, str, *str2)
string = "#{str} #{str2.join(' ')}"
todo = @list.find_by_line line
if todo
Expand All @@ -190,10 +189,10 @@ def append line, str, *str2
error "No todo found at line #{line}"
end
end
map "app" => :append
map 'app' => :append

desc "prepend | prep ITEM# STRING", "Prepend STRING to ITEM#"
def prepend line, str, *str2
desc 'prepend | prep ITEM# STRING', 'Prepend STRING to ITEM#'
def prepend(line, str, *str2)
string = "#{str} #{str2.join(' ')}"
todo = @list.find_by_line line
if todo
Expand All @@ -205,10 +204,10 @@ def prepend line, str, *str2
error "No todo found at line #{line}"
end
end
map "prep" => :prepend
map 'prep' => :prepend

desc "replace ITEM# TEXT", "Completely replace ITEM# text with TEXT"
def replace line, str, *str2
desc 'replace ITEM# TEXT', 'Completely replace ITEM# text with TEXT'
def replace(line, str, *str2)
string = "#{str} #{str2.join(' ')}"
todo = @list.find_by_line line
if todo
Expand All @@ -221,16 +220,16 @@ def replace line, str, *str2
end
end

desc "del | rm ITEM#[, ITEM#, ITEM#, ...]", "Remove ITEM#"
method_option :force, :type => :boolean, :aliases => "-f", :desc => "Don't confirm removal"
def del line1, *lines
desc 'del | rm ITEM#[, ITEM#, ITEM#, ...]', 'Remove ITEM#'
method_option :force, type: :boolean, aliases: '-f', desc: "Don't confirm removal"
def del(line1, *lines)
lines.unshift(line1).each do |line|
todo = @list.find_by_line line
if todo
say format_todo(todo)
if options[:force] || yes?("Remove this item? [y/N]")
if options[:force] || yes?('Remove this item? [y/N]')
@list.remove line
notice "Removed from list"
notice 'Removed from list'

@list.save
end
Expand All @@ -239,15 +238,15 @@ def del line1, *lines
end
end
end
map "rm" => :del
map 'rm' => :del

desc "edit", "Open todo.txt file in your default editor"
desc 'edit', 'Open todo.txt file in your default editor'
def edit
Kernel.system "#{@config.editor} #{@config.file.path}"
end

desc "move | mv ITEM#[, ITEM#, ITEM#, ...] file", "Move ITEM# to another file"
def move line1, *lines, other_list_alias
desc 'move | mv ITEM#[, ITEM#, ITEM#, ...] file', 'Move ITEM# to another file'
def move(line1, *lines, other_list_alias)
if @config.files[other_list_alias].nil?
error_and_exit "File alias #{other_list_alias} not found"
else
Expand All @@ -268,41 +267,42 @@ def move line1, *lines, other_list_alias
end
end
end
map "mv" => :move
map 'mv' => :move

#
# File generation
#

desc "generate_config", "Create a .todotxt.cfg file in your home folder, containing the path to todo.txt"
desc 'generate_config', 'Create a .todotxt.cfg file in your home folder, containing the path to todo.txt'
def generate_config
copy_file "todotxt.cfg", Config.config_path
puts ""
copy_file 'todotxt.cfg', Config.config_path
puts ''
end

desc "generate_txt", "Create a sample todo.txt"
desc 'generate_txt', 'Create a sample todo.txt'
def generate_txt
copy_file "todo.txt", @file
puts ""
copy_file 'todo.txt', @file
puts ''
end

#
# Extras
#

desc "version", "Show todotxt version"
desc 'version', 'Show todotxt version'
def version
say "todotxt #{VERSION}"
end

private
def render_list opts={}
private

def render_list(opts = {})
numsize = @list.count + 1
numsize = numsize.to_s.length + 0

@list.each do |t|
if opts[:simple]
say "#{t.line} #{t.to_s}"
say "#{t.line} #{t}"
else
say format_todo(t, numsize)
end
Expand All @@ -314,14 +314,14 @@ def render_list opts={}
end

# File should respond_to "basename", "path" and "generate!"
def ask_and_create file
def ask_and_create(file)
puts "#{file.basename} doesn't exist yet. Would you like to generate a sample file?"
confirm_generate = yes? "Create #{file.path}? [y/N]"

if confirm_generate
file.generate!
else
puts ""
puts ''
exit
end
end
Expand Down
Loading

0 comments on commit 22c1a90

Please sign in to comment.