backlog 0.37.1 → 0.37.2

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.0"
+gem "rails", "~> 3.0.3"
 gem 'slave'
 gem 'mechanize'
 gem 'hpricot'
@@ -12,6 +12,9 @@ platforms :jruby do
   gem 'jruby-openssl'
   gem 'activerecord-jdbc-adapter'
   gem 'activerecord-jdbcpostgresql-adapter'
+  # gem 'glassfish', '~> 1.0.3'
+  gem 'trinidad'
+  gem 'trinidad_daemon_extension'
 end
 
 platforms :ruby do

data/Gemfile.lock

@@ -55,6 +55,7 @@ GEM
     jdbc-postgres (8.4.702-java)
     jruby-openssl (0.7.2)
       bouncy-castle-java
+    jruby-rack (1.0.4)
     json_pure (1.4.6)
     mail (2.2.12)
       activesupport (>= 2.3.6)
@@ -98,6 +99,12 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
+    trinidad (1.0.3)
+      jruby-rack (>= 1.0.2)
+      trinidad_jars (>= 0.3.0)
+    trinidad_daemon_extension (0.2.4)
+      trinidad_jars (>= 0.1.1)
+    trinidad_jars (0.3.3)
     tzinfo (0.3.23)
     user-choices (1.1.6.1)
       builder (>= 2.1.2)
@@ -122,9 +129,11 @@ DEPENDENCIES
   jruby-openssl
   mechanize
   postgres-pr
-  rails (~> 3.0.0)
+  rails (~> 3.0.3)
   rcov
   redhillonrails_core
   simple_workflow
   slave
+  trinidad
+  trinidad_daemon_extension
   wirble

data/History.txt

@@ -1,3 +1,17 @@
+== 0.37.2 2010-10-05
+
+=== Fixes
+
+* Refresh of "done" field in work edit form did not work.
+* "Reopen" did not work.
+
+== Internal
+
+* Changed gem to use the Gemfile for dynamic dependencies
+* Updated to Rails 3.0.3
+* Updated to Glassfish 1.0.3 but there are still problems
+* Switched to Trinidad as app-server.
+
 == 0.37.1 2010-10-05
 
 === Fixes

data/README.txt

@@ -1,4 +1,4 @@
-http://backlog.rubyforge.org/files/Screenshot.png
+http://github.com/DatekWireless/backlog/raw/master/Screenshot.png
 
 == Backlog
 
@@ -11,8 +11,8 @@ A time keeping module is also included to track time spent on the different task
 
 You can find the Backlog project page at
 
-http://rubyforge.org/projects/backlog/
- 
+http://github.com/DatekWireless/backlog
+
 
 === Backlog is not meant to be
 

data/Rakefile

@@ -38,6 +38,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
       ['slave', '~> 1.2.1'], ['mechanize', '~> 1.0.0'], ['bundler', '~> 1.0.5']]
   # ['rmagick', '~> 1.15.12'],
   p.rsync_args = "-acv --delete --exclude=wiki*"
+  p.spec_extras[:extensions] = 'ext/mkrf_conf.rb'
 end
 
 desc 'Release the application to RubyForge'

data/Rakefile~

@@ -0,0 +1,73 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require 'erb'
+
+require File.expand_path('../config/application', __FILE__)
+
+require 'rake'
+#require 'rake/testtask'
+require 'rake/rdoctask'
+
+Backlog::Application.load_tasks
+
+require 'hoe'
+require 'version_from_history'
+
+ENV['SKIP_AR_JDBC_RAKE_REDEFINES'] = '1'
+
+Hoe.new("backlog", APP::VERSION) do |p|
+  p.rubyforge_name = "backlog"
+  p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
+  p.description = p.paragraphs_of('README.txt', 2..3).join("\n\n")
+  p.author = 'Uwe Kubosch'
+  p.email = 'uwe@kubosch.no'
+  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'],
+    :executables => ['backlog'],
+    :requirements => ['ImageMagick', 'PostgreSQL'],
+  }
+  p.need_zip = true
+  p.url = 'http://rubyforge.org/projects/backlog/'
+  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*"
+  p.extensions << 'ext/rmagic/extconf.rb'
+end
+
+desc 'Release the application to RubyForge'
+task :release_all do
+  ENV['VERSION'] = APP::VERSION
+  Rake::Task[:publish_docs].invoke
+  Rake::Task[:release].invoke
+  Rake::Task[:release_war].invoke
+  Rake::Task[:post_news].invoke
+end
+
+desc 'Release the application as a Java EE WAR file to RubyForge'
+task :release_war do
+  `warble`
+  war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
+  raise "WAR file missing" unless File.exists? 'backlog.war'
+  FileUtils.makedirs 'pkg'
+  FileUtils.move 'backlog.war', war_pkg_file
+  rf = RubyForge.new.configure
+  rf.login
+  rf.add_file 'backlog', 'backlog', APP::VERSION, war_pkg_file
+end
+
+task 'test:units' => [] do
+
+end
+task 'test:functionals' => [] do
+
+end
+task 'test:integration' => [] do
+  
+end

data/app/controllers/works_controller.rb

@@ -303,7 +303,8 @@ class WorksController < ApplicationController
     
     render :partial => 'task_id_list'
   end
-  
+
+  # TODO(uwe): prioritize personal descriptions, then same project, then any.
   def auto_complete_for_work_description
     max = 16
     works = Work.find(:all, :select => "description, count(*) as freq", 

data/app/helpers/application_helper.rb

@@ -41,7 +41,8 @@ module ApplicationHelper
   def image_link_to_remote(image_source, title, link_options, image_options = nil, post = false)
     image_options ||= {:class => 'image-submit'}
     image_options.update :alt => title, :title => title
-    link_to_remote image_tag(image_source, image_options), :url => link_options, :html => post ? {:remote => true, :method => :post} : {:remote => true}
+    with_params = link_options.delete(:with)
+    link_to_remote image_tag(image_source, image_options), :url => link_options, :with => with_params, :html => post ? {:method => :post} : {}
   end
   
   def detour?

data/app/views/tasks/_task.rhtml

@@ -80,7 +80,7 @@
             <% end -%>
 		  <% else %>
           	<% if !task.work_started? && (task.period.nil? || task.period.active?) %>
-            	<%=image_link_to_remote('checkmark.png', l(:complete), {:url => {:action => :finish_task, :id => task}}, nil, true)%>
+            	<%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => task}, nil, true)%>
           	<% end -%>
           <% end -%>
       <% end -%>
@@ -102,7 +102,7 @@
           <% end -%>
         <% elsif (task.period.nil? || (not task.period.passed?)) && task.leaf? -%>
       		<% form_tag({:controller => 'tasks', :action => 'update', :id => task}) do -%>
-          		<%=image_link_to_remote('eraser.png', l(:reopen), {:url => {:action => :reopen_task, :id => task}}, nil, true) %>
+          		<%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => task}, nil, true) %>
       		<% end -%>
         <% end -%>
     </div>

data/app/views/works/_form.rhtml

@@ -71,7 +71,7 @@
 <p style="float: left;"><label for="work_hours"><%=l :hours%></label><br/>
 <%=text_field 'work', 'hours_time', :class => :task_hours, :value => t(@work.hours)  %></p>
 
-<p style="float: left;"><br/><%=image_link_to_remote 'refresh.png', l(:refresh), {:url => {:action => :calculate_hours}, :with => "'started_at=' + $('work_started_at').value + '&completed_at=' + $('work_completed_at').value"} %></p>
+<p style="float: left;"><br/><%=image_link_to_remote 'refresh.png', l(:refresh), {:action => :calculate_hours, :with => "'started_at=' + $('work_started_at').value + '&completed_at=' + $('work_completed_at').value".html_safe} %></p>
 
 <% end %>
 

data/bin/backlog

@@ -55,12 +55,22 @@ def start(config)
   end
   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`
+  if defined? JRUBY_VERSION
+    # `glassfish -p #{config['port'] || 3000} -e production -d -P #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
+    `jruby -S trinidad -t -p #{config['port'] || 3000} -e production -ldaemon -d #{PID_FILE} 1>#{LOG_DIR}/stdout.log 2>#{LOG_DIR}/stderr.log`
+  else
+    `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`
+  end
 end
 
 def stop(config)
-  `mongrel_rails stop -c #{INSTALL_DIR} -P #{PID_FILE}`
+  if File.exists? PID_FILE
+    # `mongrel_rails stop -c #{INSTALL_DIR} -P #{PID_FILE}`
+    system "kill `cat #{PID_FILE}`"
+    File.delete PID_FILE
+  else
+    puts "#{APPLICATION} not running."
+  end
 end
 
 def get_pid
@@ -140,8 +150,8 @@ 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}`
+  puts `#{'jruby -S' if RUBY_PLATFORM =='java'} bundle install`
+  puts `#{'jruby -S' if RUBY_PLATFORM =='java'} rake db:migrate #{'--trace' if debug}`
   raise "Could not migrate database: #{$? >> 8}:#{$? & 0xff}" unless ($? >> 8) == 0
   
   # TODO:  provide startup information based on launchd in OS X versions >= 10.4
@@ -174,6 +184,7 @@ when 'setup_unix'
       end
     end
   end
+  FileUtils.mkdir_p File.dirname(config_file)
   FileUtils.cp "#{INSTALL_DIR}/etc/#{APPLICATION}.conf", config_file unless File.exists? config_file
   puts
 else

data/bin/backlog_init.d

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 #
 # backlog      Startup script for the backlog application
 #

data/config/application.rb

@@ -6,5 +6,6 @@ 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."
+    config.time_zone = 'Copenhagen'
   end
 end

data/config/database.yml

@@ -12,3 +12,4 @@ production:
   adapter: postgresql
   database: backlog_production
   username: postgres
+  host: celina

data/ext/mkrf_conf.rb

@@ -0,0 +1,26 @@
+begin
+  gemfile = File.expand_path('../../Gemfile', __FILE__)
+  begin
+    ENV['BUNDLE_GEMFILE'] = gemfile
+    require 'rubygems'
+    require 'bundler'
+    require 'thor'
+    Bundler.ui = Bundler::UI::Shell.new(Thor::Shell::Basic.new)
+    Bundler.ui.debug!
+    Bundler::Installer.install(Bundler.root, Bundler.definition)
+  rescue Bundler::GemNotFound => e
+    puts e.message
+    puts "Try running `bundle install`."
+    STDERR.puts e.message
+    STDERR.puts "Try running `bundle install`."
+    exit!
+  end if File.exist?(gemfile)
+rescue
+  puts $!.message
+  puts $!.backtrace.join("\n")
+  exit(1)
+end
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/lib/time_extras.rb

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

data/test/test_helper.rb

@@ -2,8 +2,6 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
-# ActiveSupport::Dependencies.autoload_paths.unshift Rails.root.to_s + '/test/mocks/test'
-
 class ActiveSupport::TestCase
   def self.main_scenario
     fixtures :parties, :users, :groups, :groups_users, :projects, :periods, :tasks,

data/test/unit/user_test.rb

@@ -92,7 +92,7 @@ class UserTest < ActiveSupport::TestCase
     
     u.login = "x"
     assert !u.save     
-    assert u.errors.invalid?(:login)
+    assert u.errors[:login].any?
     
     u.login = "hugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahugeteslahug"
     assert !u.save     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 37
-    - 1
-  version: 0.37.1
+    - 2
+  version: 0.37.2
 platform: ruby
 authors: 
   - Uwe Kubosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2010-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -151,8 +151,8 @@ description: |-
 email: uwe@kubosch.no
 executables: 
   - backlog
-extensions: []
-
+extensions: 
+  - ext/mkrf_conf.rb
 extra_rdoc_files: []
 
 files: 
@@ -167,6 +167,7 @@ files:
   - Manifest.txt
   - MODIFICATIONS.txt
   - Rakefile
+  - Rakefile~
   - README.txt
   - README_LOGIN_SUGAR
   - Screenshot.png
@@ -417,6 +418,7 @@ files:
   - db/migrate/20101006092700_rename_backlogs_to_projects.rb
   - db/migrate/20101006092700_rename_backlogs_to_projects.rb~
   - etc/backlog.conf
+  - ext/mkrf_conf.rb
   - lib/array_helper.rb
   - lib/backlog
   - lib/big_decimal_yaml_fix.rb