backlog 0.36.2 → 0.37.1

data/app/views/works/weekly_work_sheet.rhtml

@@ -7,7 +7,7 @@
 
 <table border="1">
   <tr>
-    <th><%=l :backlog %></th>
+    <th><%=l :project %></th>
   	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
     	<th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d'), :user_id => (@user != current_user ? @user : nil) %></th>
 	<% end %>
@@ -30,21 +30,21 @@
 
 <% week_totals = Hash.new(0) %>
 <% day_totals = Array.new(7, 0) %>
-<% for backlog, totals in @backlogs %>
+<% for project, totals in @projects %>
   <tr>
     <td valign="top">
-      <%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => backlog.id) %>
+      <%=detour_to(h(project.name), :controller => 'projects', :action => :show, :id => project.id) %>
     </td>
     <% totals.each_with_index do |total, day| %>
       <% if total %>
         <% day_totals[day] += total %>
-        <% week_totals[backlog] += total %>
+        <% week_totals[project] += total %>
         <td align="right" valign="top"><%=t(total)%></td>
       <% else %>
         <td/>
       <% end %>
     <% end %>
-    <td align="right"><%=t(week_totals[backlog])%></td>
+    <td align="right"><%=t(week_totals[project])%></td>
   </tr>
 <% end %>
   <tr>

data/app/views/works/weekly_work_sheet_details.rhtml

@@ -1,8 +1,8 @@
 <% @page_title = l(:weekly_work_sheet) + (@period ? " for #{@period}" : '') + (user? ? " for #{user.login}" : '')%>
 
 <div id="spotlight">
-<% track_times = @rows.find {|r| r.find {|w| w && w.backlog.track_times?}} %>
-<% invoicing = @rows.find {|r| r.find {|w| w && w.backlog.enable_invoicing?}} %>
+<% track_times = @rows.find {|r| r.find {|w| w && w.project.track_times?}} %>
+<% invoicing = @rows.find {|r| r.find {|w| w && w.project.enable_invoicing?}} %>
 <% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
 
 <h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
@@ -18,7 +18,7 @@
   </tr>
   <tr>
 <% (1..7).each do %>
-    <th><%=l :backlog %></th>
+    <th><%=l :project %></th>
     <% if invoicing %>
     <th><%=l :invoice_short %></th>
     <% end %>
@@ -51,13 +51,13 @@
 <!--
           <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
 -->
-          <%=detour_to(h(@work.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.backlog_id) %>
+          <%=detour_to(h(@work.project.name), :controller => 'projects', :action => :show, :id => @work.project_id) %>
         </td>
         <% if invoicing %>
           <td id="invoice_<%=@work.id%>" valign="top">
 		  	<% form_id  = "work_#{@work.id}_invoice_form" %>
 		  	<% field_id = "work_#{@work.id}_invoice" %>
-            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.backlog.enable_invoicing? %>
+            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.project.enable_invoicing? %>
           </td>
         <% end %>
         <% if track_times %>

data/backlog.gemspec

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'version_from_history'
+
+Gem::Specification.new do |s|
+  s.name        = "backlog"
+  s.version     = APP::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Uwe Kubosch", "Lars Ingjer", "Espen Westgaard", 'Arndt Kubosch', 'Kåre Gunnar Bolling Nesheim']
+  s.email       = ["uwe@kubosch.no"]
+  s.homepage    = "http://rubyforge.org/projects/backlog/"
+  s.summary     = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
+  s.description = s.paragraphs_of('README.txt', 2..3).join("\n\n")
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "backlog"
+
+  s.add_development_dependency "rspec"
+
+  s.files        = Dir.glob("{bin,lib}/**/*") + %w(LICENSE README.md ROADMAP.md CHANGELOG.md)
+  s.executables  = ['backlog']
+  s.require_path = 'lib'
+end
+
+Hoe.new("backlog", ) do |p|
+  p.remote_rdoc_dir = '' # Release to root
+
+  p.changes = File.read('History.txt').scan(/^== .*?(?=^== )/m).first
+  # p.extra_rdoc_files = [/^(app\/(controllers|helpers|models)|lib|bin)|txt$/]
+  p.clean_globs = ['doc', 'log/*']
+  p.spec_extras = {
+    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|profiling|tmp|WEB-INF)/},
+    :rdoc_options => ['--inline-source'],
+    :requirements => ['ImageMagick', 'PostgreSQL'],
+  }
+  p.need_zip = true
+  p.extra_deps = [['daemons', '~> 1.1.0'], ['rails', '~> 3.0.0'], ['gruff', '~> 0.3.6'], ['postgres-pr', '~> 0.6.3'],
+      ['slave', '~> 1.2.1'], ['mechanize', '~> 1.0.0'], ['bundler', '~> 1.0.5']]
+  # ['rmagick', '~> 1.15.12'],
+  p.rsync_args = "-acv --delete --exclude=wiki*"
+end
+

data/bin/backlog

@@ -53,7 +53,10 @@ def start(config)
       puts "Unknown status: #{status}.  Stopping"
       exit 2
   end
-  `mongrel_rails start -p #{config['port'] || 3000} -e production -c #{INSTALL_DIR} -d -m #{INSTALL_DIR}/config/mime_types.yaml -P #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
+  Dir.chdir INSTALL_DIR
+  ENV['RAILS_ENV'] = 'production'
+#  `mongrel_rails start -p #{config['port'] || 3000} -e production -c #{INSTALL_DIR} -d -m #{INSTALL_DIR}/config/mime_types.yaml -P #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
+  `glassfish -p #{config['port'] || 3000} -e production -d -P #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
 end
 
 def stop(config)
@@ -137,6 +140,7 @@ when 'setup_unix'
   Dir.chdir INSTALL_DIR
   Dir.mkdir LOG_DIR unless File.exists? LOG_DIR
   ENV['RAILS_ENV'] = 'production'
+  puts `bundle install`
   puts `rake db:migrate #{'--trace' if debug}`
   raise "Could not migrate database: #{$? >> 8}:#{$? & 0xff}" unless ($? >> 8) == 0
   

data/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Backlog::Application

data/config/application.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../boot', __FILE__)
+require 'rails/all'
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Backlog
+  class Application < Rails::Application
+    config.secret_token = "Uffsbarr, I'hll pha<dr, cum rAgdios, Vixef."
+  end
+end

data/config/boot.rb

@@ -1,117 +1,13 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
+require 'rubygems'
 
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-    
-    def booted?
-      defined? Rails::Initializer
-    end
-    
-    def pick_boot
-     (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-    
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-    
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-    
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-  
-  class Boot
-    def run
-      load_initializer
-      
-      Rails::Initializer.class_eval do
-        def load_gems
-          @bundler_loaded ||= Bundler.require :default, Rails.env
-        end
-      end
-      
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-  
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-  
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-    
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-    
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-      
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-      
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.3.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-        
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-      
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-      
-      private
-      def read_environment_rb
-        File.read("#{RAILS_ROOT}/config/environment.rb")
-      end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/config/database.yml

@@ -1,17 +1,14 @@
 development:
   adapter: postgresql
   database: backlog_development
-  username: root
+  username: postgres
 
-# 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:
   adapter: postgresql
   database: backlog_test
-  username: cruisecontrol
+  username: postgres
 
 production:
   adapter: postgresql
   database: backlog_production
-  username: root
+  username: postgres

data/config/database.yml~

@@ -0,0 +1,17 @@
+development:
+  adapter: postgresql
+  database: backlog_development
+  username: postgres
+
+# 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:
+  adapter: postgresql
+  database: backlog_test
+  username: postgres
+
+production:
+  adapter: postgresql
+  database: backlog_production
+  username: postgres

data/config/environment.rb

@@ -17,20 +17,16 @@ unless '1.9'.respond_to?(:force_encoding)
   end
 end
 
-# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '~>2.3.8'
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
+require File.expand_path('../application', __FILE__)
 
 # The following section has been added to load database settings from system config.
 APP_CONFIG_FILE = Config::CONFIG["sysconfdir"] + '/backlog.conf'
 if File.exists? APP_CONFIG_FILE
   puts "Found global config file (#{APP_CONFIG_FILE})"
   module Rails
-    class Configuration
+    module Configuration
       def database_configuration
-        db_conf = YAML::load(ERB.new(IO.read(database_configuration_file)).result)
+        db_conf  = YAML::load(ERB.new(IO.read(database_configuration_file)).result)
         app_conf = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
         if db_settings = app_conf['database']
           puts "Found global database connection settings: #{db_settings.inspect}"
@@ -41,14 +37,14 @@ if File.exists? APP_CONFIG_FILE
     end
   end
 else
-	puts "Optional global config file not present (#{APP_CONFIG_FILE})"    
+  puts "Optional global config file not present (#{APP_CONFIG_FILE})"
 end
 
 DB_CONFIG_FILE = Config::CONFIG["sysconfdir"] + '/backlog/config/database.yml'
 if File.exists? DB_CONFIG_FILE
   puts "Found global database config file (#{DB_CONFIG_FILE})"
   module Rails
-    class Configuration
+    module Configuration
       def database_configuration_file
         DB_CONFIG_FILE
       end
@@ -60,39 +56,6 @@ end
 
 require 'class_table_inheritance'
 
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence those specified here
-  
-  # Skip frameworks you're not going to use
-  # config.frameworks -= [ :action_web_service, :action_mailer ]
-  
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-  
-  # Force all environments to use the same logger level 
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-  
-  # 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" }
-  
-  # 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, 
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
-  
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-  
-  # See Rails::Configuration for more options
-  config.action_controller.session = { :key => "_backlog_session", :secret => "Uffsbarr, I'hll pha<dr, cum rAgdios, Vixef." }
-end
-
 # Add new inflection rules using the following format 
 # (all these examples are active by default):
 # Inflector.inflections do |inflect|
@@ -102,20 +65,36 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-# Include your application configuration below
-
 require 'config/environments/user_environment'
 require 'array_helper'
 require 'big_decimal_yaml_fix'
 
 require 'version_from_history'
 require 'user_system'
-require 'url_for_fix'
 
-if RUBY_PLATFORM !~ /(i386-mswin32|java)/
-gem 'slave'
-require 'slave'
-work_lock_nagger_thread = Slave.object(:async=>true) {WorkLockNagger.new.nag}
+# JRUBY-5187
+module ::ArJdbc::PostgreSQL::Column
+  def extract_limit_with_fix(sql_type)
+    return nil if sql_type =~ /^bytea|date|datetime|int4|text|timestamp/i
+    extract_limit_without_fix(sql_type)
+  end
+
+  alias_method_chain :extract_limit, :fix
+end
+# END JRUBY-5187
+
+
+
+if RUBY_PLATFORM =~ /java/
+  work_lock_nagger_thread = Thread.start{WorkLockNagger.new.nag}
+elsif RUBY_PLATFORM !~ /(i386-mswin32)/
+  gem 'slave'
+  require 'slave'
+  work_lock_nagger_thread = Slave.object(:async => true) { WorkLockNagger.new.nag }
 else
   puts "Not spawning worklog nagger on #$1 platform."
 end
+
+Time.zone = 'CET'
+
+Backlog::Application.initialize!

data/config/environments/development.rb

@@ -1,26 +1,30 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Backlog::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.serve_static_assets = true
+  config.cache_classes = false
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-config.action_view.debug_rjs                         = true
+  # Show full error reports and disable caching
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching             = false
+  config.action_view.debug_rjs                         = true
 
-# Raise exceptions when mailer fails
-config.action_mailer.raise_delivery_errors = true
+  # Raise exceptions when mailer fails
+  config.action_mailer.raise_delivery_errors = true
 
-ActionMailer::Base.delivery_method = :sendmail
+  ActionMailer::Base.delivery_method = :sendmail
 
-#ActionMailer::Base.delivery_method = :smtp
-#ActionMailer::Base.smtp_settings = {
-#  :address => "localhost",
-#  :port => 25,
-#  :domain => 'localdomain'
-#}
+  #ActionMailer::Base.delivery_method = :smtp
+  #ActionMailer::Base.smtp_settings = {
+  #  :address => "localhost",
+  #  :port => 25,
+  #  :domain => 'localdomain'
+  #}
+  config.active_support.deprecation = :log
+end