backlog 0.34.1 → 0.34.2

data/History.txt

@@ -1,3 +1,18 @@
+== 0.34.2 2008-10-09
+
+=== Features
+
+* Switched from Goldspike to Warbler for WAR file generation.
+* Changed to make all new work records invoicable by default.
+
+=== Fixes
+
+* Fixed bug in Excel export of work records.  datetime fields could not be parsed by newer versions og Excel. 
+
+=== Internal
+
+* Fixed failing test for Absence records.
+
 == 0.34.1 2008-09-22
 
 === Fixes

data/Rakefile

@@ -49,26 +49,14 @@ task :release_all do
   Rake::Task[:post_news].invoke
 end
 
-# Remember to set @send_timeout in /usr/lib/ruby/gems/1.8/gems/rubyforge-0.4.4/lib/http-access2.rb
-# @send_timeout = 3600
 desc 'Release the application as a Java EE WAR file to RubyForge'
 task :release_war do
-  FileUtils.rm_rf 'WEB-INF' if File.exists? 'WEB-INF'
-  Dir.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
-  unless File.exists? 'WEB-INF/web.xml.erb'
-    File.open('WEB-INF/web.xml.erb', 'w') do |f|
-      f << ERB.new(File.read('vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb')).result
-    end
-  end
-  Rake::Task['war:standalone:create'].invoke
+  `warble`
   war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
-  if File.exists? 'backlog.war'
-    FileUtils.makedirs 'pkg'
-    FileUtils.move 'backlog.war', war_pkg_file
-  end
-  if File.exists? war_pkg_file
-    rf = RubyForge.new
-    rf.login
-    rf.add_file 'backlog', 'backlog', APP::VERSION, war_pkg_file
-  end
+  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

data/app/models/work.rb

@@ -14,7 +14,7 @@ class Work < ActiveRecord::Base
   
   def initialize(*args)
     super
-    self.invoice = true
+    self.invoice = true if self.invoice.nil?
   end
   
   def validate

data/app/views/works/list_excel.rhtml

@@ -36,9 +36,6 @@
   <Style ss:ID="header">
    <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
   </Style>
-  <Style ss:ID="DateTime">
-  	<NumberFormat ss:Format="Number" />
-  </Style>
  </Styles>
  <Worksheet ss:Name="<%=l(:done)%>">
   <Table ss:ExpandedColumnCount="256" x:FullColumns="1"
@@ -77,9 +74,10 @@
     <Cell><Data ss:Type="String"><%=work.description %></Data></Cell>
     <Cell><Data ss:Type="Number"><%=work.hours %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.invoice? ? 'Ja' : 'Nei' %></Data></Cell>
-    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=(BigDecimal((work.started_on - Date.new(1899, 12, 30)).to_s) + (work.start_time ? (BigDecimal(work.start_time.hour.to_s) + BigDecimal(work.start_time.minute.to_s)/60) / 24 : 0)).truncate(6) %></Data></Cell>
-    <Cell ss:StyleID="DateTime"><Data ss:Type="Number"><%=work.completed_at && (BigDecimal((work.completed_at.to_datetime - DateTime.parse('1899-12-30T00:00:00+02:00')).to_f.to_s))%></Data></Cell>
+    <Cell><Data ss:Type="DateTime"><%=work.start_time ? work.started_on.at(work.start_time).strftime('%Y-%m-%dT%H:%M:%S') : work.started_on.strftime('%Y-%m-%d') %></Data></Cell>
+    <Cell><Data ss:Type="DateTime"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%dT%H:%M:%S') %></Data></Cell>
    </Row>
+
   <% end %>
 
   </Table>

data/config/warble.rb

@@ -0,0 +1,84 @@
+# Warbler web application assembly configuration file
+Warbler::Config.new do |config|
+  # Temporary directory where the application is staged
+  # config.staging_dir = "tmp/war"
+
+  # Application directories to be included in the webapp.
+  config.dirs = %w(app config lib log vendor tmp)
+
+  # Additional files/directories to include, above those in config.dirs
+  # config.includes = FileList["db"]
+  config.includes = FileList["History.txt"]
+
+  # Additional files/directories to exclude
+  # config.excludes = FileList["lib/tasks/*"]
+
+  # Additional Java .jar files to include.  Note that if .jar files are placed
+  # in lib (and not otherwise excluded) then they need not be mentioned here.
+  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
+  # own versions if you directly set the value
+  # config.java_libs += FileList["lib/java/*.jar"]
+
+  # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes.
+  # config.java_classes = FileList["target/classes/**.*"]
+
+  # One or more pathmaps defining how the java classes should be copied into
+  # WEB-INF/classes. The example pathmap below accompanies the java_classes
+  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
+  # for details of how to specify a pathmap.
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
+
+  # Gems to be included. You need to tell Warbler which gems your application needs
+  # so that they can be packaged in the war file.
+  # The Rails gems are included by default unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
+  # config.gems << "tzinfo"
+  config.gems << 'activerecord-jdbc-adapter'
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "2.0.2"
+
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # fine-grained control.
+  # config.gems << /^merb-/
+  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
+
+  # Include gem dependencies not mentioned specifically
+  config.gem_dependencies = true
+
+  # Files to be included in the root of the webapp.  Note that files in public
+  # will have the leading 'public/' part of the path stripped during staging.
+  # config.public_html = FileList["public/**/*", "doc/**/*"]
+
+  # Pathmaps for controlling how public HTML files are copied into the .war
+  # config.pathmaps.public_html = ["%{public/,}p"]
+
+  # Name of the war file (without the .war) -- defaults to the basename
+  # of RAILS_ROOT
+  # config.war_name = "mywar"
+
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+
+  # Application booter to use, one of :rack, :rails, or :merb. (Default :rails)
+  # config.webxml.booter = :rails
+
+  # When using the :rack booter, "Rackup" script to use.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
+  # Control the pool of Rails runtimes. Leaving unspecified means
+  # the pool will grow as needed to service requests. It is recommended
+  # that you fix these values when running a production server!
+  # config.webxml.jruby.min.runtimes = 2
+  # config.webxml.jruby.max.runtimes = 4
+
+  # JNDI data source name
+  # config.webxml.jndi = 'jdbc/rails'
+end

data/config/warble.rb~

@@ -0,0 +1,84 @@
+# Warbler web application assembly configuration file
+Warbler::Config.new do |config|
+  # Temporary directory where the application is staged
+  # config.staging_dir = "tmp/war"
+
+  # Application directories to be included in the webapp.
+  config.dirs = %w(app config lib log vendor tmp)
+
+  # Additional files/directories to include, above those in config.dirs
+  # config.includes = FileList["db"]
+
+  # Additional files/directories to exclude
+  # config.excludes = FileList["lib/tasks/*"]
+
+  # Additional Java .jar files to include.  Note that if .jar files are placed
+  # in lib (and not otherwise excluded) then they need not be mentioned here.
+  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
+  # own versions if you directly set the value
+  # config.java_libs += FileList["lib/java/*.jar"]
+
+  # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes.
+  # config.java_classes = FileList["target/classes/**.*"]
+
+  # One or more pathmaps defining how the java classes should be copied into
+  # WEB-INF/classes. The example pathmap below accompanies the java_classes
+  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
+  # for details of how to specify a pathmap.
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
+
+  # Gems to be included. You need to tell Warbler which gems your application needs
+  # so that they can be packaged in the war file.
+  # The Rails gems are included by default unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
+  # config.gems << "tzinfo"
+  config.gems << 'activerecord-jdbc-adapter'
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "2.0.2"
+
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # fine-grained control.
+  # config.gems << /^merb-/
+  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
+
+  # Include gem dependencies not mentioned specifically
+  config.gem_dependencies = true
+
+  # Files to be included in the root of the webapp.  Note that files in public
+  # will have the leading 'public/' part of the path stripped during staging.
+  # config.public_html = FileList["public/**/*", "doc/**/*"]
+  config.public_html = FileList["History.txt"]
+
+  # Pathmaps for controlling how public HTML files are copied into the .war
+  # config.pathmaps.public_html = ["%{public/,}p"]
+
+  # Name of the war file (without the .war) -- defaults to the basename
+  # of RAILS_ROOT
+  # config.war_name = "mywar"
+
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+
+  # Application booter to use, one of :rack, :rails, or :merb. (Default :rails)
+  # config.webxml.booter = :rails
+
+  # When using the :rack booter, "Rackup" script to use.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
+  # Control the pool of Rails runtimes. Leaving unspecified means
+  # the pool will grow as needed to service requests. It is recommended
+  # that you fix these values when running a production server!
+  # config.webxml.jruby.min.runtimes = 2
+  # config.webxml.jruby.max.runtimes = 4
+
+  # JNDI data source name
+  # config.webxml.jndi = 'jdbc/rails'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 +02:00
+date: 2008-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -420,31 +420,6 @@ files:
 - vendor/plugins/redhillonrails_core/lib/red_hill_consulting/core/active_record/connection_adapters/abstract_adapter.rb
 - vendor/plugins/redhillonrails_core/lib/red_hill_consulting/core/active_record/base.rb
 - vendor/plugins/redhillonrails_core/lib/red_hill_consulting/core/active_record/schema.rb
-- vendor/plugins/goldspike
-- vendor/plugins/goldspike/README
-- vendor/plugins/goldspike/init.rb
-- vendor/plugins/goldspike/generators
-- vendor/plugins/goldspike/generators/goldspike
-- vendor/plugins/goldspike/generators/goldspike/goldspike_generator.rb
-- vendor/plugins/goldspike/generators/goldspike/templates
-- vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb
-- vendor/plugins/goldspike/generators/goldspike/templates/war.rb
-- vendor/plugins/goldspike/tasks
-- vendor/plugins/goldspike/tasks/war.rake
-- vendor/plugins/goldspike/install.rb
-- vendor/plugins/goldspike/test
-- vendor/plugins/goldspike/test/test_java_library.rb
-- vendor/plugins/goldspike/test/war_config_test_config.rb
-- vendor/plugins/goldspike/test/test_maven_library.rb
-- vendor/plugins/goldspike/test/test_create_war.rb
-- vendor/plugins/goldspike/Rakefile
-- vendor/plugins/goldspike/lib
-- vendor/plugins/goldspike/lib/create_war.rb
-- vendor/plugins/goldspike/lib/util.rb
-- vendor/plugins/goldspike/lib/java_library.rb
-- vendor/plugins/goldspike/lib/run.rb
-- vendor/plugins/goldspike/lib/packer.rb
-- vendor/plugins/goldspike/lib/war_config.rb
 - vendor/plugins/foreign_key_migrations
 - vendor/plugins/foreign_key_migrations/README
 - vendor/plugins/foreign_key_migrations/init.rb
@@ -702,6 +677,7 @@ files:
 - config
 - config/database.yml
 - config/routes.rb
+- config/warble.rb~
 - config/environments
 - config/environments/test.rb
 - config/environments/localization_environment.rb
@@ -712,6 +688,7 @@ files:
 - config/mime_types.yaml
 - config/war.rb
 - config/boot.rb
+- config/warble.rb
 - cruise_config.rb
 - db
 - db/test.db
@@ -747,7 +724,6 @@ files:
 - db/migrate/017_insert_datek_projects.rb
 - db/migrate/006_works_data_fix.rb
 - db/schema.rb
-- uwe@celina
 - README.txt
 has_rdoc: true
 homepage: http://rubyforge.org/projects/backlog/

data/vendor/plugins/goldspike/README

@@ -1,13 +0,0 @@
-This task allows you to package up your Rails web application
-as a war file for deployment to Tomcat or another J2EE server.
-
-It adds the following tasks to your project:
-
-+ war:standalone:create
-create a self-contained package which includes JRuby and any gems that are
-required by the application.
-
-+ war:shared:create
-create a package containing only the application. JRuby and rails-integration
-should be made available using a shared classloader. If JRUBY_HOME is set,
-then this will be used to locate any Ruby libraries and gems.

data/vendor/plugins/goldspike/Rakefile

@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the create_war plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the create_war plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'CreateWar'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/vendor/plugins/goldspike/generators/goldspike/goldspike_generator.rb

@@ -1,21 +0,0 @@
-class GoldspikeGenerator < Rails::Generator::Base
-  
-  def initialize(runtime_args, runtime_options = {})
-    super
-  end
-    
-  def manifest
-    record do |m|
-      m.directory 'config'
-      m.template 'war.rb', File.join('config', 'war.rb')
-      m.directory 'WEB-INF'
-      m.template 'web.xml.erb', File.join('WEB-INF', 'web.xml.erb')
-    end
-  end
-  
-  protected
-  
-  def banner
-    "Usage: #{$0} goldspike"
-  end  
-end

data/vendor/plugins/goldspike/generators/goldspike/templates/war.rb

@@ -1,8 +0,0 @@
-# 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 'mysql', 'mysql-connector-java', '5.0.4'

data/vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb

@@ -1,57 +0,0 @@
-<!DOCTYPE web-app PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-	<context-param>
-		<param-name>jruby.standalone</param-name>
-		<param-value><%%= config.standalone %></param-value>
-	</context-param>
-
-	<%% if !config.standalone %>
-	<!-- jruby.home can be set either here, or as the system property jruby.home -->
-	<context-param>
-		<param-name>jruby.home</param-name>
-		<param-value><%%= config.jruby_home || '/usr/local/jruby' %></param-value>
-	</context-param>
-	<%% end %>
-
-	<context-param>
-		<param-name>rails.env</param-name>
-		<param-value><%%= config.rails_env %></param-value>
-	</context-param>
-
-	<context-param>
-		<param-name>files.default</param-name>
-		<param-value>rails</param-value>
-		<description>The files servlet should forward to the rails servlet if no file could be found</description>
-	</context-param>
-
-	<listener>
-		<listener-class>org.jruby.webapp.RailsContextListener</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>rails</servlet-name>
-		<servlet-class><%%= config.servlet %></servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>files</servlet-name>
-		<servlet-class>org.jruby.webapp.FileServlet</servlet-class>
-	</servlet>
-
-	<!-- Allow all requests to go to the files servlet first -->
-	<servlet-mapping>
-		<servlet-name>files</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<%% if config.datasource_jndi %>
-	<resource-ref>
-		<res-ref-name><%%= config.datasource_jndi_name %></res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
-		<res-auth>Container</res-auth>
-	</resource-ref>
-	<%% end %>
-
-</web-app>