wlog 1.2.1 → 1.2.2

data/lib/wlog/ui/invoice_ui.rb

@@ -1,4 +1,5 @@
 require 'readline'
+require 'tempfile'
 require 'wlog/domain/invoice'
 require 'wlog/domain/sys_config'
 require 'wlog/domain/static_configurations'
@@ -33,7 +34,7 @@ class InvoiceUi
       when /^commits/   then commits(cmd.split.drop 1)
       when 'help'       then print_help
       when /^end/       then next
-      else 
+      else
         puts "type 'help' for a list of options"
       end
     end
@@ -46,13 +47,17 @@ private
     num = rest.first || 1
 
     @invoice = Invoice.find(num.to_i)
-    cmd = FetchGitCommitsStandard.new(@invoice.from, @invoice.to)
-    cmd.execute
+
+    if KeyValue.get('git')
+      # Only attempt to fetch commits if user has set git repo
+      cmd = FetchGitCommitsStandard.new(@invoice.from, @invoice.to)
+      cmd.execute
+      @commits = cmd.commits
+    end
 
     @log_entries = @invoice.log_entries_within_dates
     @issues = [Issue.find(*(@log_entries.collect(&:issue_id).uniq))].compact.flatten
-    @commits = cmd.commits
-    
+
     renderer = ERB.new(TemplateHelper.template_s)
     output = renderer.result(binding)
 
@@ -67,13 +72,13 @@ private
   def delete(rest)
     id = rest[0]
     cmd = Readline.readline("Are you sure you want to delete invoice ##{id}? [y/n]: ")
-    return if cmd != 'y' 
+    return if cmd != 'y'
     Invoice.delete(id)
   end
 
   def ls
     Invoice.all.each do |invoice|
-      print "  [#{invoice.id}] " 
+      print "  [#{invoice.id}] "
       print @strmaker.yellow(invoice.from.strftime("%d-%m-%Y"))
       print @strmaker.blue(" -> ")
       print @strmaker.yellow(invoice.to.strftime("%d-%m-%Y"))
@@ -85,9 +90,10 @@ private
     ['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)'
+     'generate', 'generate an invoice using set template (eg: generate 2)',
+     'commits', 'list out the commits valid for the duration of the invoice'
     ].each_with_index do |cmd,ix|
-      print '  ' if ix % 2 == 1 
+      print '  ' if ix % 2 == 1
       puts cmd
     end
   end
@@ -107,27 +113,36 @@ private
   # 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
-   count = 0 
-   status = nil
-   str = ""
-   
-   until status == :end_text do 
-     line = Readline.readline(@strmaker.blue('> ')).strip
-     count += 1 if line == ""
-     count  = 0 if line != ""
-
-     str.concat(line).concat($/)
-   
-     status = :end_text and next if count == 2
-   end 
-  str end
+    if ENV['EDITOR'].nil?
+      count = 0
+      status = nil
+      str = ""
+
+      until status == :end_text do
+        line = Readline.readline(@strmaker.blue('> ')).strip
+        count += 1 if line == ""
+        count  = 0 if line != ""
+
+        str.concat(line).concat($/)
+
+        status = :end_text and next if count == 2
+      end
+    else
+      t = Tempfile.new('description')
+      system(ENV['EDITOR'] + ' ' + t.path)
+      str = File.open(t.path).read
+      t.unlink
+    end
+
+    str
+  end
 
   def commits(invoice_id)
-    inv = Invoice.find_by_id(invoice_id) 
+    inv = Invoice.find_by_id(invoice_id)
     repo = KeyValue.get('git')
     author = KeyValue.get('author')
 
-    unless repo 
+    unless repo
       puts @strmaker.red("You need to set a git repo first")
       return
     end
@@ -140,11 +155,10 @@ private
     puts "git commits for #{@strmaker.yellow(author)}"
     puts
     print_git_commits(command.commits)
-    
+
   rescue ActiveRecord::RecordNotFound
     puts @strmaker.red("No such invoice")
   end
 
 end
 end
-

data/lib/wlog/ui/issue_ui.rb

@@ -52,15 +52,35 @@ class IssueUi
   # Focusing on the current issue
   attr_accessor :issue
 
-private 
-
+private
+  # This needs updating
+  def print_help
+    ["new",   "Create a new log entry",
+    'ls',     "list issues",
+    'desc',   "describe an issue",
+    'edit',   "edit fields of an issue",
+    'concat', "append information to an issue",
+    'replace', 'replace text within an issue',
+    'lt',     'log time on an issue',
+    "outcsv", "Export everything to CSV",
+    'attach', 'Attach a file to the current issue',
+    'attachls', 'Show what files have been attached to an issue',
+    'attachout', 'Extract a file from the database',
+    "help",   "print this dialog",
+    "end",    "Exit the progam (alias: forget, finish)",
+    "search", "Search for a string in the log description text",
+    "delete", "Remove the task with a given id"].each_with_index do |el,ix|
+      print "  " if 1 == ix % 2
+      puts el
+    end
+  end
   # Wriet out the data contained in the database of the attachment
   def output_attach
     att_id = Readline.readline('Which attachment to output? : ').to_i
     loc = Readline.readline('Output where (abs dir) ? : ')
     loc.chomp!
     att = Attachment.find(att_id)
-    
+
     fh = File.open("#{loc}/#{att.filename}", 'w')
     fh.write(att.data)
     fh.close
@@ -68,7 +88,7 @@ private
 
   def show_attach
     atts = @issue.attachments
-    atts.each do |att| 
+    atts.each do |att|
       printf "[%d] - %s (alias: %s)\n", att.id, att.filename, att.given_name
     end
   end
@@ -78,7 +98,7 @@ private
     loc.strip!
     name_alias = Readline.readline('Alias name for file (optional): ')
     name_alias.strip!
-    
+
     fh = File.open(loc, "r")
     data = fh.read
     fh.close
@@ -99,30 +119,14 @@ private
 
   # Time logging command
   def time(rest)
-    time = TimelogHelper.parse(rest.join) 
+    time = TimelogHelper.parse(rest.join)
     @issue.log_time(time)
     puts @strmaker.green('logged time!')
   end
 
   # Print the description of the issue
-  def describe_issue; 
-    puts @issue 
-  end
-
-  # This needs updating
-  def print_help
-    ["new",   "Create a new log entry", 
-    "outcsv", "Export everything to CSV",
-    'attach', 'Attach a file to the current issue',
-    'attachls', 'Show what files have been attached to an issue',
-    'attachout', 'Extract a file from the database',
-    "help",   "print this dialog",
-    "end",    "Exit the progam",
-    "search", "Search for a string in the log description text",
-    "delete", "Remove the task with a given id"].each_with_index do |el,ix| 
-      print "  " if 1 == ix % 2
-      puts el
-    end
+  def describe_issue;
+    puts @issue
   end
 
   # Exit the issue, mark as finished
@@ -133,7 +137,7 @@ private
       @issue.save
     end
   ret end
- 
+
   # new entry command
   def new_entry
     description = Readline.readline("Enter new issue:#{$/}  ")
@@ -195,4 +199,3 @@ private
   end
 end
 end # end module
-

data/lib/wlog/ui/setup_wizard.rb

@@ -1,6 +1,7 @@
 require 'readline'
 require 'wlog/domain/sys_config'
 require 'wlog/commands/taint_setup'
+require 'wlog/tech/wlog_string'
 
 module Wlog
 # This is the ui that is displayed whenever we detect that it is the first
@@ -18,10 +19,11 @@ class SetupWizard
     TaintSetup.new.execute
   end
 
-private 
+private
 
   def get_setting
-    question = "Do you use a terminal that supports ANSI colors? [yes/no] :"
+    puts WlogString.green('ABCD')
+    question = "Is the previous line a green 'ABCD'? [yes/no] :"
     until ['yes', 'no'].include? input
       @input = Readline.readline(question)
       @input.chomp!

data/lib/wlog/ui/template_ui.rb

@@ -33,7 +33,7 @@ class TemplateUi
 private
 
   def print_help
-    ['ls, show', 'list the current templates you can use', 
+    ['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
@@ -63,4 +63,3 @@ private
 
 end
 end
-

data/lib/wlog/version.rb

@@ -1,3 +1,3 @@
 module Wlog
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/domain/attachment_spec.rb

@@ -9,24 +9,24 @@ require 'zlib'
 
 include Wlog
 
-describe Attachment do 
- 
+describe Attachment do
+
    db_name = 'default'
    db_path = standard_db_path(db_name)
-   
+
    before(:all) do
      make_testing_db(db_name)
    end
- 
+
    after(:all) do
      close_testing_db
      FileUtils.rm db_path
    end
- 
+
    it 'should attach a mock file to an issue' do
      @issue = Issue.create(:description => 'mydesc',
        :long_description => 'potato')
-     
+
      # You're kind of forced to do this because I've hacked a shitty
      # implementation of compressing - uncompressing strings automatically when
      # attaching files.
@@ -48,5 +48,5 @@ describe Attachment do
    it "should return nil if something is not found" do
      expect(Attachment.find_by_id(123123123)).to eq(nil)
    end
-end 
-# 
+end
+#

data/spec/domain/commands/concat_desc_spec.rb

@@ -9,7 +9,7 @@ require 'wlog/commands/concat_description'
 
 include Wlog
 
-describe ConcatDescription do 
+describe ConcatDescription do
 
   db_name = 'default'
   db_path = standard_db_path(db_name)
@@ -30,7 +30,7 @@ describe ConcatDescription do
   after(:all) do
     FileUtils.rm db_path
   end
-   
+
   # I know, tests should not really look for implementation details, but things
   # in our case *should* really inherit the command interface.
   it "should inherit from commandable" do

data/spec/domain/commands/new_entry_spec.rb

@@ -7,7 +7,7 @@ require 'wlog/commands/new_entry'
 
 include Wlog
 
-describe NewEntry do 
+describe NewEntry do
 
   db_name = 'default'
   db_path = standard_db_path(db_name)
@@ -23,7 +23,7 @@ describe NewEntry do
     FileUtils.rm db_path
   end
 
-  it "should insert a new entry on execution" do 
+  it "should insert a new entry on execution" do
     command = NewEntry.new("my desc", @issue)
     command.execute
     expect(LogEntry.count).to eq(1)

data/spec/domain/commands/replace_pattern_spec.rb

@@ -43,4 +43,3 @@ describe ReplacePattern do
     expect(new_le.description).to eq('This is my wlog_entry')
   end
 end
-

data/spec/domain/git_commits_spec.rb

@@ -2,7 +2,7 @@ require_relative '../spec_helper'
 
 include Wlog
 
-describe GitCommitParser do 
+describe GitCommitParser do
 
   GitLogSample = <<GITDATA
 commit 19b5dd496ba2e4125c681b3c505f7631053a2fab
@@ -10,7 +10,7 @@ Author: psyomn <lethaljellybean@gmail.com>
 Date:   Wed Oct 23 23:00:56 2013 -0400
 
     Tiny setup wizard for checking if ansi or not
-    
+
     Need to provide a system configuration service that takes into account things
     that are the same for any running instance of the application (because others
     might just be specific to project databases).
@@ -30,14 +30,14 @@ Date:   Wed Oct 23 22:46:27 2013 -0400
 GITDATA
 
   Malformed = <<BADGIT
- potato potato potato potato potato potato potato potato potato potato potato 
-potato potato potato potato potato potato potato potato potato potato potato potato 
-potato potato potato potato potato potato potato potato potato potato potato potato 
-potato potato potato potato potato potato potato potato potato potato potato potato 
-potato potato potato potato potato potato potato potato potato potato potato potato 
+ potato potato potato potato potato potato potato potato potato potato potato
+potato potato potato potato potato potato potato potato potato potato potato potato
+potato potato potato potato potato potato potato potato potato potato potato potato
+potato potato potato potato potato potato potato potato potato potato potato potato
+potato potato potato potato potato potato potato potato potato potato potato potato
 BADGIT
 
-  it 'should return [] on null string' do 
+  it 'should return [] on null string' do
     expect(GitCommitParser.parse('')).to eq([])
   end
 
@@ -49,7 +49,7 @@ BADGIT
     expect(GitCommitParser.parse(GitLogSample).count).to eq(3)
   end
 
-  it 'should retrieve hashes' do 
+  it 'should retrieve hashes' do
     commits = GitCommitParser.parse(GitLogSample)
     hashes = commits.collect &:commit
     expected_hashes = [
@@ -60,13 +60,13 @@ BADGIT
     expect((hashes & expected_hashes).count).to eq(3)
   end
 
-  it 'should retrieve authors' do 
+  it 'should retrieve authors' do
     commits = GitCommitParser.parse(GitLogSample)
     authors = commits.collect &:author
     expect(authors.count).to eq(3)
   end
 
-  it 'should retrieve shortlogs' do 
+  it 'should retrieve shortlogs' do
     commits = GitCommitParser.parse(GitLogSample)
     shortlogs = commits.collect &:shortlog
     expect(shortlogs.count).to eq(3)

data/spec/domain/invoice_spec.rb

@@ -3,24 +3,24 @@ require_relative '../make_db'
 
 include Wlog
 
-describe Invoice do 
+describe Invoice do
   include DomainHelpers
 
   db_name = 'default'
   db_path = standard_db_path(db_name)
 
-  before :all do 
+  before :all do
     make_testing_db(db_name)
   end
 
-  after :all do 
+  after :all do
     FileUtils.rm db_path
   end
 
-  it 'should fetch all relevant log entries between two dates' do 
+  it 'should fetch all relevant log entries between two dates' do
     invoice = Invoice.create(:from => (DateTime.now - 5), :to => (DateTime.now + 5))
     issue = make_issue
-    
+
     10.times do
       le = make_log_entry
       le.created_at = DateTime.now - 2
@@ -32,4 +32,3 @@ describe Invoice do
   end
 
 end
-