todotxt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjE5ZGQyNjI2ODg5YzBhNGM3MDBlNjAzZDhkN2I4YTEwMDcxZDA2NA==
-  data.tar.gz: !binary |-
-    ZGY2NmJiOTM2OWUxMzUzMjFkYmZmMzE1NGJlMGQ1OGU2ZWZmZjNhYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGU5YTU3YjIwNmU3YTNmNzg4ZTlhNDczMmJjZGI5YTE2OTFkY2JmYTM3MDNm
-    MTBhNjliYThhOTk4YjdmODM1ZGM4MTEyYmQwNzRkMDU0Y2IzNjVjMTg3YjBh
-    ZTdiZDIyMjZiODg3YjAzMzRhZmM0YjdjNGFkYzZmNjA4Y2JlOTI=
-  data.tar.gz: !binary |-
-    MjFiMTU5YzIxNjMxMTZlZTlhZmIxYTRmZmFkMTAzMzY3NmM2OGQ2NDJjYWY3
-    N2ExMDgwZThjMGJhODk0NmJmNTM5Nzc0N2IxNTJiMWM1ODcwYzY5ZjFlMDAy
-    NWI0MmEwNjcxMzNmMDJlNjZlMWY4ZTM1NGEwNGQwOWEyZDU2YjA=
+SHA256:
+  metadata.gz: 21a772c6a03508479892cd47bd8b75e9d6161a369340d9d42991ffac17c18267
+  data.tar.gz: 9f8ee70e7841c6684360964dbcd3dfc23be934fdcfc314160073d5dda66244cf
+SHA512:
+  metadata.gz: f6fc1646f58339be5635fb1021301374dbb4a524de107b0689c3910cadffcf757e392de8c7aa61e4745ecb82425f00acd70f5f128a7b393597cfd9a6a1f92249
+  data.tar.gz: 1f180c48442d392b95b6875fe27d4cd8fd8f6941c4825a4c38be05d3343cdf5c77ff4e809900846ee7c7f5cbb7550225cc94dfdcff7c1b813fd8a253d90e5d21

data/.gitignore

