backlog 0.17.0 → 0.17.1

data/History.txt

@@ -1,10 +1,17 @@
-== 0.17.0 2008-01-01
+== 0.17.1 2008-01-04
+
+=== Fixes
+
+* Fixed bad first-time setup.
+* Updated to Goldspike 1.4
+
+== 0.17.0 2008-01-03
 
 === Features
 
-* Started using "Sortable List" instead of dragables for tasks for prettier ordering.
+* Started using "Sortable List" instead of draggables for tasks for prettier ordering.
 * Started using client side Ruby.  Woohoo!
-* Made tasks dragable to sprint boxes in the sidebar.
+* Made tasks draggable to sprint boxes in the sidebar.
 
 === Fixes
 

data/Rakefile

@@ -34,6 +34,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.rsync_args = "-av --delete --exclude=wiki*"
 end
 
+desc 'Release the application to RubyForge'
 task :release_all do
   ENV['VERSION'] = APP::VERSION
   Rake::Task[:publish_docs].invoke
@@ -42,14 +43,15 @@ task :release_all do
   Rake::Task[:post_news].invoke
 end
 
+desc 'Release the application as a Java EE WAR file to RubyForge'
 task :release_war do
-  File.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
+  Dir.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
   FileUtils.cp 'vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb', 'WEB-INF/web.xml.erb' unless File.exists? 'WEB-INF/web.xml.erb'
   Rake::Task['war:standalone:create'].invoke
   war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
   if File.exists? 'backlog.war'
-    File.makedirs 'pkg'
-    File.move 'backlog.war', war_pkg_file
+    FileUtils.makedirs 'pkg'
+    FileUtils.move 'backlog.war', war_pkg_file
   end
   if File.exists? war_pkg_file
     rf = RubyForge.new

data/bin/backlog

@@ -27,8 +27,8 @@ else
 end
 
 config_file = Config::CONFIG["sysconfdir"] + '/backlog.conf'
-config = {}
 config = File.open(config_file) {|f| YAML::load(f)} if File.exists? config_file
+config ||= {}
 
 LOG_DIR = "#{INSTALL_DIR}/log"
 PID_FILE = '/var/run/backlog.pid'
@@ -129,7 +129,8 @@ when 'setup_unix'
   end
   Dir.chdir INSTALL_DIR
   Dir.mkdir LOG_DIR unless File.exists? LOG_DIR
-  puts `rake db:migrate RAILS_ENV=production`
+  ENV['RAILS_ENV'] = 'production'
+  puts `rake db:migrate`
   
   # TODO:  provide startup information based on launchd in OS X versions >= 10.4
   if File.directory? '/etc/init.d'

data/config/environment.rb

@@ -21,7 +21,7 @@ if File.exists? APP_CONFIG_FILE
     class Configuration
       def database_configuration
         db_conf = YAML::load(ERB.new(IO.read(database_configuration_file)).result)
