backlog 0.9.1 → 0.10.0

data/History.txt

@@ -1,3 +1,20 @@
+== 0.10.0 2007-09-21
+
+=== Features
+
+* Now Backlog is JRuby friendly!
+* Added WAR file to distribution for running on any Java EE application server
+* Reverted from EdgeRails to get Backlog working with JRuby.
+* Added performance tests that are automatically run on every commit.
+
+=== Fixes
+
+* Fixed bug when moving a task from a really old sprint, and the next sprint had already finished.
+* Fixed automatic login using cookie.
+* Added array and hash encoding to url_for in project since it is missing in current Rails trunk.
+* Removed call to "image_tag" since the servlet context (backlog) was added twice to the image URL.
+* Fixed database connection settings for JRuby 
+
 == 0.9.1 2007-09-09
 
 === Fixes

data/README.txt

@@ -24,26 +24,37 @@ There are concrete plans to integrate Backlog to a few types of systems:
 * Issue tracking (Jira, RuyForge, SourceForge, Bugzilla, etc.)
 * Calendars (ICal, Outlook, http://icalendar.rubyforge.org/)
 * Timekeeping
-* Invoicing
+* Invoicing (Mamut)
 
 If you have concrete needs, and are willing to beta test the integration, please contact us.
 
 === Installation
 
+==== Gem
+
 * Install ruby
 * Install RubyGems
 * Install PostgreSQL (or other database management system)
-* Install ImageMagick or GraphicsMagick (only required if you want graphs)
+* Install ImageMagick (only required if you want graphs)
 * run <tt>sudo gem install backlog -y</tt>
 * run <tt>sudo backlog setup_unix</tt>
 * run <tt>sudo backlog start</tt>
 
-=== Updates
+===== Updates
 
 * run <tt>sudo gem update -y</tt>
 * run <tt>sudo backlog setup_unix</tt>
 * run <tt>sudo backlog restart</tt>
 
+==== War
+
+* Install ImageMagick (only required if you want graphs)
+* Install Java (Standard Edition, version 6 or later)
+* Install a Java application server (file a support request at http://rubyforge.org/projects/backlog if you need help).
+* Pop the backlog.war file into it
+
+
+
 === Configuration
 
 You can set configuration parameters for backlog using the /etc/backlog.conf file on unix and "c:\documents and settings\all\backlog.conf" on windows.

data/Rakefile

@@ -21,9 +21,9 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.remote_rdoc_dir = '' # Release to root
   p.changes = p.paragraphs_of('History.txt', 0..4).join("\n\n")
   p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
-  p.clean_globs = ['doc']
+  p.clean_globs = ['doc', 'log']
   p.spec_extras = {
-    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|tmp)/},
+    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|tmp|WEB-INF)/},
     :rdoc_options => ['--inline-source'],
     :executables => ['backlog'],
     :requirements => ['ImageMagick or GraphicsMagick', 'PostgreSQL']
@@ -36,7 +36,21 @@ end
 
 task :release_all do
   ENV['VERSION'] = APP::VERSION
-  Rake::Task[:publish_docs].invoke
+  #Rake::Task[:publish_docs].invoke
   Rake::Task[:release].invoke
-  Rake::Task[:post_news].invoke
+  Rake::Task[:release_war].invoke
+  #Rake::Task[:post_news].invoke
+end
+
+task :release_war do
+  Rake::Task['war:standalone:create'].invoke
+  if File.exists? 'backlog.war'
+    File.makedirs 'pkg'
+    File.move 'backlog.war', "pkg/backlog-#{APP::VERSION}.war"
+  end
+  if File.exists? "pkg/backlog-#{APP::VERSION}.war"
+    rf = RubyForge.new
+    rf.login
+    rf.add_file 'backlog', 'backlog', APP::VERSION, "pkg/backlog-#{APP::VERSION}.war"
+  end
 end

data/app/controllers/application.rb