@@ -4,3 +4,5 @@ Gemfile.lock
 pkg/*
 coverage/*
 tmp/*
+doc/
+.yardoc/

data/README.md

@@ -38,27 +38,49 @@ The gem will install a command, `todotxt` which is used to interact with your
 todo.txt.
 
     Tasks:
-      todotxt add | a TEXT                           # Add a new Todo item
-      todotxt append | app ITEM# STRING              # Append STRING to ITEM#
-      todotxt del | rm ITEM#[, ITEM#, ITEM#, ...]    # Remove ITEM#
-      todotxt do ITEM#[, ITEM#, ITEM#, ...]          # Mark ITEM# as done
-      todotxt dp | depri ITEM#[, ITEM#, ITEM#, ...]  # Remove priority for ITEM#
-      todotxt edit                                   # Open todo.txt file in your default editor
-      todotxt generate_txt                           # Create a sample todo.txt
-      todotxt generate_config                        # Create a .todotxt.cfg file in your home folder, containing the path to todo.txt
-      todotxt help [TASK]                            # Describe available tasks or one specific task
-      todotxt list | ls [SEARCH]                     # List all todos, or todos matching SEARCH
-      todotxt listproj | lsproj                      # List all projects
-      todotxt lscon | lsc                            # List all contexts
-      todotxt lsdone | lsd                           # List all done items
-      todotxt prepend | prep ITEM# STRING            # Prepend STRING to ITEM#
-      todotxt pri | p ITEM# PRIORITY                 # Set priority of ITEM# to PRIORITY
-      todotxt replace ITEM# TEXT                     # Completely replace ITEM# text with TEXT
-      todotxt undo | u ITEM#[, ITEM#, ITEM#, ...]    # Mark ITEM# item as not done
-      todotxt version                                # Show todotxt version    
+      todotxt add | a TEXT                               # Add a new Todo item
+      todotxt append | app ITEM# STRING                  # Append STRING to ITEM#
+      todotxt del | rm ITEM#[, ITEM#, ITEM#, ...]        # Remove ITEM#
+      todotxt do ITEM#[, ITEM#, ITEM#, ...]              # Mark ITEM# as done
+      todotxt dp | depri ITEM#[, ITEM#, ITEM#, ...]      # Remove priority for ITEM#
+      todotxt due                                        # List due items
+      todotxt edit                                       # Open todo.txt file in your default editor
+      todotxt generate_config                            # Create a .todotxt.cfg file in your home folder, containing the path to todo.txt
+      todotxt generate_txt                               # Create a sample todo.txt
+      todotxt help [TASK]                                # Describe available tasks or one specific task
+      todotxt list | ls [SEARCH]                         # List all todos, or todos matching SEARCH
+      todotxt listproj | lsproj                          # List all projects
+      todotxt lscon | lsc                                # List all contexts
+      todotxt lsdone | lsd                               # List all done items
+      todotxt move | mv ITEM#[, ITEM#, ITEM#, ...] file  # Move ITEM# to another file
+      todotxt prepend | prep ITEM# STRING                # Prepend STRING to ITEM#
+      todotxt pri | p ITEM# PRIORITY                     # Set priority of ITEM# to PRIORITY
+      todotxt replace ITEM# TEXT                         # Completely replace ITEM# text with TEXT
+      todotxt undo | u ITEM#[, ITEM#, ITEM#, ...]        # Mark ITEM# item as not done
+      todotxt version                                    # Show todotxt version
 
 Calling simply `todotxt` will automatically run the `ls` command.
 
+You can pass the option `--file=` to point todotxt to another file. You
+can pass an alias, defined in the configuration, or the path to an
+arbitrary file.
+
+With a file wishlist, in the configuration defined as "wishlist", you
+can run:
+
+    todotxt ls --file=wishlist
+
+To list all items form this wishlist file. Alternatively you can run:
+
+    todotxt ls --file="~/Dropbox/todo/deferred.txt"
+
+To list all items from the file deferred.txt, provided that file
+exists.
+
+In order to list all items from all files defined in the config, use the
+`--all` flag with ls:
+
+    todotxt ls --all
 
 ## Screenshot
 

data/Rakefile

@@ -1,8 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*_spec.rb'
-end
-
+RSpec::Core::RakeTask.new(:spec)
 task :default => [:spec]

data/bin/todotxt

@@ -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)

data/features/edit.feature

@@ -13,7 +13,7 @@ Feature: Edit
       | 2012-12-12 Buy GTD book @amazon +wishlist |
 
   Scenario: Open the file in the systems editor
-    Given the enviromnent variable "EDITOR" is set to "echo"
+    Given the environment variable "EDITOR" is set to "echo"
     And a default config exists
     When I run `todotxt edit`
     Then it should pass with:

data/features/files.feature

@@ -0,0 +1,53 @@
+Feature: Files
+
+  So that I can organise my Todo-items better
+  As a user
+  I want to use different files
+
+  Background:
+    Given a config exists with the following files:
+      | alias    | path         |
+      | todo     | todo.txt     | 
+      | wishlist | wishlist.txt | 
+    And a todofile with the following items exists:
+      | todo                     | 
+      | Read book on GTD         | 
+      | Publish wishlist on site | 
+    And a todofile named "wishlist.txt" with the following items exists:
+      | todo                               |
+      | Getting Things Done @bookstore     |
+      | Label Maker @officesupply          |
+
+  Scenario: Run list with --files option
+    When I run `todotxt list --file=wishlist`
+    Then it should pass with:
+      """
+      Getting Things Done @bookstore
+      """
+
+  Scenario: Provide a file that is not in the config
+    When I run `todotxt list --file=doesnotexist` interactively
+    Then it should fail with:
+      """
+      \"doesnotexist\" is not defined in the config
+      """
+
+  Scenario: Run list with --files option and a filename for a file not in the config
+    Given a todofile named "deferred.txt" with the following items exists:
+      | todo                               |
+      | Getting Things Done @bookstore     |
+    When I run `todotxt list --file=./deferred.txt`
+    Then it should pass with:
+      """
+      Getting Things Done @bookstore
+      """
+
+  Scenario: List entries from all files
+    When I run `todotxt list --all`
+    Then it should pass with:
+      """
+      1. Read book on GTD
+      2. Publish wishlist on site
+      3. Getting Things Done @bookstore
+      4. Label Maker @officesupply
+      """

data/features/initialize.feature

@@ -60,14 +60,3 @@ Feature: Initialize
     When I run `todotxt` interactively
     And I type "no"
     Then a file named "todo.txt" should not exist
-
-  Scenario: Running with an old config-file still works
-    Given an old config exists
-    And a todofile with the following items exists:
-       | todo                  | 
-       | Update my config file | 
-    When I run `todotxt`
-    Then it should pass with:
-      """
-      1. Update my config file
-      """

data/features/move.feature

@@ -25,6 +25,19 @@ Feature: move
     And the file "todo.txt" should not contain "Getting Things Done @bookstore"
     And the file "wishlist.txt" should contain "Getting Things Done @bookstore"
 
+  Scenario: Move an item from wishlist.txt to todo.txt
+    Given a todofile named "wishlist.txt" with the following items exists:
+       | todo                   |
+       | x Archive todotxt @gtd |
+    When I run `todotxt move 1 todo --file=wishlist`
+    Then it should pass with:
+      """
+      1. x Archive todotxt @gtd
+      => Moved to todo.txt
+      """
+    And the file "wishlist.txt" should not contain "x Archive todotxt @gtd"
+    And the file "todo.txt" should contain "x Archive todotxt @gtd"
+
   Scenario: Move an illegal item
     When I run `todotxt move 1337 wishlist`
     Then it should pass with:

data/features/step_definitions/environment_steps.rb

@@ -29,19 +29,23 @@ Given /^a todofile with done items exists$/ do
   write_file("todo.txt", "Read documentation for todotxt\nx Install todotxt\nWrite cucumber steps for todotxt")
 end
 
-Given /^a todofile with the following items exists:$/ do |todolist|
+Given /^a todofile named "(.*?)" with the following items exists:$/ do |filename, todolist|
   contents = todolist.hashes.map {|row| row["todo"] }.join("\n")
-  write_file("todo.txt", contents)
+  write_file(filename, contents)
+end
+
+Given /^a todofile with the following items exists:$/ do |todolist|
+  step %{a todofile named "todo.txt" with the following items exists:}, todolist
 end
 
 Given /^an empty todofile named "(.*?)" exists$/ do |filename|
   write_file(filename, "")
 end
 
-Given /^the enviromnent variable "(.*?)" is set to "(.*?)"$/ do |name, value|
+Given /^the environment variable "(.*?)" is set to "(.*?)"$/ do |name, value|
   ENV[name] = value
 end
 
 Given /^the date is "(.*?)"$/ do |date|
-  step %{the enviromnent variable "date" is set to "#{date}"}
+  step %{the environment variable "date" is set to "#{date}"}
 end

data/features/step_definitions/list_steps.rb

@@ -1,6 +1,10 @@
 Then /^I should see all entries from the todofile with numbers$/ do
+  step %{I should see all entries from the todofile named "todo.txt" with numbers}
+end
+
+Then /^I should see all entries from the todofile named "([^"]*)" with numbers$/ do |filename|
   contents = ""
-  File.open(File.join(ENV["HOME"], "todo.txt")).each_line do |line|
+  File.open(File.join(ENV["HOME"], filename)).each_line do |line|
     # matching "1. Do Something"
     contents += "([\\d]\.\\s+)#{Regexp.escape(line.strip)}.*"
   end

data/lib/todotxt.rb

@@ -2,14 +2,15 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+# Todotxt is a Ruby librairy / CLI interface to work with [todo.txt](http://www.todotxt.com) format files.
 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'

data/lib/todotxt/cli.rb

@@ -1,39 +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')
+
   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"
-      @config = Config.new
+      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 multiple files. Please update your configuration.'
         end
 
-        parse_conf
-        ask_and_create @file unless @file.exists?
-        @list = TodoList.new @file
+        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]."
 
@@ -43,49 +45,57 @@ module Todotxt
     # 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)"
-    def list search=""
-      @list.filter(search, :with_done => (options[:done] ? true : false))
-      render_list :simple => !!options[:simple]
+    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'
+        end
+      end
+
+      @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
@@ -94,7 +104,7 @@ module Todotxt
     # 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
@@ -103,10 +113,10 @@ module Todotxt
 
       @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
@@ -120,8 +130,8 @@ module Todotxt
       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
@@ -134,10 +144,10 @@ module Todotxt
         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
@@ -148,10 +158,10 @@ module Todotxt
         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
@@ -164,10 +174,10 @@ module Todotxt
         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
@@ -179,10 +189,10 @@ module Todotxt
         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
@@ -194,10 +204,10 @@ module Todotxt
         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
@@ -210,16 +220,16 @@ module Todotxt
       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
@@ -228,19 +238,19 @@ module Todotxt
         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
-      system "#{@editor} #{@file.path}"
+      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
-      if @files[other_list_alias.to_sym].nil?
+    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
-        other_list = TodoList.new @files[other_list_alias.to_sym]
+        other_list = TodoList.new @config.files[other_list_alias]
       end
 
       lines.unshift(line1).each do |line|
@@ -257,65 +267,42 @@ module Todotxt
         end
       end
     end
-    map "mv" => :move
-
-    desc "move | mv ITEM#[, ITEM#, ITEM#, ...] file", "Move ITEM# to another file"
-    def move line1, *lines, other_list_alias
-      if @files[other_list_alias.to_sym].nil?
-        error_and_exit "File alias #{other_list_alias} not found"
-      else
-        other_list = TodoList.new @files[other_list_alias.to_sym]
-      end
-
-      lines.unshift(line1).each do |line|
-        todo = @list.find_by_line line
-        if todo
-          say format_todo(todo)
-          @list.move line, other_list
-          notice "Moved to #{other_list}"
-
-          other_list.save
-          @list.save
-        else
-          error "No todo found at line #{line}"
-        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
@@ -327,49 +314,16 @@ module Todotxt
     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
-
-    def parse_conf
-      @files = {}
-
-      return if @config.nil?
-
-      # Backwards compatibility with todo_txt_path
-      #   when old variable is still set, and no files=>todo 
-      #   given, fallback to this old version.
-      if @config["todo_txt_path"]
-        @files[:todo] ||= TodoFile.new(@config["todo_txt_path"])
-      else
-        # Fill the @files from settings.
-        @config["files"].each do |name, file_path|
-          unless file_path.empty?
-            @files[name.to_sym] = TodoFile.new(file_path)
-          end
-        end
-      end
-
-      # Determine what file should be activated, set that in @file
-      if options[:file]
-        file_sym = options[:file].to_sym
-        if @files.has_key? file_sym
-          @file = @files[file_sym]
-        end
-      else
-        @file = @files[:todo]
-      end
-
-      # Determine the editor
-      @editor = @config["editor"] || ENV["EDITOR"]
-    end
   end
 end