-        app_conf = YAML::load(ERB.new(IO.read(APP_CONFIG_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}"
           db_conf['production'] = db_settings

data/db/migrate/011_login_sugar.rb

@@ -1,6 +1,6 @@
 class LoginSugar < ActiveRecord::Migration
   def self.up
-    create_table :users, :force => true do |t|
+    create_table :users do |t|
       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

data/vendor/plugins/goldspike/lib/create_war.rb

@@ -78,7 +78,7 @@ module War
 
     def add_configuration_files
       require 'erb'
-      File.makedirs(File.join(config.staging, 'WEB-INF'))
+      FileUtils.makedirs(File.join(config.staging, 'WEB-INF'))
       war_file_dir = File.join(config.staging, 'WEB-INF')
       Dir.foreach(war_file_dir) do |file|        
         output = case file

data/vendor/plugins/goldspike/lib/java_library.rb

@@ -45,7 +45,7 @@ module War
     
     def install_local(config, file, target_file)
       return false unless File.exists?(file)
-      File.install(file, target_file, 0644)
+      FileUtils.copy(file, target_file)
       return true
     end
     
@@ -109,7 +109,7 @@ module War
       @version = version
       @locations = maven_locations(group, name, version)   
     end
-	
+
     def maven_locations(group, artifact, version, type='jar')
       WLog.debug("locations for " + group + " " + artifact + " " + version);
       paths = []

data/vendor/plugins/goldspike/lib/packer.rb

@@ -1,4 +1,3 @@
-
 require 'util'
 
 module War
@@ -15,7 +14,7 @@ module War
       # File.install is disabled because of a performance problem under JRuby,
       # without it the task may fail if the original gem files were not writable by the owner
       #File.install(source, dest, mode)
-      File.copy(source, dest)
+      FileUtils.copy(source, dest)
     end
     
     def copy_tree(files, target, strip_prefix='')
@@ -23,10 +22,10 @@ module War
         relative = f[strip_prefix.length, f.length]
         target_file = File.join(target, relative)
         if File.directory?(f)
-          File.makedirs(target_file)
+          FileUtils.makedirs(target_file)
         elsif File.file?(f)
           WLog.debug "  Copying #{f} to #{relative}"
-          File.makedirs(File.dirname(target_file))
+          FileUtils.makedirs(File.dirname(target_file))
           install(f, target_file)
         end
       end    
@@ -52,7 +51,7 @@ module War
       flags = '-cf'
       flags += '0' unless compress
       files_list = files.join(' ')
-      unless system("jar #{flags} #{os_target_file} -C #{os_source_dir} #{files_list}")
+      unless system("jar #{flags} \"#{os_target_file}\" -C \"#{os_source_dir}\" #{files_list}")
         raise "Error: failed to create archive, error code #{$?}"
       end
     end
@@ -74,7 +73,7 @@ module War
 
     def install(dir_sym, dir)
       WLog.debug("assembling files in " + dir + " directory")
-      File.makedirs(dir)
+      FileUtils.makedirs(dir)
       WLog.debug("need to assemble #{config.files.select{|k,v| v[:directory] == dir_sym }.size} files")
       for name, file_info in config.files
         next unless file_info[:directory] == dir_sym
@@ -85,7 +84,7 @@ module War
         if !File.exists?(target) || File.mtime(target) < File.mtime(file_info[:location])
           WLog.info "  adding file #{name}"
           if File.exists?(file)
-            File.install(file, target, 0644)
+            FileUtils.copy(file, target)
           else
             WLog.warn "file '#{file}' does not exist"
           end
@@ -105,7 +104,7 @@ module War
       staging = config.staging
       lib = File.join(staging, 'WEB-INF', 'lib')
       WLog.debug("assembling files in " + lib + " directory")
-      File.makedirs(lib)
+      FileUtils.makedirs(lib)
       WLog.debug("need to assemble #{config.java_libraries.size} libraries")
       for library in config.java_libraries.values
         WLog.debug("library to assemble " + library.name )
@@ -129,9 +128,9 @@ module War
       # add the gems
       WLog.info("Packing needed Ruby gems ...")
       gem_home = File.join(config.staging, 'WEB-INF', 'gems')
-      File.makedirs(gem_home)
-      File.makedirs(File.join(gem_home, 'gems'))
-      File.makedirs(File.join(gem_home, 'specifications'))
+      FileUtils.makedirs(gem_home)
+      FileUtils.makedirs(File.join(gem_home, 'gems'))
+      FileUtils.makedirs(File.join(gem_home, 'specifications'))
       for gem in config.gem_libraries
         copy_gem(gem[0], gem[1], gem_home)
       end
@@ -151,7 +150,7 @@ module War
         # copy the specification
         install(gem.loaded_from, File.join(target_gem_home, 'specifications'), 0644)
         # copy the files
-        File.makedirs(gem_target)
+        FileUtils.makedirs(gem_target)
         gem_files = Rake::FileList.new(File.join(gem.full_gem_path, '**', '*'))
         copy_tree(gem_files, gem_target, gem.full_gem_path)
         # compile the .rb files to .rb.ast.ser
@@ -193,7 +192,7 @@ module War
     def add_webapp
       staging = config.staging
       WLog.info 'Packing web application ...'
-      File.makedirs(staging)
+      FileUtils.makedirs(staging)
       webapp_files = Rake::FileList.new(File.join('.', '**', '*'))
       webapp_files.exclude(staging)
       webapp_files.exclude('*.war')

data/vendor/plugins/goldspike/lib/run.rb

@@ -63,7 +63,7 @@ END_OF_WEB_INF_OVERRIDE
     def add_jetty_libraries
       # Get the Jetty libraries
       @classpath = []
-      File.makedirs(jetty_tmp)
+      FileUtils.makedirs(jetty_tmp)
       for lib in config.jetty_libraries.values
         target = File.join(jetty_tmp, lib.file)
         unless File.exists?(target)

data/vendor/plugins/goldspike/lib/war_config.rb

@@ -82,7 +82,7 @@ module War
       @jruby_home = ENV['JRUBY_HOME']
       @maven_local_repository = ENV['MAVEN2_REPO'] # should be in settings.xml, but I need an override
       @maven_local_repository ||= File.join(home, '.m2', 'repository') if home
-      @maven_remote_repository = 'http://www.ibiblio.org/maven2'
+      @maven_remote_repository = 'http://repo1.maven.org/maven2'
 
       # configured war name, defaults to the same as the ruby webapp
       @name = File.basename(File.expand_path(RAILS_ROOT))
@@ -92,8 +92,8 @@ module War
       
       @java_libraries = {}
       # default java libraries
-      add_library(maven_library('org.jruby', 'jruby-complete', '1.0.1'))
-      add_library(maven_library('org.jruby.extras', 'goldspike', '1.3'))
+      add_library(maven_library('org.jruby', 'jruby-complete', '1.0.3'))
+      add_library(maven_library('org.jruby.extras', 'goldspike', '1.4'))
       add_library(maven_library('javax.activation', 'activation', '1.1'))
       add_library(maven_library('commons-pool', 'commons-pool', '1.3'))
       add_library(maven_library('bouncycastle', 'bcprov-jdk14', '124'))
@@ -101,7 +101,7 @@ module War
       # default gems
       @gem_libraries = {}
       add_gem('rails', rails_version) unless File.exists?('vendor/rails')
-      add_gem('ActiveRecord-JDBC') if Dir['vendor/{gems/,}{activerecord-jdbc,ActiveRecord-JDBC}'].empty?
+      add_gem('activerecord-jdbc-adapter') if Dir['vendor/{gems/,}{activerecord-jdbc-adapter,ActiveRecord-JDBC}'].empty?
 
       # default jetty libraries
       @jetty_libraries = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-03 00:00:00 +01:00
+date: 2008-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency