buildrdeb 0.0.3 → 1.0.0

data/README.rdoc

@@ -6,16 +6,19 @@ See the official Buildr site: http://buildr.apache.org
 
 == Install buildrdeb
 
-* See the github instructions on how to setup to install their gems: http://gems.github.com
-* For the impatient:
-  * gem sources -a http://gems.github.com
-  * sudo gem install intalio-buildrdeb
+* gem install buildrdeb
 
-== Documentation
+== Manual
 
-See http://oss.intalio.com/buildrdeb
+define "foo" do
+  
+  package(:deb).enhance do |deb|
+    deb.control = _("config/control")
+    deb.preinst = _("config/preinst")
+    deb.include(_("target/myfolder"))
+  end
 
-http://intalio.github.com/buildrdeb is the cutting edge documentation if you work against the trunk.
+end
 
 == License
 

data/buildrdeb.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildrdeb'
-  spec.version        = '0.0.3'
+  spec.version        = '1.0.0'
   spec.author         = 'Antoine Toulme'
   spec.email          = "antoine@lunar-ocean.com"
   spec.homepage       = "http://buildr.apache.org/"

data/lib/buildrdeb/package.rb

@@ -26,43 +26,38 @@ module BuildrDeb
     # With deb we recreate the structure asked by the user
     # then we will call dpkg --build over it.
     def create_from(file_map)  
-      root = File.join("target", "_#{File.basename(name)}")
+      root = File.join("target", "#{File.basename(name)}-contents")
       mkpath File.join(root, "DEBIAN")
-      #echo "THe version " + @version
-      for file in ["control", "prerm", "postinst", "postrm", "preinst", "triggers"]
-         thefile = eval("self."+file)
-         targetFile = File.join(root, "DEBIAN", file)
-        if !thefile.nil? and File.exists? thefile
-          actualFile = File.open(thefile, "r")
-          myfile = File.open( targetFile, "w")
-          actualFile.each { |line|
-           if file == "control" then
-             if line.match /^Version: / and !@version.nil? then myfile.puts("Version: " + @version +"\n")
-             else myfile.puts eval('"'+ line + '"') end
-           else myfile.puts line end
+      for filename in ["control", "prerm", "postinst", "postrm", "preinst", "triggers"]
+        file = send(filename)
+        if file.nil?
+          raise "no control file was defined when packaging as a deb file" if filename == "control"
+        else
+          raise "Cannot find #{filename}: #{file} doesn't exist" if !File.exists? file
+          target = File.join(root, "DEBIAN", filename)
+          contents = File.read(file)
+          # Replace version if we are looking at control.
+          contents.gsub!(/^Version: .*$/, "Version: #{@version}") if (filename == "control" && !@version.nil?)
+          File.open(target, "w+") {|t|
+            t.write eval("\"#{contents}\"")
           }
-          myfile.close
-          actualFile.close
-          File.chmod 0755, targetFile
-          #cp send(file.to_sym), File.join(root, "DEBIAN", file)
-          #File.chmod 0755, File.join(root, "DEBIAN", file)
+          File.chmod 0755, target
         end
       end
-      
       file_map.each do |path, content|
         _path = File.join(root, path)
         if content.respond_to?(:call)
           raise "Not implemented"
-          content.call path
-        elsif content.nil? || File.directory?(content.to_s)
-          mkpath _path
+          #content.call path
+        elsif content.nil?
+          mkdir_p _path
+        elsif File.directory?(content.to_s)
+          
         else
-          mkpath File.dirname(_path)
+          mkdir_p File.dirname(_path) if !File.exists?(File.dirname(_path))
           cp content.to_s, _path
         end
       end
-      
-      
       out = %x[ dpkg --build \"#{root}\" \"#{name}\" 2>&1 ]
       raise "dpkg failed with this error:\n#{out}" if $? != 0
     end
@@ -74,13 +69,10 @@ module BuildrDeb
 
     def package_as_deb(file_name)
       deb = DebTask.define_task(file_name)
-      deb.tap do
-        package ||= project.id
-        version ||= project.version
-      end
       deb.enhance do |task|
         task.enhance do
-          raise "no control file was defined when packaging #{project.id} as a deb file" if task.control.nil?
+          package ||= project.id
+          version ||= project.version
         end
       end
       return deb

data/rakelib/all-in-one.rake

@@ -0,0 +1,113 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+desc "Create JRuby all-in-one distribution"
+task "all-in-one" => 'all-in-one:all-in-one' 
+
+namespace :'all-in-one' do
+  
+  version = "1.5.2"
+  jruby_distro = "jruby-bin-#{version}.tar.gz"
+  url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
+  dir = "jruby-#{version}"
+  
+  task "all-in-one" => [:gem,
+      # Prepare to run
+      :prepare,
+      # Download and extract JRuby
+      :download_and_extract,
+      # Cleanup JRuby distribution
+      :clean_dist,
+      # Install Buildr gem and dependencies
+      :install_dependencies,
+      # Add Buildr executables/scripts
+      :add_execs,
+      # Package distribution
+      :package
+    ]
+
+  desc 'Prepare to run'
+  task :prepare do
+    mkpath '_all-in-one'
+    cd '_all-in-one'
+  end
+
+  desc 'Download and extract JRuby'
+  task :download_and_extract do
+    unless File.exist? jruby_distro
+      puts "Downloading JRuby from #{url} ..."
+      sh 'wget', url
+      puts "[X] Downloaded JRuby"
+    end
+
+    rm_rf dir if File.exist? dir
+
+    puts "Extracting JRuby to #{dir} ..."
+    sh 'tar', 'xzf', jruby_distro
+    puts "[X] Extracted JRuby"
+    cd dir
+  end
+
+  desc 'Cleanup JRuby distribution'
+  task :clean_dist do
+    puts 'Cleaning...'
+    rm_rf 'docs'
+    mkpath 'jruby-docs'
+    mv Dir["COPYING*"], 'jruby-docs'
+    mv Dir["LICENSE*"], 'jruby-docs'
+    mv 'README', 'jruby-docs'
+    rm_rf 'lib/ruby/1.9'
+    rm_rf 'lib/ruby/gems/1.8/doc'
+    rm_rf 'samples'
+    rm_rf 'share'
+  end
+  
+  desc 'Install Buildr gem and dependencies'
+  task :install_dependencies do
+    puts "Install Buildr gem ..."
+    sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
+       '--no-rdoc', '--no-ri'
+    puts "[X] Install Buildr gem"
+  end
+  
+  desc 'Add Buildr executables/scripts'
+  task :add_execs do
+    cp 'bin/jruby.exe', 'bin/_buildr.exe'
+    cp Dir["../../all-in-one/*"], 'bin'
+  end
+  
+  desc 'Package distribution'
+  task :package do
+    puts "Zipping distribution ..."
+    cd '..'
+    new_dir  = "#{spec.name}-#{spec.version}"
+    mv dir, new_dir
+    zip = "#{new_dir}.zip"
+    rm zip if File.exist? zip
+    sh 'zip', '-q', '-r', zip, new_dir
+    puts "[X] Zipped distribution"
+   
+    puts "Tarring distribution ..."
+    tar = "#{new_dir}.tar.gz"
+    rm tar if File.exist? tar
+    sh 'tar', 'czf', tar, new_dir
+    puts "[X] Tarred distribution"
+    
+    rm_rf new_dir
+  end
+  
+end
+
+task(:clobber) { rm_rf '_all-in-one' }

data/rakelib/checks.rake

@@ -18,7 +18,7 @@ desc "Check that source files contain the Apache license"
 task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
-  missing = required.reject { |fn| 
+  missing = required.reject { |fn|
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
       map { |match| match.compact }.flatten.join("\n")
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/
@@ -45,7 +45,7 @@ task :dependency do
     dep_spec.runtime_dependencies.map { |trans| transitive[trans].push(trans) }.flatten.uniq }
   # For each dependency, make sure *all* its transitive dependencies are listed
   # as a Buildr dependency, and order is preserved.
-  spec.dependencies.each_with_index do |dep, index|
+  spec.dependencies.select {|dep| dep.type == :runtime }.each_with_index do |dep, index|
     puts "checking #{dep.name}"
     transitive[dep].each do |trans|
       matching = spec.dependencies.find { |existing| trans =~ existing }

data/rakelib/doc.rake

@@ -36,7 +36,17 @@ end
 
 
 begin
-  require 'rakelib/jekylltask'
+  require 'jekylltask'
+  module TocFilter
+    def toc(input)
+      input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).inject(%{<ol class="toc">}) { |toc, entry|
+        id = entry[1][/^id=(['"])(.*)\1$/, 2]
+        title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
+        toc << %{<li><a href="##{id}">#{title}</a></li>}
+      } << "</ol>"
+    end
+  end
+  Liquid::Template.register_filter(TocFilter)
 
   desc "Generate Buildr documentation in _site/"
   JekyllTask.new :jekyll do |task|
@@ -45,9 +55,9 @@ begin
   end
 
 rescue LoadError
-  puts "Buildr uses the mojombo-jekyll to generate the Web site. You can install it by running rake doc:setup"
+  puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running rake doc:setup"
   task 'doc:setup' do
-    install_gem 'mojombo-jekyll', :source=>'http://gems.github.com', :version=>'0.5.4'
+    install_gem 'jekyll', :version=>'0.6.2'
     if `pygmentize -V`.empty?
       args = %w{easy_install Pygments}
       args.unshift 'sudo' unless Config::CONFIG['host_os'] =~ /windows/
@@ -71,6 +81,13 @@ task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr
   cp_r '_reports/coverage', '_site'
   fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
   cp 'CHANGELOG', '_site'
+  open("_site/.htaccess", "w") do |htaccess|
+    htaccess << %Q{
+<FilesMatch "CHANGELOG">
+ForceType 'text/plain; charset=UTF-8'
+</FilesMatch>
+}
+  end
   cp 'buildr.pdf', '_site'
   fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
   puts 'OK'

data/rakelib/metrics.rake

@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+namespace :metrics do
+  desc 'run Saikuro reports'
+  task :saikuro do
+    gem 'atoulme-Saikuro'
+    require 'saikuro'
+    output_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "_reports", "saikuro"))
+    base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), "..")))
+    rb_files = ["lib", "addon"].collect { |folder| 
+      FileList[File.expand_path(File.join(File.dirname(__FILE__), "..", folder, "**", "*.rb"))]
+    }.flatten.collect {|path| 
+      Pathname.new(path).relative_path_from(base_dir).to_s
+    }
+    SaikuroRunner.new.run(rb_files, output_dir)
+  end
+  
+  desc 'generate ccn treemap'
+  task :ccn_treemap do
+    require 'saikuro_treemap'
+    SaikuroTreemap.generate_treemap :code_dirs => ['lib', 'addon'], :output_file => "_reports/saikuro_treemap.html"
+  end
+end
+
+desc 'Run all metrics tools'
+task :metrics => ["metrics:saikuro", "metrics:ccn_treemap"]

data/rakelib/package.rake

@@ -67,7 +67,7 @@ task :snapshot=>[:package] do
   cp FileList['pkg/{*.gem,*.tgz,*.zip}'], '_snapshot/gems'
   puts "Generating gem index ..."
   sh 'gem', 'generate_index', '--directory', '_snapshot'
-  puts "Copying gem and index back to Apache" 
+  puts "Copying gem and index back to Apache"
   sh 'rsync', '--progress', '--recursive', '_snapshot/', 'people.apache.org:public_html/buildr/snapshot/'
 end
 task(:clobber) { rm_rf '_snapshot' }

data/rakelib/release.rake

@@ -45,6 +45,9 @@ task :release do
 
   # Upload binary and source packages to RubyForge.
   lambda do
+    sh 'rubyforge', 'login'
+    # update rubyforge projects, processors, etc. in local config
+    sh 'rubyforge', 'config'
     files = FileList["_release/#{spec.version}/dist/*.{gem,tgz,zip}"]
     puts "Uploading #{spec.version} to RubyForge ... "
     rubyforge = RubyForge.new.configure
@@ -63,7 +66,7 @@ task :release do
   # Create an SVN tag for this release.
   lambda do
     info = `svn info` + `git svn info` # Using either svn or git-svn
-    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0] 
+    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0]
       new_url = url.sub(/(trunk$)|(branches\/\w*)$/, "tags/#{spec.version}")
       unless url == new_url
         sh 'svn', 'copy', url, new_url, '-m', "Release #{spec.version}" do |ok, res|
@@ -80,7 +83,7 @@ task :release do
 
 
   # Update CHANGELOG to next release number.
-  lambda do 
+  lambda do
     next_version = spec.version.to_s.split('.').map { |v| v.to_i }.
       zip([0, 0, 1]).map { |a| a.inject(0) { |t,i| t + i } }.join('.')
     modified = "#{next_version} (Pending)\n\n" + File.read('CHANGELOG')
@@ -89,7 +92,7 @@ task :release do
     end
     puts "[X] Updated CHANGELOG and added entry for next release"
   end.call
- 
+
 
   # Update source files to next release number.
   lambda do
@@ -98,7 +101,7 @@ task :release do
 
     ver_file = "lib/#{spec.name}.rb"
     if File.exist?(ver_file)
-      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open ver_file, 'w' do |file|
         file.write modified
       end
@@ -107,7 +110,7 @@ task :release do
 
     spec_file = "#{spec.name}.gemspec"
     if File.exist?(spec_file)
-      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open spec_file, 'w' do |file|
         file.write modified
       end
@@ -115,7 +118,7 @@ task :release do
     end
   end.call
 
- 
+
   # Prepare release announcement email.
   lambda do
     changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]

data/rakelib/rspec.rake

@@ -18,34 +18,53 @@ begin
   require 'spec/rake/spectask'
   directory '_reports'
 
+  def default_spec_opts
+    default = %w{--format failing_examples:failed --format html:_reports/specs.html --backtrace}
+    default << '--colour' if $stdout.isatty
+    default
+  end
+  
   desc "Run all specs"
-  Spec::Rake::SpecTask.new :spec=>'_reports' do |task|
+  Spec::Rake::SpecTask.new :spec=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
     task.spec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --loadby mtime --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format specdoc'
   end
   file('_reports/specs.html') { task(:spec).invoke }
 
   desc 'Run all failed examples from previous run'
   Spec::Rake::SpecTask.new :failed do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --example failed --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format specdoc' << '--example failed'
   end
 
   desc 'Run RSpec and generate Spec and coverage reports (slow)'
-  Spec::Rake::SpecTask.new :coverage=>'_reports' do |task|
+  Spec::Rake::SpecTask.new :coverage=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %W{--format progress --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
-    task.spec_opts << '--colour' if $stdout.isatty
+    task.spec_opts = default_spec_opts
+    task.spec_opts << '--format progress'
     task.rcov = true
     task.rcov_dir = '_reports/coverage'
     task.rcov_opts = %w{--exclude / --include-file ^lib --text-summary}
   end
   file('_reports/coverage') { task(:coverage).invoke }
 
-
+  task :load_ci_reporter do
+    gem 'ci_reporter'
+    ENV['CI_REPORTS'] = '_reports/ci'
+    # CI_Reporter does not quote the path to rspec_loader which causes problems when ruby is installed in C:/Program Files
+    ci_rep_path = Gem.loaded_specs['ci_reporter'].full_gem_path
+    ENV["SPEC_OPTS"] = [ENV["SPEC_OPTS"], default_spec_opts, "--require", "\"#{ci_rep_path}/lib/ci/reporter/rake/rspec_loader.rb\"", "--format", "CI::Reporter::RSpec"].join(" ")
+  end
+  
+  desc 'Run all specs with CI reporter'
+  task :ci=>[:load_ci_reporter, :spec] 
+  
   # Useful for testing with JRuby when using Ruby and vice versa.
   namespace :spec do
     desc "Run all specs specifically with Ruby"

data/rakelib/setup.rake

@@ -17,7 +17,7 @@
 require 'jruby' if RUBY_PLATFORM[/java/]
 require 'rubygems/source_info_cache'
 
-RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'yes').strip.downcase
+RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'false').strip.downcase
   when 'yes', 'true'
     true
   else
