backlog 0.21.2 → 0.21.3

data/History.txt

@@ -1,3 +1,17 @@
+== 0.21.3 2008-02-13
+
+=== Features
+
+* Added link to weekly work sheet from daily work sheet.
+
+=== Fixes
+
+* Fixed reading the default host/port for Work Lock Nag email from the local network settings and backlog.conf.
+* Fixed adding startup links on non-redhat unix distributions.  Now use "ln -s ..." instead.
+* Fixed bug that could occur when finishing tasks.
+* Fixed bug when starting two tasks at the same time.
+* Added missing dependency for the "slave" gem to WAR cofig.
+
 == 0.21.2 2008-02-08
 
 === Features

data/Rakefile

@@ -34,7 +34,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.url = 'http://rubyforge.org/projects/backlog/'
   p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '= 1.15.12'],
   ['postgres', '>= 0.7.9'], ['slave', '>= 1.2.1']]
-  p.rsync_args = "-av --delete --exclude=wiki*"
+  p.rsync_args = "-acuv --delete --exclude=wiki*"
 end
 
 desc 'Release the application to RubyForge'

data/app/controllers/user_controller.rb

@@ -44,7 +44,6 @@ class UserController < ApplicationController
   end  
   
   def logout
-    session[:user_id] = nil
     self.current_user = nil
     cookies.delete :autologin
     redirect_to :action => 'login'

data/app/helpers/periods_helper.rb

@@ -45,7 +45,7 @@ module PeriodsHelper
       page.insert_html :top, period_tag_id, %Q{<ul id="#{list_tag_id}" class="task_list"/>}
       page.insert_html :top, period_tag_id, :partial => '/tasks/fields_header', :locals => {:backlog => @task.backlog, :active => false, :work_done => work_done}
     end
-    page.insert_html :top, list_tag_id, :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false}
+    page.insert_html :top, list_tag_id, :partial => '/tasks/task', :locals => {:active => false, :hidden => true, :highlight_task => false, :show_backlog => true}
     page.visual_effect :appear, "task_#{@task.id}"
     
   end

data/app/helpers/tasks_helper.rb

@@ -1,17 +1,2 @@
 module TasksHelper
 end
-
-class Time
-  def self.next_quarter
-    now = Time.now
-    now -= now.sec
-    next_quarter = now + (15 - now.min % 15).minutes
-  end
-  
-  def self.previous_quarter
-    now = Time.now
-    now -= now.sec
-    previous_quarter = now - (now.min % 15).minutes
-  end
-  
-end

data/app/models/task.rb

@@ -1,3 +1,5 @@
+require 'time_extras'
+
 class Task < ActiveRecord::Base
   extend UserSystem
   include UserSystem
@@ -349,9 +351,9 @@ class Task < ActiveRecord::Base
     
     new_work.started_at = Time.previous_quarter
       if current_user
-        last_work = current_user.works.last
+        last_work = current_user.works.select {|w| w.completed_at}.last
       else
-        last_work = Work.find(:first, :order => 'compeleted_at DESC')
+        last_work = Work.find(:first, :conditions => 'completed_at IS NOT NULL', :order => 'completed_at DESC')
       end
       if last_work && last_work.completed_at > new_work.started_at
         new_work.started_at = last_work.completed_at

data/app/models/work_lock_nagger.rb

@@ -8,11 +8,14 @@ class WorkLockNagger
     sleep 1.minute
     puts "Work Lock Nagger started"
     begin
-      host = Socket::gethostbyname('localhost')[1][1]
       config = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
-      port = config[:port] || 3000
-
-      url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
+      if app_url = config[:app_url]
+        url = app_url + 'works/weekly_work_sheet_by_work_account'
+      else      
+        host = Socket::gethostname
+        port = config[:port] || 3000
+        url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
+      end
     rescue Exception => e
       puts e.message
       puts e.backtrace

data/app/views/works/daily_work_sheet.rhtml

@@ -10,6 +10,12 @@
 <br clear="all" />
 
 <table sstyle="width: 100%" border="0">
+  <tr>
+    <th align="right" colspan="5">
+    	<%=link_to l(:weekly_work_sheet), :action => :weekly_work_sheet_by_work_account%>
+    </th>
+  </tr>
+
   <tr>
     <th><%=l :account %></th>
     <th><%=l :description %></th>

data/bin/backlog

@@ -146,10 +146,31 @@ when 'setup_unix'
     File.delete startup_app if File.exists? startup_app
     `cp -p #{INSTALL_DIR}/bin/backlog_init.d #{startup_app}` unless File.exists? startup_app
     `chmod a+x #{startup_app}` if File.exists? startup_app
+    (0..6).each do |run_level|
+      link_name      = "/etc/rc#{run_level}.d/S88#{APPLICATION}"
+      kill_link_name = "/etc/rc#{run_level}.d/K12#{APPLICATION}"
+      if [3,4,5].include? run_level
+        unless File.exists? link_name
+          puts "Creating startup link for run level #{run_level}."
+          `su - -c "ln -s /etc/init.d/#{APPLICATION} #{link_name}"`
+        end
+        if File.exists? kill_link_name
+          puts "Removing kill link for run level #{run_level}."
+          `su - -c "rm #{kill_link_name}"`
+        end
+      else
+        if File.exists? link_name
+          puts "Removing startup link for run level #{run_level}."
+          `su - -c "rm #{link_name}"`
+        end
+        unless File.exists? kill_link_name
+          puts "Creating kill link for run level #{run_level}."
+          `su - -c "ln -s /etc/init.d/#{APPLICATION} #{kill_link_name}"`
+        end
+      end
+    end
   end
   FileUtils.cp "#{INSTALL_DIR}/etc/#{APPLICATION}.conf", config_file unless File.exists? config_file
-  `su - -c "chkconfig --add #{APPLICATION}"`
-  `su - -c "chkconfig #{APPLICATION} on"`
   puts
 else
   puts "Usage: #$0 {start|stop|restart|status|setup_unix [bsd] [debug]}"

data/config/war.rb

@@ -1,18 +1,19 @@
 # Goldspike configuration
 
 # Set the version of JRuby and GoldSpike to use:
-#maven_library 'org.jruby', 'jruby-complete', '1.0'
+maven_library 'org.jruby', 'jruby-complete', '1.1RC1'
+maven_library 'backport-util-concurrent', 'backport-util-concurrent', '3.0'
 #maven_library 'org.jruby.extras', 'goldspike', '1.3-SNAPSHOT'
 
 # Add a Java library from the Maven repository:
 maven_library 'postgresql', 'postgresql', '8.2-504.jdbc4'
 #maven_library 'bouncycastle', 'bcprov-jdk16', '136'
 
-#add_gem('postgres-pr', '>=0.0.1')
 add_gem('jruby-openssl', '>=0.0.4')
 add_gem('rubyforge', '>=0.4.4')
 add_gem('rmagick4j', '>=0.3.3')
 add_gem('gruff', '>=0.2.8')
+add_gem('slave', '>=1.2.1')
 
 exclude_files('pkg')
 

data/lib/clock.rb

@@ -11,4 +11,4 @@ class Clock
   def self.time=
     raise "Cannot set real Clock class"
   end
-end
+end

data/lib/time_extras.rb

@@ -0,0 +1,14 @@
+class Time
+  def self.next_quarter
+    now = Time.now
+    now -= now.sec
+    next_quarter = now + (15 - now.min % 15).minutes
+  end
+  
+  def self.previous_quarter
+    now = Time.now
+    now -= now.sec
+    previous_quarter = now - (now.min % 15).minutes
+  end
+  
+end

data/lib/user_system.rb

@@ -87,7 +87,7 @@ module UserSystem
   end
   
   def current_user= user
-    session[:user_id] = user && user.id
+    session[:user_id] = user && user.id if @session
     Thread.current[:user] = user
   end
   

data/test/unit/big_decimal_yaml_fix_test.rb

@@ -3,10 +3,11 @@ require 'yaml'
 require 'bigdecimal'
 require 'rubygems'
 require 'active_support'
+require 'big_decimal_yaml_fix'
 
 class BigDecimalYamlTest < Test::Unit::TestCase
   def test_to_yaml
-    #assert_equal "--- 1.0\n", BigDecimal.new('1').to_yaml
+    assert_equal "--- 1.0\n", BigDecimal.new('1').to_yaml
     assert_equal "--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml
     assert_equal "--- .Inf\n", BigDecimal.new('Infinity').to_yaml
     assert_equal "--- .NaN\n", BigDecimal.new('NaN').to_yaml

data/test/unit/task_test.rb

@@ -1,10 +1,26 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class TaskTest < Test::Unit::TestCase
+  include UserSystem
+  
   main_scenario
   
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    self.current_user = User.find(1000001)
+  end
+
+  def teardown
+    self.current_user = nil
+  end
+
+  def test_two_started_tasks
+    tasks(:first).start_work
+    tasks(:another).start_work
+  end
+
+  def test_two_started_tasks_anonymous
+    self.current_user = nil
+    tasks(:first).start_work
+    tasks(:another).start_work
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-08 00:00:00 +01:00
+date: 2008-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -598,6 +598,7 @@ files:
 - lib/change_column_null_migration_fix.rb
 - lib/version_from_history.rb
 - lib/user_system.rb
+- lib/time_extras.rb
 - lib/localization.rb
 - config
 - config/database.yml