wlog 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8af4a4bdef4d942ce3e0da56440ffd9e633c54
-  data.tar.gz: b3a0dc959da2586fb2b2b511ee729f5b262f61de
+  metadata.gz: 4035a8ebc932e0bd3fafca18b8cee1d071370f2d
+  data.tar.gz: db684be23ea24718cd088fe9266681e1ba7a5633
 SHA512:
-  metadata.gz: d8212057e50030e791c0dddef5a35df96a44f80cefd96cacb095d13de12eba0c7daa3d0697a1f8deae287cc7ddc3844952302e9679d0f244ceb8c2af3474a1f6
-  data.tar.gz: 589a124eb21948703d5cd9847c2901f2586d38ca4cc627d62f79efd8462f82d98c0f2cefc9c708b6f8e9c74987b251adadab3d5230126347ad4aa01704218749
+  metadata.gz: 9a057291af53d32cfe182105462f80910daad2eed5e479479af62c1a42cae4fe230edc627b2007b8909f3a9b36a2ac1711b3f4c34f534899ec4cd042f9c32c68
+  data.tar.gz: 6563cd1a3b160452e76cc620232876e8b8143aa9b32baf10e72cc3cd1a216b29dc931258b4858cc6afc4906b7c4b0faa9a24f04b72e761e7f6ff4cb4f16014c1

data/README.md

@@ -310,6 +310,20 @@ will be printed on screen.
       22d760f881e613a30d3b722dd9b26f4f46c1cf4c domain/log_entry: add belongs_to issue ...
       79d1e3393587b02c328a454d5cfe301d3f80aee8 invoices: select date range for log entries ...
 
+## Config
+
+If you want to unset colors you can do so by going to the config menu
+
+    [wlog] config
+    [config]
+
+and then typing in 
+
+    [config] set ansi no
+
+When you restart wlog, the colors will be set off. To set colors back on just
+use `yes`.
+
 ## Contributing
 
 1. Fork it

data/bin/wlog

@@ -6,7 +6,7 @@ require 'wlog/ui/bootstrap'
 require 'wlog/ui/cli_interface'
 
 include Wlog
-    
+
 if ARGV.size > 0
   case ARGV[0]
   when "--list"
@@ -29,4 +29,3 @@ else
   Bootstrap.configure!
   CliInterface.new.run
 end
-

data/lib/wlog/commands/bootstrap_templates.rb

@@ -22,7 +22,7 @@ class BootstrapTemplates < Commandable
 
 private
 
-  # Write a default template 
+  # Write a default template
   def write_default_template!
     fh = File.open(TemplateSampleFile, 'w')
     data = "A list of issues:

data/lib/wlog/commands/concat_description.rb

@@ -20,4 +20,3 @@ class ConcatDescription < Commandable
   attr_reader :id, :str
 end
 end # end Wlog module
-

data/lib/wlog/commands/create_issue.rb

@@ -12,7 +12,7 @@ class CreateIssue < Commandable
     desc = Readline.readline("Small issue description :") || "None."
     ldesc = Readline.readline("Long issue description :") || "None."
     @ret = Issue.create(:description =>desc.chomp, :long_description => ldesc,
-      :status => 0, :created_at => Time.now, :updated_at => Time.now, 
+      :status => 0, :created_at => Time.now, :updated_at => Time.now,
       :due_date => Time.now, :timelog => 0)
   end
   attr_accessor :ret

data/lib/wlog/commands/delete_attachment.rb

@@ -14,4 +14,3 @@ class DeleteAttachment < Commandable
 private
 end
 end
-

data/lib/wlog/commands/delete_issue.rb

@@ -19,7 +19,7 @@ class DeleteIssue
       @deleted = true
     end
   rescue ActiveRecord::RecordNotFound
-    @deleted = false 
+    @deleted = false
   end
 
   def deleted?
@@ -29,4 +29,3 @@ class DeleteIssue
   attr :deleted
 end
 end
-

data/lib/wlog/commands/fetch_git_commits.rb

@@ -13,7 +13,7 @@ class FetchGitCommits < Commandable
   # @param repo   location to the git repo
   # @param author only show logs of that author. If none is given, fetch all
   #   authors
-  # @example 
+  # @example
   #   from_date = DateTime.now - 15
   #   to_date   = DateTime.now + 5
   #   repo      = '/home/jon/wlog/.git/'
@@ -34,12 +34,13 @@ private
 
   # git --git-dir <thedir> log --since=... --until=... --author=...
   def run_git_cmd
+    from_s = @from.strftime("%b %d %Y")
+    to_s   = @to.strftime("%b %d %Y")
     base = "git --git-dir #{@repo} log "
-    base.concat("--since=\"#{@from}\" ")
-    base.concat("--until=\"#{@to}\" ")
+    base.concat("--since=\"#{from_s}\" ")
+    base.concat("--until=\"#{to_s}\" ")
     base.concat("--author=\"#{@author}\"") if @author
   base end
 
 end
 end
-

data/lib/wlog/commands/fetch_git_commits_standard.rb

@@ -26,4 +26,3 @@ class FetchGitCommitsStandard < Commandable
   attr_accessor :commits
 end
 end
-

data/lib/wlog/commands/innit_db.rb

@@ -41,7 +41,7 @@ class InnitDb < Commandable
 
     migrations.reject!{ |e| existing.include? e.to_s}
 
-    migrations.each do |migration| 
+    migrations.each do |migration|
       ActiveRecord::Migration.run(migration)
       SchemaMigration.create(:version => migration.name)
     end
@@ -51,8 +51,8 @@ class InnitDb < Commandable
 private
 
   # Checks to see if versioning table is there. Create if not.
-  def make_schema_migrations! 
-    ActiveRecord::Migration.verbose = false 
+  def make_schema_migrations!
+    ActiveRecord::Migration.verbose = false
     ActiveRecord::Base.configurations = dbconfig
     ActiveRecord::Base.establish_connection(:development)
     ActiveRecord::Base.default_timezone = :local
@@ -64,7 +64,7 @@ private
 
   # TODO this should probably be moved
   def dbconfig
-    dbname = ARGV[0] || DefaultDb
+    dbname = DefaultDb
     {'development' => {
      :adapter => 'sqlite3',
      :pool => 5,
@@ -74,4 +74,3 @@ private
 
 end
 end
-

data/lib/wlog/commands/make_csv.rb

@@ -23,4 +23,3 @@ class MakeCsv < Commandable
   attr_accessor :ret
 end
 end
-

data/lib/wlog/commands/new_entry.rb

@@ -8,13 +8,13 @@ module Wlog
 # @author Simon Symeonidis
 class NewEntry < Commandable
 
-  def initialize(desc, issue) 
+  def initialize(desc, issue)
     @desc, @issue = desc, issue
   end
 
   def execute
     log_entry = LogEntry.new(
-      :description => @desc, 
+      :description => @desc,
       :created_at => DateTime.now,
       :updated_at => DateTime.now)
 

data/lib/wlog/commands/replace_pattern.rb

@@ -18,4 +18,3 @@ class ReplacePattern < Commandable
   end
 end
 end
-

data/lib/wlog/commands/taint_setup.rb

@@ -15,4 +15,3 @@ class TaintSetup
   end
 end
 end
-

data/lib/wlog/domain.rb

@@ -10,4 +10,3 @@ require 'wlog/domain/static_configurations.rb'
 require 'wlog/domain/sys_config.rb'
 require 'wlog/domain/template_engine.rb'
 require 'wlog/domain/timelog_helper.rb'
-

data/lib/wlog/domain/attachment.rb

@@ -19,6 +19,7 @@ class Attachment < ActiveRecord::Base
 
 private
 
+  # TODO need to check if there is a better way to check for this
   def compress_string
     self.data = Zlib::Deflate.deflate self.data
   end
@@ -32,4 +33,3 @@ private
 
 end
 end # module Wlog
-

data/lib/wlog/domain/git_commit.rb

@@ -1,7 +1,7 @@
 module Wlog
 # A git commit message
 # @author Simon Symeonidis
-class GitCommit 
+class GitCommit
   def initialize
     @commit = @author = @shortlog = @message = ""
   end

data/lib/wlog/domain/helpers.rb

@@ -1,12 +1,12 @@
 require 'wlog/domain/static_configurations'
 
 module Wlog
-# This contains a few helper methods that may be used by any part in the 
+# This contains a few helper methods that may be used by any part in the
 # application.
 # @author Simon Symeonidis
 class Helpers
   include StaticConfigurations
-  # Break the string to a different line 
+  # Break the string to a different line
   # @param string is the string that we want processed.
   # @param numchars is the amount of characters max per line.
   def self.break_string(string,numchars)
@@ -26,8 +26,8 @@ class Helpers
 
   # Check to see if the database exists in the DataDirectory
   # @return true if exists, otherwise false
-  def self.database_exits?
-    File.exists? "#{DataDirectory}#{ARGV[0] || DefaultDb}"
+  def self.database_exists?
+    File.exists? "#{DataDirectory}#{DefaultDb}"
   end
 
   # Check to see if DataDirectory exists
@@ -44,4 +44,3 @@ class Helpers
   def self.first_setup?; !File.exists? TaintFile end
 end
 end # module Wlog
-

data/lib/wlog/domain/invoice.rb

@@ -2,7 +2,7 @@ require 'active_record'
 require 'wlog/domain/log_entry'
 
 module Wlog
-# The invoice domain object - use this to manipulate invoice recordings, or 
+# The invoice domain object - use this to manipulate invoice recordings, or
 # this along with some renderer and templates in order to create said invoices.
 # @author Simon Symeonidis
 class Invoice < ActiveRecord::Base

data/lib/wlog/domain/issue.rb

@@ -1,4 +1,4 @@
-require 'active_record' 
+require 'active_record'
 
 require 'wlog/domain/log_entry'
 require 'wlog/domain/timelog_helper'
@@ -8,7 +8,7 @@ require 'wlog/domain/helpers'
 module Wlog
 # This aggregates log entries. The total time spent on this issue is
 # calculated from checking out said log entries.
-# @author Simon Symeonidis 
+# @author Simon Symeonidis
 class Issue < ActiveRecord::Base
 
   has_many :log_entries, dependent: :delete_all
@@ -33,7 +33,7 @@ class Issue < ActiveRecord::Base
     @strmaker = SysConfig.string_decorator
     "#{@strmaker.yellow('Issue')} ##{id}#{$/}"\
     "  #{@strmaker.blue('Reported')} : #{created_at.asctime}#{$/}"\
-    "  #{@strmaker.blue('Due')}      : #{due_date.asctime}#{$/}"\
+    "  #{@strmaker.blue('Due')}      : #{due_date.asctime} #{make_remaining_days_s}#{$/}"\
     "  #{@strmaker.blue('Entries')}  : #{le_count} #{$/}"\
     "  #{@strmaker.blue('Status')}   : #{Statuses[status]}#{$/}"\
     "  #{@strmaker.blue('Time')}     : #{TimelogHelper.time_to_s(timelog)}#{$/}"\
@@ -48,10 +48,10 @@ class Issue < ActiveRecord::Base
 
   # Mark issue as started
   def mark_started!; self.status = 0 end
-  
+
   # Mark the issue as working
   def mark_working!; self.status = 1 end
-  
+
   # Mark the issue as finished
   def mark_finished!; self.status = 2 end
 
@@ -63,23 +63,48 @@ class Issue < ActiveRecord::Base
 
 private
   Statuses = {
-    StatusNew      => "new", 
-    StatusStarted  => "started work", 
-    StatusFinished => "finished", 
+    StatusNew      => "new",
+    StatusStarted  => "started work",
+    StatusFinished => "finished",
     StatusArchived => "archived"}
 
   # Stringify attachments for terminal output
   def attachments_s
     str = ''
-    self.attachments.each do |att| 
+    self.attachments.each do |att|
       str.concat(att.to_s)
     end
     str = @strmaker.red("  N/A#{$/}") if str == '' # no attachments
     str.concat($/)
   str end
 
+  # TODO might need factoring out
+  # Will make a string of the due date, and append the days that remain. On
+  # dates before the due date, you get things like '+5 days'. Past due dates will
+  # render '-5 days'
+  # @return a string containing the number of days that remain
+  def make_remaining_days_s
+    days = (due_date.to_date - Time.now.to_date).to_i
+    days_s = "[#{days} day#{days == 1 ? '' : 's'}]"
+    make_colored_num_s(days, days_s)
+  end
+
+  # TODO might need factoring out
+  # Depending on the number range we color things. Uses the strmaker, so
+  # terminals with no ansi support will not see anything funky :(
+  # @return yellow stringified number if 1 <= x <= 3, green for more, red for
+  #   less
+  def make_colored_num_s(num, num_s)
+    if num >= 1 && num <= 3 
+      @strmaker.yellow(num_s)
+    elsif num < 1
+      @strmaker.red(num_s)
+    else 
+      @strmaker.green(num_s)
+    end
+  end
+
 private_class_method
 
 end # class  Issue
 end # module Wlog
-

data/lib/wlog/domain/key_value.rb

@@ -15,7 +15,7 @@ class KeyValue < ActiveRecord::Base
   def self.put!(key, value)
     if ret = KeyValue.find_by_key(key)
       ret.value = value
-    else 
+    else
       ret = KeyValue.new(:key => key, :value => value)
     end
     ret.save
@@ -29,6 +29,5 @@ class KeyValue < ActiveRecord::Base
   end
 
 private
-end 
+end
 end # module Wlog
-

data/lib/wlog/domain/log_entry.rb

@@ -2,24 +2,16 @@ require 'active_record'
 
 require 'wlog/domain/helpers'
 require 'wlog/domain/attachment'
+require 'wlog/tech/text_filters'
 
 module Wlog
-# Author :: Simon Symeonidis 
+# Author :: Simon Symeonidis
 #  Active Record Domain object for a log entry
 class LogEntry < ActiveRecord::Base
+  include TextFilters
 
   belongs_to :issue
 
-    # Search by string to find a matching description with 'LIKE'.
-#   def self.search_descriptions(db, term)
-#     all = Array.new
-#     db.execute(SelectDescriptionLike,"%#{term}%").each do |row|
-#       le = LogEntry.new
-#       le.quick_assign!(row[0], row[1], Time.at(row[2]))
-#       all.push le
-#     end
-#   all end
- 
   # Print things nicely formmated no more than 80 cars (well, unless you stick
   # the time in the end which is not counted for).
   def to_s
@@ -29,9 +21,9 @@ class LogEntry < ActiveRecord::Base
     indent = " " * (id.to_s.split('').count + 5)
     desc.gsub!(/#{$/}/, "#{$/}#{indent}")
     str.concat(desc)
-  str end
+    highlight_hyperlink_s(str)
+  end
 
 private
 end
 end # module Wlog
-

data/lib/wlog/domain/static_configurations.rb

@@ -3,37 +3,36 @@ module Wlog
 #
 # Please follow the convention that if vars are dirs, then they end with '/'
 #
-# @author  Simon Symeonidis 
-module StaticConfigurations
-  # The application name
-  AppName = "wlog"
-  
-  # Absolute path to the configuration directory
-  ConfigDirectory = "#{ENV['HOME']}/.config/"
+# @author  Simon Symeonidis
+  module StaticConfigurations
+    # The application name
+    AppName = "wlog"
 
-  # Absolute path to the application directory
-  AppDirectory = "#{ConfigDirectory}#{AppName}/"
+    # Absolute path to the configuration directory
+    ConfigDirectory = "#{ENV['HOME']}/.config/"
 
-  # Absolute path to the data directory
-  DataDirectory = "#{AppDirectory}data/"
+    # Absolute path to the application directory
+    AppDirectory = "#{ConfigDirectory}#{AppName}/"
 
-  # Where the template files exist
-  TemplateDir = "#{AppDirectory}templates/"
+    # Absolute path to the data directory
+    DataDirectory = "#{AppDirectory}data/"
 
-  # Sample file to provide the user with
-  TemplateSampleFile = "#{TemplateDir}/default.erb"
+    # Default database name (when unspecified)
+    DefaultDb = "#{ARGV[0] || 'default'}"
 
-  # In the future if someone wants to code an alternative, go ahead
-  TemplateOutputDir = "#{ENV['HOME']}/Documents/wlog/"
+    # Where the template files exist
+    TemplateDir = "#{AppDirectory}templates/"
 
-  # Default database name (when unspecified)
-  DefaultDb = "default"
+    # Sample file to provide the user with
+    TemplateSampleFile = "#{TemplateDir}/default.erb"
 
-  # This is used to see if it is the first setup or not
-  TaintFile = "#{AppDirectory}tainted"
+    # In the future if someone wants to code an alternative, go ahead
+    TemplateOutputDir = "#{ENV['HOME']}/Documents/wlog/#{DefaultDb}/"
 
-  # The configuration file
-  ConfigFile = "#{AppDirectory}config"
-end
-end # module Wlog
+    # This is used to see if it is the first setup or not
+    TaintFile = "#{AppDirectory}tainted"
 
+    # The configuration file
+    ConfigFile = "#{AppDirectory}config"
+  end
+end # module Wlog