fpm 0.4.24 → 0.4.25

data/CHANGELIST

@@ -1,4 +1,16 @@
-0.4.xx (???)
+0.4.25 (December 7, 2012)
+  - Added --deb-changelog and --rpm-changelog support flags. Both take a path to
+    a changelog file. Both must be valid changelog formats for their respective
+    package types. (#300, patch by Pranay Kanwar)
+  - deb: Multiple "provides" are now supported. (#301, patch by Pranay Kanwar)
+  - rpm: Added --rpm-os flag to set the OS target for the rpm. This lets you build 
+    rpms for linux on OS X and other platforms (with --rpm-os linux). (#309)
+  - rpm: Avoid platform-dependent commands in the %install phase (#309, fixes
+    'cp -d' on OSX)
+  - python: ignore comments in requirements.txt (#304, patch by Pranay Kanwar)
+  - Fixed warning 'already initialized constant' (#274)
+
+0.4.24 (November 30, 2012)
   - Don't include an empty url in rpm spec (#296, #276; patch by Pranay Kanwar)
   - Don't require extra parameters if you use --inputs (#278, #297; Patch by
     Pranay Kanwar)

data/lib/fpm/command.rb

@@ -14,7 +14,8 @@ end
 
 Dir[File.join(File.dirname(__FILE__), "package", "*.rb")].each do |plugin|
   Cabin::Channel.get(Kernel).info("Loading plugin", :path => plugin)
-  require plugin
+
+  require "fpm/package/#{File.basename(plugin)}"
 end
 
 

data/lib/fpm/package/deb.rb

@@ -73,6 +73,10 @@ class FPM::Package::Deb < FPM::Package
 
   option "--group", "GROUP", "The group owner of files in this package"
 
+  option "--changelog", "FILEPATH", "Add FILEPATH as debian changelog" do |file|
+    File.expand_path(file)
+  end
+
   def initialize(*args)
     super(*args)
     attributes[:deb_priority] = "extra"
@@ -274,6 +278,14 @@ class FPM::Package::Deb < FPM::Package
       tar_flags += [ "--group", attributes[:deb_group] ]
     end
 
+    if attributes[:deb_changelog]
+      dest_changelog = File.join(staging_path, "usr/share/doc/#{attributes[:name]}/changelog.Debian")
+      FileUtils.mkdir_p(File.dirname(dest_changelog))
+      FileUtils.cp attributes[:deb_changelog], dest_changelog
+      safesystem("gzip", dest_changelog)
+      File.chmod(0644, dest_changelog)
+    end
+
     args = [ tar_cmd, "-C", staging_path, compression ] + tar_flags + [ "-cf", datatar, "." ]
     safesystem(*args)
 

data/lib/fpm/package/python.rb

@@ -178,7 +178,13 @@ class FPM::Package::Python < FPM::Package
       # Best I can tell, requirements.txt are a superset of what
       # is already supported as 'dependencies' in setup.py
       # So we'll parse them the same way below.
-      metadata["dependencies"] = File.read(requirements_txt).split("\n")
+      
+      # requirements.txt can have dependencies, flags, and comments.
+      # We only want the comments, so remove comment and flag lines.
+      metadata["dependencies"] = File.read(requirements_txt).split("\n") \
+        .reject { |l| l =~ /^\s*#/ } \
+        .reject { |l| l =~ /^-/ } \
+        .map(&:strip)
     end
 
     self.dependencies += metadata["dependencies"].collect do |dep|

data/lib/fpm/package/rpm.rb

@@ -66,6 +66,15 @@ class FPM::Package::RPM < FPM::Package
     value.downcase
   end
 
+  # TODO(sissel): Try to be smart about the default OS.
+  # issue #309
+  option "--os", "OS", "The operating system to target this rpm for. " \
+    "You want to set this to 'linux' if you are using fpm on OS X, for example"
+
+  option "--changelog", "FILEPATH", "Add changelog from FILEPATH contents" do |file|
+    File.read(File.expand_path(file))
+  end
+
   private
 
   # Handle any architecture naming conversions.
@@ -190,7 +199,12 @@ class FPM::Package::RPM < FPM::Package
       "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",
-      "--define", "_rpmdir #{build_path}/RPMS"]
+      "--define", "_rpmdir #{build_path}/RPMS",
+    ]
+
+    # issue #309
+    rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
+    args += ["--target", rpm_target]
 
     (attributes[:rpm_rpmbuild_define] or []).each do |define|
       args += ["--define", define]

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.24"
+  VERSION = "0.4.25"
 end

data/templates/deb.erb

@@ -18,7 +18,7 @@ Conflicts: <%= conflicts.join(", ") %>
 <% if !provides.empty? -%>
 <%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
 <%#  http://www.debian.org/doc/debian-policy/ch-relationships.html -%>
-Provides: <%= provides.first.split(" ").first %>
+Provides: <%= provides.map {|p| p.split(" ").first}.join ", " %>
 <% end -%>
 <% if !replaces.empty? -%>
 Replaces: <%= replaces.join(", ") %>

data/templates/rpm.erb

@@ -75,16 +75,20 @@ Obsoletes: <%= repl %>
 
 %install
 <% files.each do |path| -%>
-<%   source = Shellwords.shellescape(File.join(staging_path, path)).gsub("%", "%%") -%>
+<%   source = File.join(staging_path, path) -%>
+<%   source_safe = Shellwords.shellescape(source).gsub("%", "%%") -%>
 <%   # Copy to the build_path/BUILD/ to make rpmbuild happy -%>
-<%   target = Shellwords.shellescape(File.join(build_path, build_sub_dir, path)).gsub("%", "%%") -%>
-<%   dir = File.dirname(target) %>
-mkdir -p <%= dir %>
-if [ -f <%= source %> ] || [ -h <%= source %> ] ; then
-  cp -d <%= source %> <%= target %>
-elif [ -d <%= source %> ] ; then
-  mkdir <%= target %>
-fi
+<%   target_safe = Shellwords.shellescape(File.join(build_path, build_sub_dir, path)).gsub("%", "%%") -%>
+<%   st = File.lstat(source) -%>
+<%   dir = File.dirname(target_safe) -%>
+[ ! -d <%= dir %> ] && mkdir -p <%= dir %>
+<%   if st.symlink? -%>
+ln -s <%= File.readlink(source) %> <%= target_safe %>
+<%   elsif st.directory? -%>
+mkdir <%= target_safe %>
+<%   else -%>
+cp <%= source_safe %> <%= target_safe %>
+<%   end -%>
 <% end %>
 
 %clean
@@ -147,3 +151,4 @@ fi
 %>
 
 %changelog
+<%= attributes[:rpm_changelog] %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -152,29 +152,29 @@ files:
 - lib/fpm/command.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package.rb
+- lib/fpm/errors.rb
+- lib/fpm/version.rb
+- lib/fpm/package/gem.rb
+- lib/fpm/package/dir.rb
+- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
-- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/tar.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/pear.rb
 - lib/fpm/package/deb.rb
-- lib/fpm/package/dir.rb
-- lib/fpm/package/puppet.rb
-- lib/fpm/package/gem.rb
 - lib/fpm/package/python.rb
-- lib/fpm/package/solaris.rb
 - lib/fpm/package/rpm.rb
-- lib/fpm/package/npm.rb
-- lib/fpm/package/pear.rb
-- lib/fpm/version.rb
-- lib/fpm/errors.rb
+- lib/fpm/package/puppet.rb
+- lib/fpm/package/tar.rb
+- lib/fpm/package/solaris.rb
 - lib/fpm/util.rb
 - lib/fpm.rb
 - bin/fpm-npm
 - bin/fpm
-- templates/solaris.erb
-- templates/rpm.erb
 - templates/deb.erb
+- templates/rpm.erb
+- templates/solaris.erb
 - templates/puppet/package/remove.pp.erb
 - templates/puppet/package.pp.erb
 - LICENSE
@@ -206,3 +206,4 @@ signing_key:
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
+has_rdoc: