wlog 1.1.7 → 1.2.0

data/lib/wlog/ui/issue_ui.rb

@@ -8,6 +8,7 @@ require 'wlog/commands/innit_db'
 require 'wlog/commands/concat_description'
 require 'wlog/domain/sys_config'
 require 'wlog/domain/timelog_helper'
+require 'wlog/domain/attachment'
 require 'wlog/ui/edit_handler'
 
 module Wlog
@@ -30,7 +31,7 @@ class IssueUi
       when /^new/       then new_entry
       when /^(ls|show)/ then show_entries
       when /^desc/      then describe_issue
-      when /^delete/    then delete_entry
+      when /^delete/    then delete_entry(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
@@ -38,6 +39,9 @@ class IssueUi
       when /^lt/        then time(cmd.split.drop 1) # lt for log time
       when /^forget/    then cmd = "end"
       when /^finish/    then finish ? cmd = "end" : nil
+      when /^attachout/  then output_attach
+      when /^attachls/ then show_attach
+      when /^attach/ then attach
       when /^help/      then print_help
       when /^end/       then next
       else puts "Type 'help' for help"
@@ -50,6 +54,44 @@ class IssueUi
 
 private 
 
+  # 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
+  end
+
+  def show_attach
+    atts = @issue.attachments
+    atts.each do |att| 
+      printf "[%d] - %s (alias: %s)\n", att.id, att.filename, att.given_name
+    end
+  end
+
+  def attach
+    loc = Readline.readline('Absolute file location: ')
+    loc.strip!
+    name_alias = Readline.readline('Alias name for file (optional): ')
+    name_alias.strip!
+    
+    fh = File.open(loc, "r")
+    data = fh.read
+    fh.close
+
+    att = Attachment.new(:filename => loc.split('/').last, :data => data, 
+      :given_name => :name_alias)
+    @issue.attachments << att
+
+    puts 'Attached file.'
+  rescue
+    puts 'You need to provide a proper path.'
+  end
+
   # Time logging command
   def time(rest)
     time = TimelogHelper.parse(rest.join) 
@@ -58,12 +100,17 @@ private
   end
 
   # Print the description of the issue
-  def describe_issue; puts @issue end
+  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",
@@ -91,9 +138,14 @@ private
     NewEntry.new(description, @issue).execute
   end
 
-  def delete_entry
-    id = Readline.readline('Remove task log with id : ').to_i
-    LogEntry.delete(id)
+  def delete_entry(cmd_a)
+    case cmd_a[0]
+    when /t/, /task/       then LogEntry.delete(cmd_a[1])
+    when /a/, /attachment/ then Attachment.delete(cmd_a[1])
+    end
+    # If something gets deleted, we need to reload the issue so that the
+    # relations are ok.
+    @issue.reload
   end
 
   # Concatenate an aggregate description to a previous item

data/lib/wlog/ui/template_ui.rb

@@ -42,7 +42,7 @@ private
   end
 
   def ls
-    num = SysConfig.get_config('template') || 1
+    num = KeyValue.get('template') || 1
     num = num.to_i
     Dir[TemplateDir + "*"].each_with_index do |file,ix|
       print " #{ix + 1 == num ? @strmaker.blue('*') : ' '} "
@@ -58,7 +58,7 @@ private
       return
     end
 
-    SysConfig.store_config('template', num)
+    KeyValue.put!('template', num)
   end
 
 end

data/lib/wlog/version.rb

@@ -1,3 +1,3 @@
 module Wlog
-  VERSION = "1.1.7"
+  VERSION = "1.2.0"
 end

data/spec/domain/attachment_spec.rb

@@ -1,58 +1,52 @@
 # We'll be ignoring this for now...
 #
-# require_relative '../make_db'
-# require 'wlog/domain/attachment'
-# require 'wlog/domain/log_entry'
-# require 'wlog/domain/issue'
-# 
-# include Wlog
-# 
-# describe Attachment do 
-# 
-#   db_name = './default'
-#   
-#   class FileMock
-#     attr_accessor :filename, :data, :path
-#   end
-# 
-#   def create_mock_file
-#     fm = FileMock.new
-#     fm.filename = "thefile.txt"
-#     fm.data = "This is my text data." 
-#     fm.path = "/home/user/"
-#   fm end
-# 
-#   before(:all) do
-#     make_testing_db(db_name)
-#     @db = DbRegistry.new(db_name) 
-#     @issue = Issue.new(@db)
-#     @log_entry = LogEntry.new(@db)
-# 
-#     @issue.description = "This is my issue"
-#     @issue.insert
-#     @log_entry.issue_id = @issue.id
-#     @log_entry.description = "This is my log_entry"
-#     @log_entry.insert
-#   end
-# 
-#   after(:all) do
-#     FileUtils.rm db_name
-#   end
-# 
-#   # Note: this example uses issue, but this will be valid for whatever other
-#   # type we want to associate to this class. 
-#   it "should insert given polymorphic type" do
-#     file = create_mock_file
-#     attach = Attachment.new(@db, Issue.name, @issue.id)
-#     attach.filename = file.filename
-#     attach.data = file.data
-#     attach.insert
-#     check = Attachment.find(@db, Issue.name, @issue.id)
-#     expect(check).to_not eq(nil)
-#   end
-# 
-#   it "should return nil if something is not found" do
-#     expect(Attachment.find(@db, Issue.name, 123123123)).to eq(nil)
-#   end
-# end 
+require_relative '../spec_helper.rb'
+require_relative '../make_db'
+require 'wlog/domain/attachment'
+require 'wlog/domain/log_entry'
+require 'wlog/domain/issue'
+require 'zlib'
+
+include Wlog
+
+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.
+     @attachment = Attachment.new
+     @attachment.filename = 'filename'
+     @attachment.given_name = 'given name'
+     @attachment.data = 'data stuff'
+
+     @issue.attachments << @attachment
+     @issue.save
+
+     issue = Issue.find(@issue.id)
+     expect(issue.attachments.count).to eq(1)
+     expect(issue.attachments.first.filename).to eq('filename')
+     expect(issue.attachments.first.given_name).to eq('given name')
+     expect(issue.attachments.first.data).to eq('data stuff')
+   end
+
+   it "should return nil if something is not found" do
+     expect(Attachment.find_by_id(123123123)).to eq(nil)
+   end
+end 
 # 

data/spec/domain/commands/concat_desc_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../../spec_helper'
 require_relative '../../make_db'
 require 'wlog/domain/attachment'
 require 'wlog/domain/log_entry'

data/spec/domain/commands/new_entry_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../../spec_helper'
 require_relative '../../make_db'
 require 'wlog/domain/attachment'
 require 'wlog/domain/log_entry'

data/spec/domain/commands/replace_pattern_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../../spec_helper'
 require_relative '../../make_db'
 require 'wlog/domain/log_entry'
 require 'wlog/domain/issue'

data/spec/domain/git_commits_spec.rb

@@ -0,0 +1,85 @@
+require_relative '../spec_helper'
+
+include Wlog
+
+describe GitCommitParser do 
+
+  GitLogSample = <<GITDATA
+commit 19b5dd496ba2e4125c681b3c505f7631053a2fab
+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).
+
+commit 533f1245a8e6d4382e250518d0a9ee4b19b7657d
+Author: psyomn <lethaljellybean@gmail.com>
+Date:   Wed Oct 23 22:57:57 2013 -0400
+
+    Add taint setup command.
+
+commit 4630d627b5b5f4f114e35991daea8684fca6ddd9
+Author: psyomn <lethaljellybean@gmail.com>
+Date:   Wed Oct 23 22:46:27 2013 -0400
+
+    Add setup wizard.
+
+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 
+BADGIT
+
+  it 'should return [] on null string' do 
+    expect(GitCommitParser.parse('')).to eq([])
+  end
+
+  it 'should return [] on malformed format' do
+    expect(GitCommitParser.parse(Malformed)).to eq([])
+  end
+
+  it 'should return 3 commit logs' do
+    expect(GitCommitParser.parse(GitLogSample).count).to eq(3)
+  end
+
+  it 'should retrieve hashes' do 
+    commits = GitCommitParser.parse(GitLogSample)
+    hashes = commits.collect &:commit
+    expected_hashes = [
+      '4630d627b5b5f4f114e35991daea8684fca6ddd9',
+      '533f1245a8e6d4382e250518d0a9ee4b19b7657d',
+      '19b5dd496ba2e4125c681b3c505f7631053a2fab']
+    expect(hashes.count).to eq(3)
+    expect((hashes & expected_hashes).count).to eq(3)
+  end
+
+  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 
+    commits = GitCommitParser.parse(GitLogSample)
+    shortlogs = commits.collect &:shortlog
+    expect(shortlogs.count).to eq(3)
+    # all shortlogs contain text
+    expect(shortlogs.inject(true){ |sum,e| e != "" }).to be true
+  end
+
+  it 'should retrieve messages' do
+    commits = GitCommitParser.parse(GitLogSample)
+    messages = commits.collect &:message
+    messages.reject! { |e| e == "" }
+    expect(messages.count).to eq(1)
+    expect(messages.inject(true){ |e| e != "" }).to be true
+  end
+
+end

