rake-debian-build 1.0.11 → 1.0.12

data/Rakefile

@@ -3,7 +3,7 @@
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec('rake-debian-build') do |p|
-  p.version = '1.0.11'
+  p.version = '1.0.12'
   p.developer("Alban Peignier", "alban@tryphon.eu")
   p.summary = "Rake tasks to build debian packages"
   p.url = "http://projects.tryphon.eu/rake-debian-build"

data/lib/debian/build/config.rb

@@ -1 +1,3 @@
-require 'config' if File.exists? 'config.rb'
+["#{ENV['HOME']}/.rake_debian_build.rc", "./local.rb", "./config.rb" ].each do |conf|
+  load conf if File.exists?(conf)
+end

data/lib/debian/build/platform.rb

@@ -2,7 +2,15 @@ module Debian::Build
   class Platform
     extend BuildDirectoryMethods
 
-    attr_reader :architecture
+    attr_reader :architecture, :distribution
+
+    @@repositories = []
+    def self.repositories
+      @@repositories
+    end
+    def repositories
+      @@repositories
+    end
 
     def method_missing(method, *args, &block)
       if @distribution.respond_to? method
@@ -48,15 +56,27 @@ module Debian::Build
       File.exists? pbuilder_base_file
     end
 
+    def additional_mirrors
+      repositories.collect do |repository|
+        case repository
+        when String
+          eval '"' + repository + '"'
+        when Proc
+          repository.call self
+        else
+          repository.to_s
+        end
+      end.compact.uniq
+    end
+
+    def other_mirrors
+      ["deb file:#{build_result_directory} ./"] + additional_mirrors
+    end
+
     def pbuilder(options = {})
       PBuilder.new do |p|
         p[:basetgz] = pbuilder_base_file
 
-        other_mirrors = ["deb file:#{build_result_directory} ./"]
-        unless @distribution.ubuntu?
-          other_mirrors << "deb http://www.debian-multimedia.org #{distribution} main"
-        end
-
         p[:othermirror] = "'#{other_mirrors.join('|')}'"
         p[:bindmounts] = p[:buildresult] = build_result_directory
         p[:distribution] = distribution

data/rake-debian-build.gemspec

@@ -2,14 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rake-debian-build}
-  s.version = "1.0.11"
+  s.version = "1.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2010-09-22}
+  s.date = %q{2010-09-23}
   s.description = %q{}
   s.email = ["alban@tryphon.eu"]
-  s.files = ["patching file Manifest.tmp"]
+  s.extra_rdoc_files = ["Manifest.txt"]
+  s.files = ["Manifest.txt", "README.rdoc", "Rakefile", "lib/debian/build.rb", "lib/debian/build/abstract_package.rb", "lib/debian/build/build_directory_methods.rb", "lib/debian/build/config.rb", "lib/debian/build/distribution.rb", "lib/debian/build/helper_methods.rb", "lib/debian/build/module_package.rb", "lib/debian/build/package.rb", "lib/debian/build/pbuilder.rb", "lib/debian/build/platform.rb", "lib/debian/build/source_providers.rb", "lib/debian/build/tasks.rb", "lib/debian/build/uploader.rb", "rake-debian-build.gemspec", "script/pbuilder", "spec/debian/build/pbuilder_spec.rb", "spec/debian/build/source_providers_spec.rb", "spec/debian/build/uploader_spec.rb", "spec/spec_helper.rb", "tasks/packages.rake", "tasks/pbuilder.rake", "tasks/setup.rake"]
   s.homepage = %q{http://projects.tryphon.eu/rake-debian-build}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
-require 'spec'
+begin
+  require 'spec'
+rescue LoadError
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  gem 'rspec'
+  require 'spec'
+end
 
-lib_path = File.join(File.dirname(__FILE__),"..","lib")
-$:.unshift lib_path unless $:.include?(lib_path)
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require "debian/build"
 include Debian::Build

data/tasks/pbuilder.rake

@@ -16,16 +16,20 @@ namespace :pbuilder do
   end
   task :create => Platform.all.collect { |platform| "create:#{platform.task_name}" }
 
+  def platforms_with_pbuilder
+    Debian::Build::Platform.all.select { |platform| platform.pbuilder_enabled? }
+  end
+
   desc "Update pbuilder"
   task :update do
-    Debian::Build::Platform.each do |platform| 
+    platforms_with_pbuilder.each do |platform| 
       platform.pbuilder.exec :update
     end
   end
 
   desc "Update pbuilder by overriding config"
   task :update_config do
-    Debian::Build::Platform.each do |platform| 
+    platforms_with_pbuilder.each do |platform| 
       platform.pbuilder("override-config" => true).exec :update  
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-debian-build
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Alban Peignier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency