dpkg-tools 0.3.4 → 0.3.5

data/CHANGES

@@ -1,3 +1,9 @@
+== Version 0.3.5
+
+2008-07-02: Quick major minor-bugfix
+
+* Make the debian binary architecture handling for gems more intelligent: we now actually report the underlying system's build architecture instead of just i386. This allows native gems to be built on my amd64 system...
+
 == Version 0.3.4
 
 2008-06-25: Lots of bugfixing, some small refinements.

data/lib/dpkg-tools/package/data.rb

@@ -94,6 +94,10 @@ module DpkgTools
         "all"
       end
       
+      def build_system_architecture
+        IO.popen('dpkg-architecture -qDEB_BUILD_ARCH').gets.chomp
+      end
+      
       def architecture_independent?
         debian_arch == 'all'
       end

data/lib/dpkg-tools/package/gem/data.rb

@@ -67,7 +67,7 @@ module DpkgTools
         
         def debian_arch
           return 'all' if @spec.extensions.empty?
-          'i386'
+          build_system_architecture
         end
         
         def build_dependencies

data/lib/dpkg-tools/version.rb

@@ -3,10 +3,10 @@ module DpkgTools #:nodoc:
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 3
-      TINY   = 4
+      TINY   = 5
       RELEASE_CANDIDATE = nil
       
-      BUILD_TIME = "2008-06-25T11:26:00+01:00"
+      BUILD_TIME = "2008-07-02T16:00:03+01:00"
       
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/dpkg-tools/package/data_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'stringio'
 
 describe DpkgTools::Package::Data, "instances" do
   before(:each) do
@@ -30,6 +31,13 @@ describe DpkgTools::Package::Data, "instances" do
     @data.stubs(:debian_arch).returns('i386')
     @data.architecture_independent?.should be_false
   end
+  
+  it "should be able to return the underlying build arch" do
+    io = StringIO.new("amd64\n")
+    IO.expects(:popen).with('dpkg-architecture -qDEB_BUILD_ARCH').returns(io)
+    
+    @data.build_system_architecture.should == "amd64"
+  end
 end
 
 describe DpkgTools::Package::Data::YamlConfigHelpers do

data/spec/dpkg-tools/package/gem/data_spec.rb

@@ -143,9 +143,20 @@ describe DpkgTools::Package::Gem::Data, "instances" do
     @data.debian_arch.should == "all"
   end
   
-  it "should provide report the debian architecture name as i386 if spec.extensions is not empty" do
-    @spec.stubs(:extensions).returns(['extconf.rb'])
-    @data.debian_arch.should == "i386"
+  describe "reporting debian archtecture when spec.extensions is not empty" do
+    before(:each) do
+      @spec.stubs(:extensions).returns(['extconf.rb'])
+    end
+    
+    it "should report the debian architecture name as i386 when the underlying system is too" do
+      @data.stubs(:build_system_architecture).returns("i386")
+      @data.debian_arch.should == "i386"
+    end
+    
+    it "should report the debian architecture name as amd64 when the underlying system is too" do
+      @data.stubs(:build_system_architecture).returns("amd64")
+      @data.debian_arch.should == "amd64"
+    end
   end
   
   it "should be able to generate a sensible list of deps" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpkg-tools
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Matt Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 +01:00
+date: 2008-07-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -177,6 +177,6 @@ rubyforge_project: dpkg-tools
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: dpkg-tools-0.3.4 (build 2008-06-25T11:26:00+01:00) - Painless OS package building http://dpkg-tools.rubyforge.org/
+summary: dpkg-tools-0.3.5 (build 2008-07-02T16:00:03+01:00) - Painless OS package building http://dpkg-tools.rubyforge.org/
 test_files: []