@@ -35,7 +35,14 @@ def install_gem(name, options = {})
     args = []
     args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed? and RAKE_SUDO
     args << rb_bin << '-S' << 'gem' << 'install' << name
-    args << '--version' << dep.version_requirements.to_s
+
+    if (spec.respond_to? :requirement)
+      args << '--version' << dep.requirement.to_s
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      args << '--version' << dep.version_requirements.to_s
+    end
+
     args << '--source' << options[:source] if options[:source]
     args << '--source' << 'http://gems.rubyforge.org'
     args << '--install-dir' << ENV['GEM_HOME'] if ENV['GEM_HOME']
@@ -49,6 +56,11 @@ desc "If you're building from sources, run this task first to setup the necessar
 task :setup do
   missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
   missing.each do |dep|
-    install_gem dep.name, :version=>dep.version_requirements
+    if (spec.respond_to? :requirement)
+      install_gem dep.name, :version=>dep.requirement
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      install_gem dep.name, :version=>dep.version_requirements
+    end
   end
 end

data/rakelib/stage.rake

@@ -23,6 +23,7 @@ rescue LoadError
   task(:setup) { install_gem 'rubyforge' }
 end
 
+gpg_cmd = 'gpg2'
 
 task :prepare do |task, args|
   # Make sure we're doing a release from checked code.
@@ -47,7 +48,12 @@ task :prepare do |task, args|
   # Need GPG to sign the packages.
   lambda do
     args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
-    fail "No GPG user #{args.gpg}" if `gpg2 --list-keys #{args.gpg}`.empty?
+    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    if !$?.success?
+      gpg_ok = `gpg --list-keys #{args.gpg}` 
+      gpg_cmd = 'gpg'
+    end
+    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke
@@ -62,11 +68,18 @@ task :prepare do |task, args|
     puts "[X] We have JRuby, Scala and Groovy"
   end.call
 
+  # Need Prince to generate PDF
+  lambda do
+    puts "Checking that we have prince available ... "
+    sh 'prince --version'
+    puts "[X] We have prince available"
+  end.call
+
   # Need RubyForge to upload new release files.
   lambda do
     puts "[!] Make sure you have admin privileges to make a release on RubyForge"
     rubyforge = RubyForge.new.configure
-    rubyforge.login 
+    rubyforge.login
     rubyforge.scrape_project(spec.name)
   end.call
 
@@ -99,14 +112,14 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
     task(:package).invoke
     mkpath '_staged/dist'
     FileList['pkg/*.{gem,zip,tgz}'].each do |source|
-      pkg = source.pathmap('_staged/dist/%n%x') 
+      pkg = source.pathmap('_staged/dist/%n%x')
       cp source, pkg
       bytes = File.open(pkg, 'rb') { |file| file.read }
       File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
       File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
-      sh 'gpg2', '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
+      sh gpg_cmd, '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
-    cp 'etc/KEYS', '_staged'
+    cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"
   end.call
 
@@ -114,10 +127,11 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
   # want to do that before generating the site/documentation.
   lambda do
     puts "Updating download page with links to release packages ... "
