fpm 0.2.21 → 0.2.22

data/lib/fpm/package.rb

@@ -1,5 +1,6 @@
 require "fpm/namespace"
 require "socket" # for Socket.gethostname
+require "logger"
 
 class FPM::Package 
   # The name of this package
@@ -55,6 +56,7 @@ class FPM::Package
 
   def initialize(source)
     @source = source
+    @logger = Logger.new(STDERR)
 
     @name = source[:name] # || fail
 
@@ -70,7 +72,11 @@ class FPM::Package
     @category = source[:category] || "default"
     @license = source[:license] || "unknown"
     @maintainer = source[:maintainer] || "<#{ENV["USER"]}@#{Socket.gethostname}>"
-    @architecture = source[:architecture] || %x{uname -m}.chomp
+
+    # If @architecture is nil, the target package should provide a default.
+    # Special 'architecture' values include "all" (aka rpm's noarch, debian's all)
+    # Another special includes "native" which will be the current platform's arch.
+    @architecture = source[:architecture]
     @description = source[:description] || "no description given"
     @provides = source[:provides] || []
     @scripts = source[:scripts]

data/lib/fpm/source/gem.rb

@@ -26,7 +26,7 @@ class FPM::Source::Gem < FPM::Source
     # Code use permissible by rubygems's "GPL or these conditions below"
     # http://rubygems.rubyforge.org/rubygems-update/LICENSE_txt.html
 
-    puts "Trying to download #{gem_name} (version=#{version})"
+    puts "Trying to download #{gem_name} (version=#{version || 'latest'})"
     dep = ::Gem::Dependency.new gem_name, version
     # How to handle prerelease? Some extra magic options?
     #dep.prerelease = options[:prerelease]
@@ -71,6 +71,13 @@ class FPM::Source::Gem < FPM::Source
         # package managers.  Need to decide how to handle this.
         self[:category] = 'Languages/Development/Ruby'
 
+        # if the gemspec has extensions defined, then this should be a 'native' arch.
+        if !spec.extensions.empty?
+          self[:architecture] = "native"
+        else
+          self[:architecture] = "all"
+        end
+
         self[:dependencies] = []
         spec.runtime_dependencies.map do |dep|
           # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'

data/lib/fpm/target/deb.rb

@@ -3,14 +3,25 @@ require "fpm/namespace"
 require "fpm/package"
 
 class FPM::Target::Deb < FPM::Package
-  # Debian calls x86_64 "amd64"
   def architecture
-    if @architecture == "x86_64"
-      "amd64"
-    else
-      @architecture
+    if @architecture.nil? or @architecture == "native"
+      # Default architecture should be 'native' which we'll need
+      # to ask the system about.
+      arch = %x{dpkg --print-architecture}.chomp
+      if $?.exitstatus != 0
+        arch = %x{uname -m}
+        @logger.warn("Can't find 'dpkg' tool (need it to get default " \
+                     "architecture!). Please specificy --architecture " \
+                     "specifically. (Defaulting now to #{arch})")
+      end
+      @architecture = arch
+    elsif @architecture == "x86_64"
+      # Debian calls x86_64 "amd64"
+      @architecture = "amd64"
     end
-  end
+    
+    return @architecture
+  end # def architecture
 
   def specfile(builddir)
     "#{builddir}/control"

data/lib/fpm/target/rpm.rb

@@ -1,6 +1,20 @@
 require "fpm/package"
 
 class FPM::Target::Rpm < FPM::Package
+  def architecture
+    case @architecture
+      when nil
+        return %x{uname -m}.chomp   # default to current arch
+      when "native"
+        return %x{uname -m}.chomp   # 'native' is current arch
+      when "all"
+        # Translate fpm "all" arch to what it means in RPM.
+        return "noarch"
+      else 
+        return @architecture
+    end
+  end # def architecture
+
   def specfile(builddir)
     "#{builddir}/#{name}.spec"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  hash: 59
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -07:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling