wlog 1.2.1 → 1.2.2

data/lib/wlog/domain/sys_config.rb

@@ -84,10 +84,10 @@ class SysConfig
     terms.each do |term_tuple| # [term, value]
       values[term_tuple[0]] = term_tuple[1]
     end
-    values 
+    values
   rescue Errno::ENOENT
     $stderr.puts "#{self.class.name}: Problem opening file #{ConfigFile}"
-    # Minimum guarantee: disable ansi colors 
+    # Minimum guarantee: disable ansi colors
 	 {'ansi' => 'no'}
   end
 
@@ -96,4 +96,3 @@ class SysConfig
 
 end
 end # module Wlog
-

data/lib/wlog/domain/template_helper.rb

@@ -3,9 +3,9 @@ require 'wlog/domain/static_configurations'
 
 module Wlog
 # Bunlde helper functions for templates here
-# @author Simon Symeonidis 
+# @author Simon Symeonidis
 class TemplateHelper
-  include StaticConfigurations     
+  include StaticConfigurations
   # @return absolute path to the template the user has set
   def self.template_file
     num = KeyValue.get('template') || 1

data/lib/wlog/domain/timelog_helper.rb

@@ -9,7 +9,7 @@ class TimelogHelper
     self.calculate_time(loggings)
   end
 
-  # @param time is time in seconds 
+  # @param time is time in seconds
   # @return in nice format (2d 1h 20m)
   def self.time_to_s(time)
     str = ""

data/lib/wlog/migrations/make_standard_tables.rb

@@ -1,10 +1,10 @@
-require 'active_record' 
+require 'active_record'
 
 module Wlog
 # Migrations to replace the raw sql from turntables
 # @author Simon Symeonidis
 class MakeStandardTables < ActiveRecord::Migration
-  def change 
+  def change
     create_table :issues do |t|
       t.text :description
       t.datetime :due_date
@@ -23,7 +23,7 @@ class MakeStandardTables < ActiveRecord::Migration
     end
 
     create_table :attachments do |t|
-      t.text :filename 
+      t.text :filename
       t.text :given_name
       t.text :data
       t.datetime :created_at
@@ -42,5 +42,4 @@ class MakeStandardTables < ActiveRecord::Migration
     end
   end
 end
-end 
-
+end

data/lib/wlog/tech/ansi_colors.rb

@@ -13,4 +13,3 @@ module AnsiColors
   White   = 37
 end
 end
-

data/lib/wlog/tech/git_commit_parser.rb

@@ -6,39 +6,39 @@ class GitCommitParser
   # @param log_s is the string obtained from running a `git log` command
   # @return a list of GitCommit objects
   def self.parse(log_s)
-    cur = nil 
-    inmessage = false 
-    gitlogs = [] 
-     
-    log_s.lines.each do |line| 
+    cur = nil
+    inmessage = false
+    gitlogs = []
+
+    log_s.lines.each do |line|
       case line
       when /^commit/i
-        inmessage = false 
+        inmessage = false
         gitlogs.push cur if cur
         cur = GitCommit.new
         cur.commit = line.split[1].strip
-                            
+
       when /^author/i
         next unless cur
         cur.author = line.split[1].strip
-                                   
+
       when /^date/i, /^\n$/
         next
-                                          
-      else 
+
+      else
         next unless cur
         if inmessage
           cur.message.concat(line)
           cur.message.strip!
         else
           cur.shortlog = line
-          cur.shortlog.strip! 
+          cur.shortlog.strip!
           inmessage = true
-        end 
+        end
       end
-    
+
     end
-    
+
     # if commits have no hash, discard them
     gitlogs.reject! { |e| e.commit == "" }
     gitlogs.push cur if cur

data/lib/wlog/tech/git_commit_printer.rb

@@ -5,12 +5,12 @@ module Wlog
 module GitCommitPrinter
 
   def print_git_commits(commit_a)
-    sm = SysConfig.string_decorator 
-    
-    commit_a.each do |commit| 
+    sm = SysConfig.string_decorator
+
+    commit_a.each do |commit|
       print '  '
       print sm.blue(commit.commit)
-      print ' ' 
+      print ' '
       puts  sm.green(commit.shortlog[0..50] + ' ...')
     end
   nil end

data/lib/wlog/tech/text_filters.rb

@@ -0,0 +1,20 @@
+require 'wlog/domain/sys_config'
+module Wlog
+# Group text filters here, for any text processing you want to do
+# @author Simon Symeonidis
+module TextFilters
+  # Use strmakers in order to color hyperlinks. This will look for a regex
+  # pattern of a http(s) link, and color it.
+  # @param string is the string we want to look into and color
+  # @return the string with ansi colored links if ansi is set.
+  def highlight_hyperlink_s(string)
+    @strmaker = SysConfig.string_decorator
+    regex = /http(s)?:\S*|www.\S*/
+    s = string.dup
+    tmp = nil
+    s.gsub!(regex) { @strmaker.blue($&) }
+    s
+  end
+end 
+end
+

data/lib/wlog/tech/uncolored_string.rb

@@ -1,6 +1,6 @@
 module Wlog
 # Use this if the system does not support colored strings.
-# @author Simon Symeonidis 
+# @author Simon Symeonidis
 class UncoloredString # :nodoc:
   def self.red(str); str end
   def self.yellow(str); str end

data/lib/wlog/tech/wlog_string.rb

@@ -1,7 +1,7 @@
 require 'wlog/tech/ansi_colors'
 
 module Wlog
-# This should take care of multiplatform color stuff. 
+# This should take care of multiplatform color stuff.
 # @author Simon Symeonidis
 class WlogString
   include AnsiColors

data/lib/wlog/ui/bootstrap.rb

@@ -10,10 +10,9 @@ class Bootstrap
   # make $HOME/.config/wlog standard dirs, and pull up database
   def self.configure!
     Helpers.make_dirs!
-    InnitDb.new.execute 
+    InnitDb.new.execute
     # Initial setup if first time running
     SetupWizard.new.run if Helpers.first_setup?
   end
 end
 end
-

data/lib/wlog/ui/cli_interface.rb

@@ -32,7 +32,7 @@ class CliInterface
   def run
     cmd = "default"
     label = @strmaker.white('wlog')
-    until cmd == "end" do 
+    until cmd == "end" do
       cmd = Readline.readline("[#{label}] ") || "end"
       cmd.chomp!
 
@@ -52,7 +52,7 @@ class CliInterface
       end
     end
   end
-  
+
   # TODO this might need to be factored out elsewhere
   def self.list_databases
     puts "Available Worklog databases: "
@@ -61,8 +61,8 @@ class CliInterface
     end
   end
 
-private 
- 
+private
+
   # Create a new issue
   def new_issue; CreateIssue.new.execute end
 
@@ -74,7 +74,7 @@ private
       puts 'usage:'
       puts '  delete <id>'
       return
-    else 
+    else
       issue_id = issue_id.to_i
     end
 
@@ -83,8 +83,8 @@ private
       choice = Readline.readline("Delete issue #{issue_id}? [y/n]").strip
       if choice == "y"
         dcmd.execute
-      else 
-        puts "Did nothing" 
+      else
+        puts "Did nothing"
         return
       end
     end
@@ -95,7 +95,7 @@ private
   def archive(cmd)
     args = cmd.split[1..-1]
 
-    if args.length > 0 
+    if args.length > 0
       if args[0] == 'finished'
         puts "Archiving finished issues."
         ArchiveFinishedIssues.new.execute
@@ -140,7 +140,7 @@ private
   # FIXME (update the command stuff)
   # Print the help of the cli app
   def print_help