-    url = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
+    mirror = "http://www.apache.org/dyn/closer.cgi/#{spec.name}/#{spec.version}"
+    official = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
     rows = FileList['_staged/dist/*.{gem,tgz,zip}'].map { |pkg|
       name, md5 = File.basename(pkg), Digest::MD5.file(pkg).to_s
-      %{| "#{name}":#{url}/#{name} | "#{md5}":#{url}/#{name}.md5 | "Sig":#{url}/#{name}.asc |}
+      %{| "#{name}":#{mirror}/#{name} | "#{md5}":#{official}/#{name}.md5 | "Sig":#{official}/#{name}.asc |}
     }
     textile = <<-TEXTILE
 h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
@@ -125,7 +139,7 @@ h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
 |_. Package |_. MD5 Checksum |_. PGP |
 #{rows.join("\n")}
 
-p>. ("Release signing keys":#{url}/KEYS)
+p>. ("Release signing keys":#{official}/KEYS)
     TEXTILE
     file_name = 'doc/download.textile'
     print "Adding download links to #{file_name} ... "
@@ -154,7 +168,7 @@ p>. ("Release signing keys":#{url}/KEYS)
     sh 'rsync', '--progress', '--recursive', '_staged/', url
     puts "[X] Uploaded _staged directory to #{url}"
   end.call
-  
+
 
   # Prepare a release vote email. In the distant future this will also send the
   # email for you and vote on it.

data/spec/buildrdeb/package_spec.rb

@@ -42,6 +42,9 @@ CONTROL
     Buildr::write "control2", ""
     Buildr::write "postinst", ""
     Buildr::write "prerm", ""
+    Buildr::write "postinst2", <<-POSTINST2
+bash generate_code(#\{MY_CUSTOM_VALUE\})
+POSTINST2
   end
 
   it "should throw an error if no control file is given" do
@@ -51,7 +54,7 @@ CONTROL
       project.package(:deb).postinst = _("postinst")
       project.package(:deb).prerm = _("prerm")
     end
-    lambda { project("foo").package(:deb).invoke }.should raise_error(/no control file was defined when packaging foo as a deb file/)
+    lambda { project("foo").package(:deb).invoke }.should raise_error(/no control file was defined when packaging as a deb file/)
   end
   
   it "should raise an exception if the control is incorrectly formatted" do
@@ -62,7 +65,6 @@ CONTROL
       project.package(:deb).prerm = _("prerm")
     end
     lambda { project("foo").package(:deb).invoke }.should raise_error(/dpkg failed with this error:/)
-    File.exists?("target/foo-1.0.deb").should be_false
   end
   
   it "should give a project the ability to package as deb" do
@@ -86,8 +88,9 @@ CONTROL
       project.package(:deb).postinst = _("postinst")
       project.package(:deb).prerm = _("prerm")
       project.package(:deb).include("blah.class", :path => "lib")
-      project.package(:deb).include("folder", :as => "otherlib")
+      project.package(:deb).include("folder", :as => "otherlib/")
     end
+    project("foo").package(:deb).invoke
     lambda { project("foo").package(:deb).invoke }.should_not raise_error 
     File.exists?("target/foo-1.0.deb").should be_true
     #check the contents of the deb file:
@@ -111,4 +114,35 @@ CONTROL
     project("foo").package(:deb, :file => "bar-1.0.deb").invoke
     File.exists?("bar-1.0.deb").should be_true
   end
+  
+  it 'should change the version in the control file' do
+    write_files
+    define("foo", :version => "2.0") do
+      project.package(:deb).tap do |deb|
+        deb.control = _("control")
+        deb.postinst = _("postinst")
+        deb.prerm = _("prerm")
+      end
+    end
+    project("foo").package(:deb).invoke
+    File.exists?( project("foo").package(:deb).to_s).should be_true
+    File.exists?("target/foo-2.0.deb-contents/DEBIAN/control").should be_true
+    File.read("target/foo-2.0.deb-contents/DEBIAN/control").should match /^Version: 2.0$/
+  end
+  
+  it "should evaluate the contents of the file" do
+    write_files
+    define("foo", :version => "2.0") do
+      project.package(:deb).tap do |deb|
+        deb.control = _("control")
+        deb.postinst = _("postinst2")
+        deb.prerm = _("prerm")
+      end
+    end
+    MY_CUSTOM_VALUE = "custom"
+    project("foo").package(:deb).invoke
+    File.exists?( project("foo").package(:deb).to_s).should be_true
+    File.exists?("target/foo-2.0.deb-contents/DEBIAN/postinst").should be_true
+    File.read("target/foo-2.0.deb-contents/DEBIAN/postinst").should match MY_CUSTOM_VALUE
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildrdeb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Antoine Toulme
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -07:00
+date: 2010-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,9 +34,10 @@ extra_rdoc_files:
 files: 
 - lib/buildrdeb/package.rb
 - lib/buildrdeb.rb
+- rakelib/all-in-one.rake
 - rakelib/checks.rake
 - rakelib/doc.rake
-- rakelib/jekylltask.rb
+- rakelib/metrics.rake
 - rakelib/package.rake
 - rakelib/release.rake
 - rakelib/rspec.rake

data/rakelib/jekylltask.rb

@@ -1,120 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with this
-# work for additional information regarding copyright ownership.  The ASF
-# licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-
-gem 'mojombo-jekyll', '~> 0.5.2' # skip past some buggy versions
-require 'rake/tasklib'
-require 'jekyll'
-
-
-class JekyllTask < Rake::TaskLib
-  def initialize(name=:jekyll)  # :yield: self
-    @name = name
-    @source = name
-    @target = name
-    yield self if block_given?
-    task name, :auto, :needs=>[@source] do |task, args|
-      generate args.auto
-    end
-    if @source != @target
-      file @target=>FileList["#{@source}/**/*"] do
-        generate
-      end
-      task 'clobber' do
-        rm_rf @target
-      end
-    end
-  end
-
-  attr_accessor :source
-  attr_accessor :target
-
-  def generate(auto = false)
-    options = { 'source'=>source, 'destination'=>target }
-    options = Jekyll.configuration(options)
-    site = Jekyll::Site.new(options)
-
-    if auto
-      require 'directory_watcher'
-      puts "Auto generating: just edit a page and save, watch the console to see when we're done regenerating pages"
-      dw = DirectoryWatcher.new(source)
-      dw.interval = 1
-      dw.glob = Dir.chdir(source) do
-        dirs = Dir['*'].select { |x| File.directory?(x) }
-        dirs -= [target]
-        dirs = dirs.map { |x| "#{x}/**/*" }
-        dirs += ['*']
-      end
-      dw.start
-      dw.add_observer do |*args|
-        t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{t}] regeneration: #{args.size} files changed"
-        site.process
-        puts "Done"
-      end
-      loop { sleep 1 }
-    else
-      puts "Generating documentation in #{target}"
-      site.process
-      touch target
-    end
-  end
-end
-
-
-module TocFilter
-  def toc(input)
-    input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).inject(%{<ol class="toc">}) { |toc, entry|
-      id = entry[1][/^id=(['"])(.*)\1$/, 2]
-      title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
-      toc << %{<li><a href="##{id}">#{title}</a></li>}
-    } << "</ol>"
-  end
-end
-Liquid::Template.register_filter(TocFilter)
-
-
-
-# Under Ruby 1.9 [a,b,c].to_s doesn't join the array first. (Jekyll 0.5.2 requires this)
-module Jekyll
-  class HighlightBlock < Liquid::Block
-    def render(context)
-      if context.registers[:site].pygments
-        render_pygments(context, super.join)
-      else
-        render_codehighlighter(context, super.join)
-      end
-    end
-  end
-end
-
-# Ruby 1.9 has sane closure scoping which manages to mess Liquid filters. (Liquid 2.0.0 requires this)
-module Liquid
-  class Variable
-    def render(context)
-      return '' if @name.nil?
-      @filters.inject(context[@name]) do |output, filter|
-        filterargs = filter[1].to_a.collect do |a|
-         context[a]
-        end
-        begin
-          context.invoke(filter[0], output, *filterargs)
-        rescue FilterNotFound
-          raise FilterNotFound, "Error - filter '#{filter[0]}' in '#{@markup.strip}' could not be found."
-        end
-      end
-    end
-  end
-end