albanpeignier-rake-debian-build 1.0.2 → 1.0.4

data/Rakefile

@@ -2,9 +2,10 @@
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('rake-debian-build', '1.0.2') do |p|
+$hoe = Hoe.new('rake-debian-build', '1.0.5') do |p|
   p.developer("Alban Peignier", "alban.peignier@free.fr")
   p.summary = "Rake tasks to build debian packages"
+  p.url = "http://github.com/albanpeignier/rake-debian-build"
 
   p.rubyforge_name       = p.name # TODO this is default value
 

data/lib/debian/build/distribution.rb

@@ -24,7 +24,7 @@ module Debian::Build
 
     def self.ubuntu_distributions
       @@ubuntu_distributions ||= 
-        %w{hardy intrepid}.collect { |distribution| Distribution.new(:ubuntu, distribution) }
+        %w{hardy intrepid jaunty}.collect { |distribution| Distribution.new(:ubuntu, distribution) }
     end
 
     def source_result_directory
@@ -46,12 +46,12 @@ module Debian::Build
     end
 
     def unstable?
-      [ :unstable, :intrepid ].include? distribution
+      [ :unstable, :jaunty ].include? distribution
     end
     
-    @@local_names = { :stable => 'lenny', :testing => 'squeeze', :intrepid => 'ubuntu', :hardy => 'hardy' }
+    @@local_names = { :stable => 'lenny', :testing => 'squeeze' }
     def local_name
-      @@local_names[distribution]
+      @@local_names.fetch(distribution,self.to_s)
     end
 
     def to_s

data/lib/debian/build/module_package.rb

@@ -33,6 +33,10 @@ module Debian::Build
           end
         end
 
+        task "lintian" do
+          # TODO : implement lintian on ModulePackage
+        end
+
         # TODO : remove this mock
         namespace :source do 
           task :all 

data/lib/debian/build/package.rb

@@ -34,18 +34,10 @@ module Debian::Build
 
               dch_options="--preserve --force-distribution"
               Dir.chdir(source_directory) do  
-                unless distribution.ubuntu?
-                  if distribution.unstable?
-                    sh "dch #{dch_options} --distribution 'unstable' --release ''"              
-                  else
-                    sh "dch #{dch_options} --local #{distribution.local_name} --distribution #{distribution} 'Release from unstable'"              
-                  end
+                if not distribution.ubuntu? and distribution.unstable?
+                  sh "dch #{dch_options} --distribution 'unstable' --release ''"              
                 else
-                  if distribution.unstable?
-                    sh "dch #{dch_options} --local ubuntu --distribution #{distribution} 'Release from debian/unstable'"
-                  else
-                    sh "dch #{dch_options} --local #{distribution.local_name} --distribution #{distribution} 'Release from unstable'"              
-                  end
+                  sh "dch #{dch_options} --local #{local_name(distribution)} --distribution #{distribution} 'Release from unstable'"
                 end
 
                 dpkg_buildpackage_options = []
@@ -87,24 +79,15 @@ module Debian::Build
 
         desc "Upload packages for #{package} #{version}"
         task "upload" do
-          changes_files = Dir.glob("#{sources_directory}/#{package}_#{debian_version}*_source.changes")
-
-          Platform.each do |platform|
-            platform_changes_files = Dir.glob("#{platform.build_result_directory}/#{package}_#{debian_version}*_#{platform.architecture}.changes")
-
-            unless platform_changes_files.empty?
-              # deb packages for architect all shouldn't be uploaded twice
-              sh "sed -i '/_all.deb/ d' #{platform_changes_files.join(' ')}" if platform.architecture != 'i386'
-
-              changes_files << platform_changes_files
-            end
-          end
-
-          changes_files.flatten!
-
           Uploader.default.dupload changes_files
         end
 
+        desc "Run lintian on package #{package}"
+        task "lintian" do
+          redirect = ENV['LINTIAN_OUTPUT'] ? ">> #{ENV['LINTIAN_OUTPUT']}" : ""
+          sh "lintian #{changes_files.join(' ')} #{redirect}"
+        end
+
         desc "Clean files created for #{package} #{version}"
         task "clean" do
           Platform.each do |platform|
@@ -120,9 +103,17 @@ module Debian::Build
       end
     end
 
+    def local_name(distribution)
+      unless distribution.unstable?
+        distribution.local_name
+      else
+        "ubuntu" if distribution.ubuntu?  
+      end
+    end
+
     def dsc_file(platform)
       suffix = 
-        if local_name = platform.local_name
+        if local_name = local_name(platform)
           "#{local_name}1"
         else
           ""
@@ -148,7 +139,25 @@ module Debian::Build
     end
 
     def debian_version
-      "#{version}-#{debian_increment}"    
+      "#{version}-#{debian_increment}"   
+    end
+
+    def changes_files
+      changes_files = Dir.glob("#{sources_directory}/#{package}_#{debian_version}*_source.changes")
+
+      Platform.each do |platform|
+        platform_changes_files = Dir.glob("#{platform.build_result_directory}/#{package}_#{debian_version}*_#{platform.architecture}.changes")
+
+        unless platform_changes_files.empty?
+          # deb packages for architect all shouldn't be uploaded twice
+          sh "sed -i '/_all.deb/ d' #{platform_changes_files.join(' ')}" if platform.architecture != 'i386'
+
+          changes_files << platform_changes_files
+        end
+      end
+
+      changes_files.flatten!
+      changes_files
     end
 
     def package_files(directory = '.')

data/lib/debian/build/platform.rb

@@ -12,12 +12,15 @@ module Debian::Build
       end
     end
 
-
     def initialize(distribution, architecture)
       @distribution = distribution
       @architecture = architecture
     end
 
+    def self.find_by_name(name)
+      self.all.find { |p| p.to_s == name }
+    end
+
     def self.supported_architectures
       %w{i386 amd64}
     end

data/rake-debian-build.gemspec

@@ -2,24 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rake-debian-build}
-  s.version = "1.0.2"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-04-19}
+  s.date = %q{2009-05-11}
+  s.description = %q{}
   s.email = ["alban.peignier@free.fr"]
   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", "lib/ruby_pbuilder.rb", "rake-debian-build.gemspec", "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.has_rdoc = true
+  s.homepage = %q{http://github.com/albanpeignier/rake-debian-build}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rake-debian-build}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Rake tasks to build debian packages}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<hoe>, [">= 1.12.2"])

data/tasks/packages.rake

@@ -23,7 +23,14 @@ namespace "packages" do
       end
     end
   end
-  
+
+  task :lintian do
+    lintian_sub_tasks = Debian::Build.packages.collect do |package|
+      "package:#{package}:lintian"
+    end
+    sh "rake #{lintian_sub_tasks.join(' ')} | sort -u > lintian-#{Time.now.strftime("%Y%m%d%H%M")}.txt"
+  end
+
 end
 
 task :packages => [ "packages:sources", "packages:binaries", "packages:upload" ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-rake-debian-build
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.12.2
     version: 
-description: 
+description: ""
 email: 
 - alban.peignier@free.fr
 executables: []
@@ -57,7 +57,7 @@ files:
 - tasks/pbuilder.rake
 - tasks/setup.rake
 has_rdoc: true
-homepage: 
+homepage: http://github.com/albanpeignier/rake-debian-build
 post_install_message: 
 rdoc_options: 
 - --main
@@ -81,7 +81,7 @@ requirements: []
 rubyforge_project: rake-debian-build
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Rake tasks to build debian packages
 test_files: []