openall_time_applet 0.0.23 → 0.0.24

data/Gemfile

@@ -18,5 +18,4 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.8.3"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       glib2 (>= 1.1.3)
     cairo (1.12.2)
       pkg-config
-    datet (0.0.4)
+    datet (0.0.9)
     diff-lcs (1.1.3)
     gdk_pixbuf2 (1.1.3)
       glib2 (>= 1.1.3)
@@ -18,15 +18,16 @@ GEM
       atk (>= 1.1.3)
       gdk_pixbuf2 (>= 1.1.3)
       pango (>= 1.1.3)
-    http2 (0.0.0)
-      knjrbfw
+    http2 (0.0.4)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.3)
-    knjrbfw (0.0.55)
+    knjrbfw (0.0.65)
+      datet
+      http2
       tsafe
       wref
     locale (2.0.5)
@@ -35,7 +36,6 @@ GEM
       glib2 (>= 1.1.3)
     pkg-config (1.1.3)
     rake (0.9.2.2)
-    rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
     rmagick (2.13.1)
@@ -63,7 +63,6 @@ DEPENDENCIES
   jeweler (~> 1.8.3)
   json
   knjrbfw
-  rcov
   rdoc (~> 3.12)
   rmagick
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/gui/win_main.rb

@@ -4,7 +4,7 @@ class Openall_time_applet::Gui::Win_main
   def initialize(args)
     @args = args
     
-    @gui = Gtk::Builder.new.add("../glade/win_main.glade")
+    @gui = Gtk::Builder.new.add("#{File.dirname(__FILE__)}/../glade/win_main.glade")
     @gui.translate
     @gui.connect_signals{|h| method(h)}
     
@@ -591,7 +591,11 @@ class Openall_time_applet::Gui::Win_main
     end
     
     return nil if Knj::Gtk2.msgbox(_("Do you want to remove this timelog?"), "yesno") != "yes"
-    @args[:oata].ob.delete(tlog)
+    begin
+      @args[:oata].ob.delete(tlog)
+    rescue => e
+      Knj::Gtk2.msgbox(sprintf(_("Could not delete the timelog: %s"), e.message))
+    end
   end
   
   def on_btnPlus_clicked

data/lib/openall_time_applet.rb

@@ -314,11 +314,6 @@ class Openall_time_applet
     end
   end
   
-  #Shows the sync overview, which must be seen before the actual sync.
-  def show_prepare_sync
-    Openall_time_applet::Gui::Win_sync_overview.new(:oata => self)
-  end
-  
   #Refreshes task-cache, create missing worktime from timelogs and push tracked time to timelogs. Shows a status-window while doing so.
   def sync_real
     sw = Knj::Gtk2::StatusWindow.new

data/models/timelog.rb

@@ -107,7 +107,7 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
   def descr_short
     descr = self[:descr].to_s.gsub("\n", " ").gsub(/\s{2,}/, " ")
     descr = Knj::Strings.shorten(descr, 20)
-    descr = "[#{_("no description")}]" if descr.to_s.strip.length <= 0
+    #descr = "[#{_("no description")}]" if descr.to_s.strip.length <= 0
     return descr
   end
   
@@ -115,7 +115,7 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
   def transport_descr_short
     descr = self[:transportdescription].to_s.gsub("\n", " ").gsub(/\s{2,}/, " ")
     descr = Knj::Strings.shorten(descr, 20)
-    descr = "[#{_("no description")}]" if descr.to_s.strip.length <= 0
+    #descr = "[#{_("no description")}]" if descr.to_s.strip.length <= 0
     return descr
   end
   

data/models/worktime.rb

@@ -15,6 +15,11 @@ class Openall_time_applet::Models::Worktime < Knj::Datarow
       found << wt_d["uid"]
       task = self.ob.get_by(:Task, {"openall_uid" => wt_d["task_uid"]})
       
+      if !task
+        $stderr.puts sprintf(_("Task with UID '%s' was not found."), wt_d["task_uid"]) + " - " + sprintf(_("Skipping worktime with UID %s"), wt_d["uid"])
+        next
+      end
+      
       save_hash = {
         :openall_uid => wt_d["uid"],
         :task_id => task.id,

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-16}
+  s.date = %q{2012-07-17}
   s.description = %q{Off-line time-tracking for OpenAll with syncing when online.}
   s.email = %q{k@spernj.org}
   s.executables = ["OpenAll Timelogging", "openall_time_applet.rb"]
@@ -78,7 +78,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<gtk2>, [">= 0"])
@@ -92,7 +91,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<knjrbfw>, [">= 0"])
@@ -107,7 +105,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/spec/openall_time_applet_spec.rb

@@ -1,13 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "timeout"
 
 describe "OpenallTimeApplet" do
   it "should be able to start" do
     $tmp_path = "/tmp/openall_spec.sqlite3"
+    File.unlink($tmp_path) if File.exists?($tmp_path)
     Openall_time_applet::CONFIG[:db_path] = $tmp_path
     $oata = Openall_time_applet.new
   end
   
   it "should be able to clone timelogs" do
+    debug = false
+    
     date = Datet.new
     date.days - 1
     
@@ -33,17 +37,69 @@ describe "OpenallTimeApplet" do
     timelogs = $oata.ob.list(:Timelog, "orderby" => "timestamp").to_a
     raise "Expected amount of timelogs to be 2 but it wasnt: #{timelogs.length}" if timelogs.length != 2
     
+    #Try to delete a timelog that has a sub-timelog with logged time. It should show an error message-box.
+    $oata.show_main
+    main = Knj::Gtk2::Window.get("main")
+    main.gui["expOverview"].expanded = true
+    main.gui["tvTimelogs"].selection.select_iter(main.gui["tvTimelogs"].model.iter_first)
+    
+    #Click the minus.
+    t = Thread.new do
+      main.gui["btnMinus"].clicked
+    end
+    
+    #Answer 'yes' to delete timelog.
+    print "Passing until msgbox is shown.\n" if debug
+    Thread.pass while !Knj::Gtk2::Msgbox.shown?
+    raise "Unexpected label: '#{Knj::Gtk2::Msgbox.cur_label}'." if Knj::Gtk2::Msgbox.cur_label.to_s != _("Do you want to remove this timelog?")
+    Knj::Gtk2::Msgbox.cur_respond(Gtk::Dialog::RESPONSE_YES)
+    
+    #Wait for the 'could not delete timelog' to be shown.
+    Thread.pass while !Knj::Gtk2::Msgbox.shown?
+    
+    #Could-not-delete-timelog was shown - press ok to that.
+    raise "Unexpected msgbox-label: #{Knj::Gtk2::Msgbox.cur_label}." if Knj::Gtk2::Msgbox.cur_label.index("Could not delete the timelog") == nil
+    
+    Knj::Gtk2::Msgbox.cur_respond(Gtk::Dialog::RESPONSE_OK)
+    raise "Didnt expect the timelog to be deleted." if timelog.deleted?
+    
+    #Reset the sub-timelogs time and try to delete again. This time it should actually be deleted.
     #Or else it wont be possible to delete main timelog.
     timelog.child_timelogs do |child_timelog|
       child_timelog[:time] = 0
     end
-  end
-  
-  it "should automatically delete sub-timelogs" do
-    main = $oata.ob.get_by(:Timelog, "parent_timelog_id" => 0)
-    $oata.ob.delete(main)
-    timelogs = $oata.ob.list(:Timelog, "orderby" => "timestamp").to_a
-    raise "Expected amount of timelogs to be 0 but it wasnt: #{timelogs.length}" if timelogs.length != 0
+    
+    #Mark timelog.
+    main.gui["tvTimelogs"].selection.select_iter(main.gui["tvTimelogs"].model.iter_first)
+    
+    #Click the minus.
+    t = Thread.new do
+      main.gui["btnMinus"].clicked
+    end
+    
+    #Answer 'yes' to delete timelog.
+    print "Passing until msgbox is shown.\n" if debug
+    Thread.pass while !Knj::Gtk2::Msgbox.shown?
+    raise "Unexpected label: '#{Knj::Gtk2::Msgbox.cur_label}'." if Knj::Gtk2::Msgbox.cur_label.to_s != _("Do you want to remove this timelog?")
+    
+    print "Doing yes-response to last.\n" if debug
+    Knj::Gtk2::Msgbox.cur_respond(Gtk::Dialog::RESPONSE_YES)
+    
+    #Wait for timelog to be deleted or another msgbox to be shown.
+    print "Passing until msgbox is shown or timelog deleted.\n" if debug
+    Timeout.timeout(2) do
+      Thread.pass while !Knj::Gtk2::Msgbox.shown? and !timelog.deleted?
+    end
+    sleep 0.1
+    
+    print "Done with passing.\n" if debug
+    
+    if Knj::Gtk2::Msgbox.shown?
+      raise "A new message box was shown: '#{Knj::Gtk2::Msgbox.cur_label}'."
+      Knj::Gtk2::Msgbox.cur_respond(Gtk::Dialog::RESPONSE_OK)
+    end
+    
+    raise "Timelog was not deleted." if !timelog.deleted?
   end
   
   it "should remove the temp db" do

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 +02:00
+date: 2012-07-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,17 +145,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id013
 description: Off-line time-tracking for OpenAll with syncing when online.
 email: k@spernj.org
 executables: 
@@ -218,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1310176801953661997
+      hash: 749465964052469739
       segments: 
       - 0
       version: "0"