-    ['new',   'Create a new log entry', 
+    ['new',   'Create a new log entry',
     'outcsv', 'Export everything to CSV',
     'help',   'print this dialog',
     'end',    'Exit the progam',
@@ -148,12 +148,13 @@ private
     'archive', 'Archive a file into a specific issue',
     'invoices', 'Go to invoices interface',
     'templates', 'Go to template interface, and set templates',
+    'git', 'Go git interface for setting git options',
     '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| 
+    ].each_with_index do |el,ix|
       print '  ' if 1 == ix % 2
       puts el
     end
@@ -193,7 +194,7 @@ private
   # Search for an issue
   def search
     term = Readline.readline("search issues for term : ")
-    issues = Issue.where(["description like ?", "%#{term}%"]) 
+    issues = Issue.where(["description like ?", "%#{term}%"])
     print_list(issues)
   end
 
@@ -202,4 +203,3 @@ private
 
 end
 end # module Wlog
-

data/lib/wlog/ui/configuration_ui.rb

@@ -1,7 +1,7 @@
 require 'readline'
 require 'wlog/domain/sys_config'
 
-module Wlog 
+module Wlog
 # Ui to manage configuration settings
 # @author Simon Symeonidis
 class ConfigurationUi
@@ -19,7 +19,7 @@ class ConfigurationUi
       cmd = Readline.readline("[#{label}] ") || "end"
       cmd.chomp!
 
-      case cmd 
+      case cmd
       when /^show/ then show_configurations
       when /^set/  then set(cmd)
       when /^help/ then help
@@ -27,11 +27,11 @@ class ConfigurationUi
     end
   end
 
-private 
+private
 
   # This should show the configurations
   def show_configurations
-    SysConfig.read_attributes.each do |name, value| 
+    SysConfig.read_attributes.each do |name, value|
       puts "%s %s" % [@strmaker.green(name), value]
     end
   end
@@ -47,7 +47,7 @@ private
   # Set a value to something else
   def set(cmd)
     arr = cmd.split
-    if arr.size != 3 
+    if arr.size != 3
       puts "Wrong number of arguments"
       return
     end
@@ -60,4 +60,3 @@ private
     'set <key> <value>' => 'set the configuration pair'}
 end
 end # module wlog
-

data/lib/wlog/ui/edit_handler.rb

@@ -7,7 +7,7 @@ module Wlog
 class EditHandler
 
   def initialize(issue)
-    @issue = issue 
+    @issue = issue
     @strmaker = SysConfig.string_decorator
   end
 
@@ -29,7 +29,7 @@ class EditHandler
     when /^reported/
       edit_reported_time(param)
 
-    else 
+    else
       $stdout.puts "Usage: "
       $stdout.puts "  edit title - to edit the title"
       $stdout.puts "  edit desc  - to edit the long description"
@@ -37,7 +37,7 @@ class EditHandler
       $stdout.puts "  edit time  - to edit the time"
     end
   end
-  
+
   # Small helper to parse the due date when editing the dates of issues.
   # @param time is the date-time in string format (eg Oct 28)
   # @return nothing - we're just setting if the data format is ok
@@ -63,9 +63,9 @@ class EditHandler
       "Invalid date/time format. Try format like 'Oct 28'"
   end
 
-  # TODO fix me 
+  # 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 
+  # @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_str)
@@ -76,4 +76,4 @@ class EditHandler
   attr :issue
 
 end
-end # wlog 
+end # wlog

data/lib/wlog/ui/git_ui.rb

@@ -3,45 +3,58 @@ module Wlog
 # Interface to setup git stuff.
 # @author Simon Symeonidis
 class GitUi
-  
+
   def initialize
     @strmaker = SysConfig.string_decorator
   end
 
-  def run 
-    cmd = "default" 
+  def run
+    cmd = "default"
 
-    until cmd == "end" do 
+    until cmd == "end" do
       cmd = Readline.readline("[#{@strmaker.blue('git')}] ")
 
-      case cmd 
+      case cmd
       when /^set/
         path = Readline.readline("Path to git repo (eg: project/.git/): ")
-        
+
         unless File.directory? path
           puts @strmaker.red("That doesn't look like a git repo. Nothing done")
           next
         end
 
         author = Readline.readline("git author: ")
- 
+
         # Set the git repo in the db (so one git repo per db)
         KeyValue.put!("git", path)
         KeyValue.put!("author", author)
 
-      when /^unset/
-        KeyValue.put!("git", "")
+        when /^unset/
+          KeyValue.put!("git", "")
 
-      when /^(ls|show)/
-        print '  repo: '
-        puts @strmaker.green(KeyValue.get("git"))
-        print '  auth: '
-        puts @strmaker.yellow(KeyValue.get("author"))
+        when /^(ls|show)/
+          print '  repo: '
+          puts @strmaker.green(KeyValue.get("git"))
+          print '  auth: '
+          puts @strmaker.yellow(KeyValue.get("author"))
+
+      when /^help/
+        print_help
 
       end
     end
-  end
 
+    private
+
+    def print_help
+      ['ls, show', 'list the current git repository settings',
+       'set', 'set repo and author for currnet git repository',
+       'unset', 'unsets git repository settings',
+       'help', 'print this menu'].each_with_index do |cmd,ix|
+         print "  " if ix % 2 == 1
+         puts cmd
+       end
+    end
+  end
 end
 end
-