wlog 1.1.1 → 1.1.5

data/lib/wlog/ui/cli_interface.rb

@@ -1,5 +1,4 @@
 require 'readline'
-require 'turntables'
 require 'wlog/domain/issue'
 require 'wlog/domain/static_configurations'
 require 'wlog/domain/sys_config'
@@ -13,6 +12,8 @@ require 'wlog/commands/archive_issues'
 require 'wlog/commands/archive_finished_issues'
 require 'wlog/commands/delete_issue'
 require 'wlog/ui/issue_ui'
+require 'wlog/ui/template_ui'
+require 'wlog/ui/invoice_ui'
 
 module Wlog
 # @author Simon Symeonidis
@@ -24,7 +25,6 @@ class CliInterface
   # This is the main entry point of the application. Therefore when we init,
   # we want to trigger the table creation stuff.
   def initialize
-    @db = DbRegistry.new(nil)
     @strmaker = SysConfig.string_decorator
   end
 
@@ -43,13 +43,15 @@ class CliInterface
       when /^generateinvoice/ then generate_invoice
       when /^attach/ then attach
       when /^focus/  then focus(cmd)
-      when /^new/    then new_issue
+      when /new/    then new_issue
       when /^(ls|show)/   then show_issues
       when /^outcsv/ then outcsv
       when /^delete/ then delete_issue(cmd)
       when /^help/   then print_help
       when /^search/ then search
       when /^config/ then config
+      when /^templates/ then TemplateUi.new.run
+      when /^invoices/ then InvoiceUi.new.run
       end
     end
   end
@@ -65,34 +67,38 @@ class CliInterface
 private 
  
   # Create a new issue
-  def new_issue; CreateIssue.new(@db).execute end
+  def new_issue; CreateIssue.new.execute end
 
   # Procedure to delete an issue
   def delete_issue(cmd)
     issue_id = cmd.split[1]
 
     if !issue_id
-	   puts 'usage:'
-		puts '  delete <id>'
-	 else 
-	   issue_id = issue_id.to_i
-	 end
-
-    dcmd = DeleteIssue.new(@db, issue_id)
-	 if dcmd
-       choice = Readline.readline("Delete issue #{issue_id}? [y/n]").strip
-		 if choice == "y"
-         dcmd.execute
-		 else 
-		   puts "Did nothing" 
-			return
-       end
-	 end
+      puts 'usage:'
+      puts '  delete <id>'
+    else 
+      issue_id = issue_id.to_i
+    end
+
+    dcmd = DeleteIssue.new(issue_id)
+    if dcmd
+      choice = Readline.readline("Delete issue #{issue_id}? [y/n]").strip
+      if choice == "y"
+        dcmd.execute
+      else 
+        puts "Did nothing" 
+        return
+      end
+    end
+
     puts "No such issue" unless dcmd.deleted?
   end
 
   # Wriet out the data contained in the database of the attachment
   def output_attach
+    puts "Migration of implementation pending" 
+    return
+
     att_id = Readline.readline('Which attachment to output? : ').to_i
     loc = Readline.readline('Output where (abs dir) ? : ')
     loc.chomp!
@@ -104,6 +110,8 @@ private
   end
 
   def show_attach
+    puts "Migration of implementation pending" 
+    return
     issue_id = Readline.readline('Which issue id? : ').to_i
     atts = Attachment.find_all_by_discriminator(@db, Issue.name, issue_id)
     atts.each do |att| 
@@ -118,7 +126,7 @@ private
     if args.length > 0 
       if args[0] == 'finished'
         puts "Archiving finished issues."
-        ArchiveFinishedIssues.new(@db).execute
+        ArchiveFinishedIssues.new.execute
       else # gave ids
         ids = args.map{|sids| sids.to_i}
         issues = ids.map{|id| Issue.find(@db, id)} - [nil]
@@ -132,6 +140,9 @@ private
   end
 
   def attach
+    puts "Migration of implementation pending" 
+    return
+
     issue_id = Readline.readline('Attach to issue id: ').to_i
     loc = Readline.readline('Absolute file location: ')
     loc.strip!
@@ -157,17 +168,17 @@ private
   # Focus on an issue to log work etc
   def focus(cmd)
     issue_id = cmd.split[1]
-	 if !issue_id
-	   puts 'usage: '
-		puts '  focus <id>'
-		return
-	 else
-	   issue_id = issue_id.to_i
-	 end
-
-    issue = Issue.find(@db, issue_id)
+    if !issue_id
+      puts 'usage: '
+      puts '  focus <id>'
+      return
+    else
+      issue_id = issue_id.to_i
+    end
+
+    issue = Issue.find(issue_id)
     if issue
-      IssueUi.new(@db, issue).run
+      IssueUi.new(issue).run
     else 
       puts "No such issue"
     end
@@ -188,23 +199,23 @@ private
     'help',   'print this dialog',
     'end',    'Exit the progam',
     'delete', 'Remove the issue with a given id',
-	 'archive', 'Archive a file into a specific issue',
-	 'showattach', 'Show what files have been attached to an issue',
-	 'outattach', 'Extract a file from the database',
-	 'generateinvoice', 'todo',
-	 'focus', 'Focus on a particular ',
-	 'show', 'List all the issues',
-	 'help', 'Show this information',
-	 'search', 'Search for a specific text',
-	 'config', 'Set differeing configuration parameters'
-	 ].each_with_index do |el,ix| 
+    'archive', 'Archive a file into a specific issue',
+    'showattach', 'Show what files have been attached to an issue',
+    'outattach', 'Extract a file from the database',
+    'generateinvoice', 'todo',
+    'focus', 'Focus on a particular ',
+    'show', 'List all the issues',
+    'help', 'Show this information',
+    'search', 'Search for a specific text',
+    'config', 'Set differeing configuration parameters'
+    ].each_with_index do |el,ix| 
       print '  ' if 1 == ix % 2
       puts el
     end
   end
 
   def show_issues
-    entries_arr = Issue.find_all(@db)
+    entries_arr = Issue.find_not_archived
     print_list(entries_arr)
   end
 
@@ -229,7 +240,7 @@ private
   end
 
   def make_csv
-    cmd = MakeCsv.new(@db)
+    cmd = MakeCsv.new
     cmd.execute
     cmd.ret
   end
@@ -248,7 +259,7 @@ private
   # Search for an issue
   def search
     term = Readline.readline("search issues for term : ")
-    issues = Issue.find_all(@db).select{|el| el.description.match(/#{term}/)}
+    issues = Issue.where(["description like ?", "%#{term}%"]) 
     print_list(issues)
   end
 

data/lib/wlog/ui/commands/create_issue.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'readline'
 require 'wlog/ui/commands/ui_command'
 require 'wlog/domain/issue'
@@ -6,18 +7,13 @@ module Wlog
 # Creational logic for issues
 # @author Simon Symeonidis
 class CreateIssue < UiCommand
-  def initialize(db)
-    @db = db
-  end
-
   # Execute create issue transaction
   def execute
-    @ret = Issue.new(@db)
     desc = Readline.readline("Small issue description :") || "None."
     ldesc = Readline.readline("Long issue description :") || "None."
-    @ret.description = desc.chomp
-    @ret.long_description = ldesc
-    @ret.insert
+    @ret = Issue.create(:description =>desc.chomp, :long_description => ldesc,
+      :status => 0, :created_at => Time.now, :updated_at => Time.now, 
+      :due_date => Time.now, :timelog => 0)
   end
   attr_accessor :ret
 end

data/lib/wlog/ui/edit_handler.rb

@@ -0,0 +1,74 @@
+
+module Wlog
+# @author Simon Symeonidis
+class EditHandler
+
+  def initialize(issue); @issue = issue end
+
+  # Command comes in as edit <...>. This definition will check what comes
+  # next and invoke the proper method to execute.
+  def edit_what(terms_a)
+    case terms_a[0]
+    when /^title/
+      title = (terms_a.drop 1).join ' '
+      @issue.description = title
+      @issue.update
+
+    when /^desc/
+      long = (terms_a.drop 1).join ' '
+      @issue.long_description = long
+      @issue.update 
+
+    when /^due/
+      date_time = terms_a.drop 1
+      edit_time(date_time.join(' '))
+
+    when /^reported/
+      date_time = terms_a.drop 1
+      edit_reported_time(date_time.join(' '))
+
+    else 
+      $stdout.puts "Usage: "
+      $stdout.puts "  edit title - to edit the title"
+      $stdout.puts "  edit desc  - to edit the long description"
+      $stdout.puts "  edit due   - to edit the due date"
+      $stdout.puts "  edit time  - to edit the time"
+
+    end
+  end
+  
+  # @param time is the date-time in string format (eg Oct 28)
+  def edit_time(time)
+    date_time = time_handle(time)
+    @issue.due_date = date_time.to_time 
+    @issue.update
+    puts @strmaker.green('Updated due date')
+  rescue ArgumentError
+    $stderr.puts @strmaker.red \
+      "Invalid date/time format. Try format like 'Oct 28'"
+  end
+
+  def edit_reported_time(time_str)
+    date_time = time_handle(time_str)
+    @issue.reported_date = date_time.to_time
+    @issue.update
+    puts @strmaker.green('Updated reported date')
+  rescue ArgumentError
+    $stderr.puts @strmaker.red \
+      "Invalid date/time format. Try format like 'Oct 28'"
+  end
+
+  # TODO fix me 
+  # @param time_str The time that we want to kind of sanitize
+  # @return a Time object which is set to 9am on that day if no time 
+  #   is provided
+  def time_handle(time_str)
+    date_time = DateTime.parse(time)
+    date_time = DateTime.parse(time + ' 9:00') if date_time.hour == 0
+  end
+
+  # Pass the issue from the previous ui to this one. This ui modifies
+  attr :issue
+
+end
+end # wlog 

data/lib/wlog/ui/invoice_ui.rb

@@ -0,0 +1,133 @@
+require 'readline'
+require 'wlog/domain/invoice'
+require 'wlog/domain/sys_config'
+require 'wlog/domain/static_configurations'
+require 'erb'
+
+module Wlog
+# An interface for the invoices
+# @author Simon Symeonidis
+class InvoiceUi
+  include StaticConfigurations
+
+  def initialize
+    @strmaker = SysConfig.string_decorator
+  end
+
+  def run
+    cmd = "default"
+
+    while cmd != 'end'
+      cmd = Readline.readline("[#{@strmaker.red('invoice')}] ") || ""
+      case cmd
+      when /^new/       then make_invoice
+      when /^(ls|show)/ then ls
+      when /^delete/    then delete(cmd.split.drop 1)
+      when /^generate/  then generate(cmd.split.drop 1)
+      when /^end/       then next
+      else 
+        puts "type 'help' for a list of options"
+      end
+    end
+  end
+
+private
+
+  # TODO maybe separate this in the future for better testing.
+  def generate(rest)
+    num = rest.first || 1
+    invoice = Invoice.find(num.to_i)
+    
+    # NOTE: these need to be instance vars, so we expose them to ERB later on
+    @les = invoice.log_entries_within_dates
+    @issues = [Issue.find(*(@les.collect(&:issue_id).uniq))].compact.flatten
+    
+    # Get the template
+    num        = SysConfig.get_config('template') || 1
+    tpath      = Dir[TemplateDir + '*'][num.to_i - 1]
+    template_s = File.read(tpath)
+
+    renderer = ERB.new(template_s)
+    output = renderer.result(binding)
+
+    FileUtils.mkdir_p TemplateOutputDir
+    template_ext = tpath.split(File::SEPARATOR).last.split('.').last
+    filename = TemplateOutputDir + "#{invoice.id}-invoice.#{template_ext}"
+
+    File.write(filename, output)
+
+  rescue ActiveRecord::RecordNotFound
+    puts 'No such invoice'
+  rescue => e
+    puts e.message
+  end
+
+  def delete(rest)
+    id = rest[0]
+    cmd = Readline.readline("Are you sure you want to delete invoice ##{id}? [y/n]: ")
+    return if cmd != 'y' 
+    Invoice.delete(id)
+  end
+
+  def ls
+    Invoice.all.each do |invoice|
+      print "  [#{invoice.id}] " 
+      print @strmaker.yellow(invoice.from.strftime("%d-%m-%Y"))
+      print @strmaker.blue(" -> ")
+      print @strmaker.yellow(invoice.to.strftime("%d-%m-%Y"))
+      puts " #{invoice.description.split.first}"
+    end
+  end
+
+  def print_help
+    ['new', 'make a new invoice',
+     'ls,show', 'list the current invoice templates',
+     'delete', 'delete an invoice (eg: delete 2)',
+     'generate', 'generate an invoice using set template (eg: generate 2)'
+    ].each_with_index do |cmd,ix|
+      print '  ' if ix % 2 == 1 
+      puts cmd
+    end
+  end
+
+  # TODO this should be extracted for testing
+  def make_invoice
+    from_s = Readline.readline("#{@strmaker.blue('From')} (dd-mm-yyyy) ")
+    to_s   = Readline.readline("#{@strmaker.blue('To')}   (dd-mm-yyyy) ")
+
+    from_d = DateTime.parse(from_s)
+    to_d = DateTime.parse(to_s + " 23:59")
+    description = longtext()
+
+    Invoice.create(:from => from_d, :to => to_d, :description => description)
+  end
+
+  # TODO: this would have to be factored out at some point. Also I think the
+  # implementation is crappy. I have to recheck at some point.
+  def longtext
+    times = 3
+    str = ""
+    count = 0
+
+    while times != 0 do
+      cur = Readline.readline()
+      str.concat(cur)
+      str.concat($/)
+      if ["", nil].include? cur
+        str.concat($/)
+        count += 1
+        if count == 2
+          times -= 1
+          count = 0
+        end
+      else 
+        # reset blank line count. The user will have to hammer enter a few times
+        # to escape from this menu
+        count = 0
+      end
+    end
+  str end
+
+end
+end
+

data/lib/wlog/ui/issue_ui.rb

@@ -8,14 +8,14 @@ require 'wlog/commands/innit_db'
 require 'wlog/commands/concat_description'
 require 'wlog/domain/sys_config'
 require 'wlog/domain/timelog_helper'
+require 'wlog/ui/edit_handler'
 
 module Wlog
 # The interface when focusing on an issue
 # @author Simon
 class IssueUi
-  def initialize(db, issue)
+  def initialize(issue)
     @issue = issue
-    @db = db
     @strmaker = SysConfig.string_decorator
   end
 
@@ -31,13 +31,13 @@ class IssueUi
       when /^(ls|show)/ then show_entries
       when /^desc/      then describe_issue
       when /^delete/    then delete_entry
-      when /^edit/      then edit_what(cmd.split.drop 1)
+      when /^edit/      then EditHandler.new(@issue).edit_what(cmd.split.drop 1)
       when /^concat/    then concat_description
       when /^replace/   then replace_pattern
-      when /^search/    then search_term(cmd.split.drop 1)
+      when /^search/    then search_term((cmd.split.drop 1).join ' ')
       when /^lt/        then time(cmd.split.drop 1) # lt for log time
       when /^forget/    then cmd = "end"
-      when /^finish/    then finish.nil? ? nil : cmd = "end"
+      when /^finish/    then finish ? cmd = "end" : nil
       when /^help/      then print_help
       when /^end/       then next
       else puts "Type 'help' for help"
@@ -78,7 +78,7 @@ private
     question = 'Are you done with this task? [yes/no] :'
     if ret = !! Readline.readline(question).match(/^yes/i)
       @issue.mark_finished!
-      @issue.update
+      @issue.save
     end
   ret end
  
@@ -87,20 +87,21 @@ private
     description = Readline.readline("Enter new issue:#{$/}  ")
     description.chomp!
     @issue.mark_working!
-    @issue.update
-    NewEntry.new(@db, description, @issue.id).execute
+    @issue.save
+    NewEntry.new(description, @issue).execute
   end
 
   def delete_entry
     id = Readline.readline('Remove task log with id : ').to_i
-    LogEntry.delete_by_id(@db, id)
+    LogEntry.delete(id)
   end
 
   # Concatenate an aggregate description to a previous item
   def concat_description
     id = Readline.readline("ID of task to concatenate to: ").to_i
     str = Readline.readline("Information to concatenate: ").chomp
-    ConcatDescription.new(@db, id, str).execute
+    ok = ConcatDescription.new(id, str).execute
+    puts "No such issue" if !ok
   end
 
   # Replace a pattern from a description of a log entry
@@ -108,84 +109,27 @@ private
     id = Readline.readline("ID of task to perform replace: ").to_i
     old_pattern = Readline.readline('replace : ').chomp
     new_pattern = Readline.readline('with    : ').chomp
-    ReplacePattern.new(@db, id, old_pattern, new_pattern).execute
+    ok = ReplacePattern.new(id, old_pattern, new_pattern).execute
+    puts "No such task" if !ok
   end
 
   def search_term(term)
     term ||= ''
     term.chomp!
-    print_entries(LogEntry.search_descriptions(@db, term))
-  end
-
-  # Command comes in as edit <...>. This definition will check what comes
-  # next and invoke the proper method to execute.
-  def edit_what(terms_a)
-    case terms_a[0]
-    when /^title/
-      title = (terms_a.drop 1).join ' '
-      @issue.description = title
-      @issue.update
-
-    when /^desc/
-      long = (terms_a.drop 1).join ' '
-      @issue.long_description = long
-      @issue.update 
-
-    when /^due/
-      date_time = terms_a.drop 1
-      edit_time(date_time.join(' '))
-
-    when /^reported/
-      date_time = terms_a.drop 1
-      edit_reported_time(date_time.join(' '))
-
-    else 
-      $stdout.puts "Usage: "
-      $stdout.puts "  edit title - to edit the title"
-      $stdout.puts "  edit desc  - to edit the long description"
-      $stdout.puts "  edit due   - to edit the due date"
-      $stdout.puts "  edit time  - to edit the time"
-
-    end
-  end
-  
-  # @param time is the date-time in string format (eg Oct 28)
-  def edit_time(time)
-    date_time = time_handle(time)
-    @issue.due_date = date_time.to_time 
-    @issue.update
-    puts @strmaker.green('Updated due date')
-  rescue ArgumentError
-    $stderr.puts @strmaker.red \
-      "Invalid date/time format. Try format like 'Oct 28'"
-  end
-
-  def edit_reported_time(time_str)
-    date_time = time_handle(time_str)
-    @issue.reported_date = date_time.to_time
-    @issue.update
-    puts @strmaker.green('Updated reported date')
-  rescue ArgumentError
-    $stderr.puts @strmaker.red \
-      "Invalid date/time format. Try format like 'Oct 28'"
-  end
-
-  # TODO fix me 
-  # @param time_str The time that we want to kind of sanitize
-  # @return a Time object which is set to 9am on that day if no time 
-  #   is provided
-  def time_handle(time_str)
-    date_time = DateTime.parse(time)
-    date_time = DateTime.parse(time + ' 9:00') if date_time.hour == 0
+    print_entries(LogEntry.where(["description LIKE ?", "%#{term}%"]))
   end
 
   # TODO might need refactoring
   def show_entries
-    entries_arr = LogEntry.find_all_by_issue_id(@db, @issue.id)
-    date_collections = entries_arr.group_by{|le| le.date.strftime("%Y-%m-%d")}
+    @issue.reload
+    print_entries(@issue.log_entries)
+  end
+
+  def print_entries(entries_a)
+    date_collections = entries_a.group_by{|le| le.created_at.strftime("%Y-%m-%d")}
     date_collections.each_key do |date_c|
     print @strmaker.green("#{date_c} - ")
-    print @strmaker.yellow(date_collections[date_c].first.date.strftime("%A"))
+    print @strmaker.yellow(date_collections[date_c].first.created_at.strftime("%A"))
     puts " [#{@strmaker.magenta(date_collections[date_c].count.to_s)}]"
       date_collections[date_c].each do |le|
         puts "  #{le}"

data/lib/wlog/ui/template_ui.rb

@@ -0,0 +1,66 @@
+require 'readline'
+require 'wlog/domain/sys_config'
+require 'wlog/commands/bootstrap_templates'
+require 'wlog/domain/sys_config'
+require 'wlog/domain/static_configurations'
+
+module Wlog
+# To list, and choose which template we want to use when making invoices.
+# @author Simon Symeonidis
+class TemplateUi
+  include StaticConfigurations
+
+  def initialize
+    @strmaker = SysConfig.string_decorator
+    # Checks for templates dir each run
+    BootstrapTemplates.new.execute
+  end
+
+  def run
+    cmd = 'default'
+
+    while cmd != 'end'
+      cmd = Readline.readline("[#{@strmaker.green('templates')}] ").chomp
+      case cmd
+      when /^(ls|show)/ then ls
+      when /^set/       then set(cmd.split.drop 1)
+      when /^help/      then print_help
+      when /^end/       then next
+      end
+    end
+  end
+
+private
+
+  def print_help
+    ['ls, show', 'list the current templates you can use', 
+     'set <num>', 'set the template you want to use',
+     'help', 'print this menu'].each_with_index do |cmd,ix|
+       print "  " if ix % 2 == 1
+       puts cmd
+     end
+  end
+
+  def ls
+    num = SysConfig.get_config('template') || 1
+    num = num.to_i
+    Dir[TemplateDir + "*"].each_with_index do |file,ix|
+      print " #{ix + 1 == num ? @strmaker.blue('*') : ' '} "
+      print "[%3d] " % (ix + 1)
+      puts file
+    end
+  end
+
+  def set(rest)
+    num = rest[0]
+    unless num
+      puts "usage: set <number>"
+      return
+    end
+
+    SysConfig.store_config('template', num)
+  end
+
+end
+end
+

data/lib/wlog/version.rb

@@ -1,3 +1,3 @@
 module Wlog
-  VERSION = "1.1.1"
+  VERSION = "1.1.5"
 end