data/spec/domain/invoice_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../spec_helper'
+require_relative '../make_db'
+
+include Wlog
+
+describe Invoice do 
+  include DomainHelpers
+
+  db_name = 'default'
+  db_path = standard_db_path(db_name)
+
+  before :all do 
+    make_testing_db(db_name)
+  end
+
+  after :all do 
+    FileUtils.rm db_path
+  end
+
+  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
+      issue.log_entries << le
+    end
+    issue.save
+
+    expect(invoice.log_entries_within_dates.count).to eq(10)
+  end
+
+end
+

data/spec/domain/issue_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../spec_helper'
 require_relative '../make_db'
 require 'wlog/domain/issue'
 

data/spec/domain/key_value_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../spec_helper'
 require_relative '../make_db'
 require 'wlog/domain/key_value'
 

data/spec/domain/log_entry_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../spec_helper'
 require_relative '../make_db'
 require 'wlog/domain/log_entry'
 require 'wlog/domain/issue'

data/spec/domain/sys_config_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../spec_helper'
 require_relative '../make_db'
 require 'wlog/domain/sys_config'
 

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+require 'coveralls'
+require 'date'
+require 'wlog/domain/invoice'
+require 'wlog/domain/issue'
+require 'wlog/domain/log_entry'
+require 'wlog/tech/git_commit_parser'
+
+Coveralls.wear!
+
+$sn = 0
+
+module DomainHelpers
+  def sn
+    old = $sn
+    $sn += 1
+  old end
+ 
+  # Make a log entry but don't store it
+  def make_log_entry
+    le = LogEntry.new(:description => "Desc ##{sn}")
+  le end
+
+  def make_issue
+    is = Issue.new(:description => "Desc #{sn}",
+      :due_date => DateTime.now, 
+      :status => 0, 
+      :timelog => 10, 
+      :long_description => "big desc #{sn}")
+  is end
+end
+

data/wlog.gemspec

@@ -26,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'redcarpet'
+
   spec.add_runtime_dependency "sqlite3", ">= 1.3.7"
-  spec.add_runtime_dependency "rake", ">= 10.3.2"
   spec.add_runtime_dependency 'activerecord', "4.1.6"
 end