@@ -1,5 +1,6 @@
 require 'localization'
 require 'user_system'
+require 'url_for_fix'
 
 class ApplicationController < ActionController::Base
   include Localization
@@ -9,6 +10,7 @@ class ApplicationController < ActionController::Base
   include ActionView::Helpers::JavaScriptHelper
   include ActionView::Helpers::PrototypeHelper
   include ActionView::Helpers::ScriptaculousHelper
+  include UrlForFix
   
   layout :determine_layout
   helper :user

data/app/controllers/tasks_controller.rb

@@ -190,8 +190,9 @@ class TasksController < ApplicationController
   def move_to_next_period
     task = Task.find(params[:id])
     if task.period
-      params[:period_id] = task.period.lower_item && task.period.lower_item.id
-      params[:id] = task.id
+      next_period = task.period.lower_item
+      next_period = next_period.lower_item while next_period && next_period.passed?
+      params[:period_id] = next_period && next_period.id
       move_to_period(true)
     else
       redirect_to :action => :edit, :id => task
@@ -206,7 +207,7 @@ class TasksController < ApplicationController
   
   def abort
     task = Task.find params[:id]
-    task.abort(user)
+    task.abort
     back_or_redirect_to(:controller => "periods", :action => "show", :id => task.period)
   end
   

data/app/controllers/user_controller.rb

@@ -10,6 +10,7 @@ class UserController < ApplicationController
       self.current_user = user
       flash['notice'] = 'Login succeeded'
       if remember_me && remember_me == '1'
+        user.generate_security_token
         cookies[:autologin] = {:value => user.id.to_s, :expires =>90.days.from_now}
         cookies[:token]     = {:value => user.security_token, :expires =>90.days.from_now}
       end

data/app/helpers/application_helper.rb

@@ -1,7 +1,9 @@
 require 'localization'
+require 'url_for_fix'
 
 module ApplicationHelper
   include Localization
+  include UrlForFix
   
   def image_button_to(image_source, title, options)
     html = ''

data/app/models/period.rb

@@ -170,25 +170,24 @@ class Period < ActiveRecord::Base
   def burn_down_graph(size)
     begin
       require 'gruff'
-      rescue MissingSourceFile => e
+    rescue MissingSourceFile => e
       return File.read("public/images/rmagick_#{size}.gif") if File.exists? "public/images/rmagick_#{size}.gif"
       return File.read("public/images/rmagick.gif")
     end
-    
     g = Gruff::Line.new(size)
     g.theme_37signals
     g.title = l(:burn_down_chart) + " " + name
     g.font = '/usr/share/fonts/bitstream-vera/Vera.ttf'
     g.legend_font_size = 14
     g.hide_dots = true
-    g.colors = %w{blue orange}
+    g.colors = %w{#0000ff #ff8800}
     if track_work?
-      g.colors += %w{green}
+      g.colors += %w{#00ff00}
     end
     if previous_period = higher_item
-      g.colors += %w{grey grey}
+      g.colors += %w{#cccccc #cccccc}
     end
-    g.colors += %w{lightblue #d7a790}
+    g.colors += %w{#8888ff #d7a790}
     
     recorded_dates = self.recorded_dates
     observed_todo_data = get_todo_data(recorded_dates)

data/app/models/task.rb

@@ -334,7 +334,7 @@ class Task < ActiveRecord::Base
     works << children.map {|t| t.works_with_children}.flatten
   end
   
-  def abort(user)
+  def abort
     finish(Task::ABORTED, false)
   end
   

data/app/views/backlogs/_tasks.rhtml

@@ -17,7 +17,7 @@
         <%= render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent} %>
       <% end %>
     </table>
-    <%= back_or_link_to(l :back) %>
+    <%=back_or_link_to(l(:back)) %>
   </div>
 
   <div class="mainblock">

data/app/views/periods/_burn_down_chart.rhtml

@@ -3,6 +3,7 @@
         <h4><%=l :burn_down_chart %></h4>
       </div>
 
-<%= link_to image_tag(url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @period, :format => :png), {:alt => 'Burn down chart'}), :action => :burn_down_chart, :id => @period, :format => :png %>
+<%= link_to %Q{<img src="#{url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @period, :format => :png)}" alt="Burn down chart" />}, :action => :burn_down_chart, :id => @period, :format => :png %>
+
 
     </div>

data/app/views/user/login.rhtml

@@ -8,7 +8,7 @@
       <table>
         <tr class="two_columns">
           <td class="prompt"><label>Login:</label></td>
-          <td class="value"><%= text_field 'user', 'login', :size => 30, :value => cookies['autologin'] && cookies['autologin'][0] %></td>
+          <td class="value"><%= text_field 'user', 'login', :size => 30, :value => cookies['autologin'] && User.find(cookies['autologin'][0]).login %></td>
         </tr>
         <tr class="two_columns">
           <td class="prompt"><label>Password:</label></td>

data/config/database.yml

@@ -1,19 +1,44 @@
 development:
+<% if RUBY_PLATFORM =~ /java/ %>
+  adapter: jdbc
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/backlog_development
+  database: backlog_development
+  username: root
+  host: localhost
+<% else %>
   adapter: postgresql
   database: backlog_development
   username: root
   host: localhost
+<% end %>
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
+<% if RUBY_PLATFORM =~ /java/ %>
+  adapter: jdbc
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/backlog_test
+  database: backlog_test
+  username: root
+  host: localhost
+<% else %>
   adapter: postgresql
   database: backlog_test
+<% end %>
 
 production:
+<% if RUBY_PLATFORM =~ /java/ %>
+  adapter: jdbc
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/backlog_production
+  username: root
+  host: localhost
+<% else %>
   adapter: postgresql
   database: backlog_production
   username: root
   host: localhost
-  
+<% end %>

data/config/environment.rb

@@ -28,6 +28,12 @@ if File.exists? APP_CONFIG_FILE
   end
 end
 
+if RUBY_PLATFORM =~ /java/
+  require 'rubygems'
+  RAILS_CONNECTION_ADAPTERS = %w(jdbc)
+  require 'postgresql-8.2-504.jdbc4'
+end
+
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   
@@ -44,7 +50,7 @@ Rails::Initializer.run do |config|
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
   # config.action_controller.session_store = :active_record_store
-  config.action_controller.session = { :session_key => "_backlog_session", :secret => "it is but a figment of my mind" }
+  #config.action_controller.session = { :session_key => "_backlog_session", :secret => "it is but a figment of my mind" }
   
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 

data/config/war.rb

@@ -0,0 +1,26 @@
+# Goldspike configuration
+
+# Set the version of JRuby and GoldSpike to use:
+#maven_library 'org.jruby', 'jruby-complete', '1.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')
+
+exclude_files('pkg')
+
+# Production
+configuration.jetty_java_opts = '-Xmx1024m -Dcom.sun.grizzly.rails.numberOfRuntime=16'
+
+#Profile
+#configuration.jetty_java_opts = '-Xmx1024m -Dcom.sun.grizzly.rails.numberOfRuntime=32 -verbose:gc -Djruby.jit.logging=true -XX:+CITime -XX:+PrintCompilation'
+
+# Experiment
+#configuration.jetty_java_opts = '-Xmx1024m -Djruby.jit.logging=true -Dcom.sun.grizzly.rails.numberOfRuntime=32 -XX:+PrintCompilation'

data/config/war.rb~

@@ -0,0 +1,11 @@
+# Goldspike configuration
+
+# Set the version of JRuby and GoldSpike to use:
+#maven_library 'org.jruby', 'jruby-complete', '1.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'
+add_gem('postgres-pr', '>=0.0.1')
+#configuration.jetty_java_opts = '-Xmx1024m -Djruby.jit.enabled=true -Dcom.sun.grizzly.rails.numberOfRuntime=32 -XX:-PrintGC -XX:+CITime -XX:+PrintCompilation'
+configuration.jetty_java_opts = '-Xmx1024m -Djruby.jit.logging=true -Dcom.sun.grizzly.rails.numberOfRuntime=32 -XX:+PrintCompilation'

data/db/migrate/018_create_groups.rb

@@ -5,7 +5,7 @@ class CreateGroups < ActiveRecord::Migration
     end
     
     create_table :groups, :primary_key => :party_id do |t|
-      t.string :name, :null => false
+      t.column :name, :string, :null => false
     end
     
     rename_column :users, :id, :party_id
@@ -17,8 +17,8 @@ class CreateGroups < ActiveRecord::Migration
     add_foreign_key :users, :party_id, :parties, :id
     
     create_table :groups_users, :id => false do |t|
-      t.integer :group_id, :null => false, :references => nil
-      t.integer :user_id, :null => false, :references => nil
+      t.column :group_id, :integer, :null => false, :references => nil
+      t.column :user_id, :integer, :null => false, :references => nil
     end
     
     add_foreign_key :groups_users, :group_id, :groups, :party_id
@@ -65,11 +65,6 @@ class CreateGroups < ActiveRecord::Migration
     remove_column :periods, :party_id
     drop_table :groups_users
 
-p User.foreign_keys
-puts
-p User.foreign_keys.select {|fk| fk.references_table_name == 'parties'}
-puts
-
     User.foreign_keys.select {|fk| fk.references_table_name == 'parties'}.each do |fk|
       remove_foreign_key :users, fk.name
     end
@@ -122,4 +117,3 @@ EOF
     
   end
 end
-

data/db/schema.rb

@@ -5,88 +5,88 @@
 ActiveRecord::Schema.define(:version => 20) do
 
   create_table "backlogs", :force => true do |t|
-    t.string  "name",            :limit => 64,                    :null => false
-    t.boolean "track_todo"
-    t.boolean "track_done"
-    t.boolean "track_times"
-    t.boolean "enable_subtasks",               :default => false, :null => false
-    t.boolean "enable_customer"
-    t.boolean "enable_users"
-    t.string  "invoice_code"
+    t.column "name",            :string,  :limit => 64,                    :null => false
+    t.column "track_todo",      :boolean
+    t.column "track_done",      :boolean
+    t.column "track_times",     :boolean
+    t.column "enable_subtasks", :boolean,               :default => false, :null => false
+    t.column "enable_customer", :boolean
+    t.column "enable_users",    :boolean
+    t.column "invoice_code",    :string
   end
 
   create_table "estimates", :force => true do |t|
-    t.integer  "task_id",                                                   :null => false
-    t.decimal  "todo",       :precision => 6, :scale => 2, :default => 1.0, :null => false
-    t.datetime "created_at",                                                :null => false
-    t.integer  "user_id"
+    t.column "task_id",    :integer,                                                 :null => false
+    t.column "todo",       :decimal,  :precision => 6, :scale => 2, :default => 1.0, :null => false
+    t.column "created_at", :datetime,                                                :null => false
+    t.column "user_id",    :integer
   end
 
   create_table "groups", :primary_key => "party_id", :force => true do |t|
-    t.string "name", :null => false
+    t.column "name", :string, :null => false
   end
 
   create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
+    t.column "group_id", :integer, :null => false
+    t.column "user_id",  :integer, :null => false
   end
 
   add_index "groups_users", ["group_id", "user_id"], :name => "index_groups_users_on_group_id_and_user_id", :unique => true
 
   create_table "parties", :force => true do |t|
-    t.string "type"
+    t.column "type", :string
   end
 
   create_table "periods", :force => true do |t|
-    t.integer "position", :null => false
-    t.date    "start_on", :null => false
-    t.date    "end_on",   :null => false
-    t.integer "party_id"
+    t.column "position", :integer, :null => false
+    t.column "start_on", :date,    :null => false
+    t.column "end_on",   :date,    :null => false
+    t.column "party_id", :integer
   end
 
   create_table "task_files", :force => true do |t|
-    t.integer "task_id",                    :null => false
-    t.string  "name",         :limit => 64, :null => false
-    t.string  "content_type",               :null => false
-    t.binary  "content_data",               :null => false
+    t.column "task_id",      :integer,               :null => false
+    t.column "name",         :string,  :limit => 64, :null => false
+    t.column "content_type", :string,                :null => false
+    t.column "content_data", :binary,                :null => false
   end
 
   create_table "tasks", :force => true do |t|
-    t.integer  "position"
-    t.string   "description",      :limit => 80,                                                :null => false
-    t.datetime "finished_at"
-    t.decimal  "initial_estimate",               :precision => 6, :scale => 2, :default => 1.0, :null => false
-    t.integer  "period_id"
-    t.datetime "created_at"
-    t.integer  "parent_id"
-    t.string   "resolution",       :limit => 16
-    t.integer  "previous_task_id"
-    t.string   "customer",         :limit => 64
-    t.integer  "backlog_id"
-    t.text     "notes"
+    t.column "position",         :integer
+    t.column "description",      :string,   :limit => 80,                                                :null => false
+    t.column "finished_at",      :datetime
+    t.column "initial_estimate", :decimal,                :precision => 6, :scale => 2, :default => 1.0, :null => false
+    t.column "period_id",        :integer
+    t.column "created_at",       :datetime
+    t.column "parent_id",        :integer
+    t.column "resolution",       :string,   :limit => 16
+    t.column "previous_task_id", :integer
+    t.column "customer",         :string,   :limit => 64
+    t.column "backlog_id",       :integer
+    t.column "notes",            :text
   end
 
   create_table "users", :primary_key => "party_id", :force => true do |t|
-    t.string   "login",           :limit => 80,                    :null => false
-    t.string   "salted_password", :limit => 40,                    :null => false
-    t.string   "email",           :limit => 60,                    :null => false
-    t.string   "first_name",      :limit => 40
-    t.string   "last_name",       :limit => 40
-    t.string   "salt",            :limit => 40,                    :null => false
-    t.boolean  "verified",                      :default => false
-    t.string   "role",            :limit => 40
-    t.string   "security_token",  :limit => 40
-    t.datetime "token_expiry"
-    t.boolean  "deleted",                       :default => false
+    t.column "login",           :string,   :limit => 80,                    :null => false
+    t.column "salted_password", :string,   :limit => 40,                    :null => false
+    t.column "email",           :string,   :limit => 60,                    :null => false
+    t.column "first_name",      :string,   :limit => 40
+    t.column "last_name",       :string,   :limit => 40
+    t.column "salt",            :string,   :limit => 40,                    :null => false
+    t.column "verified",        :boolean,                :default => false
+    t.column "role",            :string,   :limit => 40
+    t.column "security_token",  :string,   :limit => 40
+    t.column "token_expiry",    :datetime
+    t.column "deleted",         :boolean,                :default => false
   end
 
   create_table "works", :force => true do |t|
-    t.integer  "task_id",                                                     :null => false
-    t.decimal  "hours",        :precision => 6, :scale => 2, :default => 0.0, :null => false
-    t.datetime "completed_at"
-    t.datetime "started_at"
-    t.integer  "user_id"
-    t.boolean  "invoice"
+    t.column "task_id",      :integer,                                                 :null => false
+    t.column "hours",        :decimal,  :precision => 6, :scale => 2, :default => 0.0, :null => false
+    t.column "completed_at", :datetime
+    t.column "started_at",   :datetime
+    t.column "user_id",      :integer
+    t.column "invoice",      :boolean
   end
 
   add_foreign_key "estimates", ["task_id"], "tasks", ["id"], :name => "estimates_task_id_fkey"