fpm 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07da7989aad6ad5467e603091a7e4bf32b7b3c0d
-  data.tar.gz: d57ee3c926610bdb7632e1d47c71dc58b2cec565
+  metadata.gz: 667a4cf02480d4f1e0765b61a7e10d738f97979d
+  data.tar.gz: 2876ef0ca281d507aa190f4bb51a8f36d6da2da6
 SHA512:
-  metadata.gz: 0050e0c4bdf76b205c9c76284349916f85e82f4679690bd5d2be77124624f0c5435c29aae1cc761afe36b9f75bace5724941fdb58d6af8adb536272c383bc7e7
-  data.tar.gz: fd3dc776f652d02a5b5f2451bf57c08b1995ef51455bc38c4ef0f3207eb93cb04c5df06bceab33f9a2542dcd23ddebc74590ab20b1547a52a3cd2c3e33b92f8f
+  metadata.gz: 9d55a2990a70e521030c5832a5bc609e83f433914e0a6bda63924cf97e0b826b4950190a58c27733559f0e06f4fc5aeb0187c3fc3ef6e5f61ec0465589320769
+  data.tar.gz: 54c20001e7840427fe4d819636131d727ef6f7c5ad729e59670893851355cb1f6313d6e398fb3321915cd90f589658e65e39111890d3e2df4b88926eb7623436

data/CHANGELIST

@@ -1,3 +1,14 @@
+1.6.2 (July 1, 2016)
+  - Reduce `json` dependency version to avoid requiring Ruby 2.0 (#1146, #1147;
+    patch by Matt Hoffman)
+  - pacman: skip automatic dependnecies if --no-auto-depends is given (Leo P)
+  - rpm: Fix bug where --rpm-tag was accidentally ignored (#1134, Michal Mach)
+  - deb: Omit certain fields from control file if (Breaks, Depends, Recommends,
+    etc) if there are no values to put in that field. (#1113, TomyLobo)
+  - rpm: remove trailing slash from Prefix for rpm packages (#819, luto)
+  - virtualenv: Now supports being given a requirements.txt as the input. (Nick
+    Griffiths)
+
 1.6.1 (June 10, 2016)
   - freebsd: Only load xz support if we are doing a freebsd output. (#1132,
     #1090, Ketan Padegaonkar)

data/lib/fpm/package/pacman.rb

@@ -137,7 +137,7 @@ class FPM::Package::Pacman < FPM::Package
     # Speaking of just taking the first entry of the field:
     # A crude thing to do, but I suppose it's better than nothing.
     # -- Daniel Haskin, 3/24/2015
-    self.category = control["group"][0] || self.category
+    self.category = control["group"] && control["group"][0] || self.category
 
     # Licenses could include more than one.
     # Speaking of just taking the first entry of the field:
@@ -164,6 +164,10 @@ class FPM::Package::Pacman < FPM::Package
     end
 
     self.dependencies = control["depend"] || self.dependencies
+    
+    if attributes[:no_auto_depends?]
+      self.dependencies = []
+    end
 
     self.attributes[:pacman_optional_depends] = control["optdepend"] || []
     # There are other available attributes, but I didn't include them because:

data/lib/fpm/package/rpm.rb

@@ -523,7 +523,11 @@ class FPM::Package::RPM < FPM::Package
   end # def output
 
   def prefix
-    return (attributes[:prefix] or "/")
+    if attributes[:prefix] and attributes[:prefix] != '/'
+      return attributes[:prefix].chomp('/')
+    else
+      return "/"
+    end
   end # def prefix
 
   def build_sub_dir

data/lib/fpm/package/virtualenv.rb

@@ -40,7 +40,18 @@ class FPM::Package::Virtualenv < FPM::Package
     m = /^([^=]+)==([^=]+)$/.match(package)
     package_version = nil
 
-    if m
+    is_requirements_file = (File.basename(package) == "requirements.txt")
+
+    if is_requirements_file
+      if !File.file?(package)
+        raise FPM::InvalidPackageConfiguration, "Path looks like a requirements.txt, but it doesn't exist: #{package}"
+      end
+
+      package = File.join(::Dir.pwd, package) if File.dirname(package) == "."
+      package_name = File.basename(File.dirname(package))
+      logger.info("No name given. Using the directory's name", :name => package_name)
+      package_version = nil
+    elsif m
       package_name = m[1]
       package_version = m[2]
       self.version ||= package_version
@@ -82,10 +93,18 @@ class FPM::Package::Virtualenv < FPM::Package
         extra_index_url_args << "--extra-index-url" << extra_url
       end
     end
-    pip_args = [pip_exe, "install", "-i", attributes[:virtualenv_pypi]] << extra_index_url_args << package
+
+    target_args = []
+    if is_requirements_file
+      target_args << "-r" << package
+    else
+      target_args << package
+    end
+
+    pip_args = [pip_exe, "install", "-i", attributes[:virtualenv_pypi]] << extra_index_url_args << target_args
     safesystem(*pip_args.flatten)
 
-    if package_version.nil?
+    if ! is_requirements_file && package_version.nil?
       frozen = safesystemout(pip_exe, "freeze")
       package_version = frozen[/#{package}==[^=]+$/].split("==")[1].chomp!
       self.version ||= package_version

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/templates/deb.erb

@@ -13,13 +13,13 @@ Depends: <%= dependencies.collect { |d| fix_dependency(d) }.flatten.join(", ") %
 <% if !conflicts.empty? -%>
 Conflicts: <%= conflicts.collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
-<% if attributes[:deb_breaks] -%>
+<% if attributes[:deb_breaks] and !attributes[:deb_breaks].empty? -%>
 Breaks: <%= attributes[:deb_breaks].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
-<% if attributes[:deb_pre_depends_given?] -%>
+<% if attributes[:deb_pre_depends] and !attributes[:deb_pre_depends].empty? -%>
 Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
-<% if attributes[:deb_build_depends_given?] -%>
+<% if attributes[:deb_build_depends] and !attributes[:deb_build_depends].empty? -%>
 Build-Depends: <%= attributes[:deb_build_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
 <% if !provides.empty? -%>
@@ -30,10 +30,10 @@ Provides: <%= provides.map {|p| p.split(" ").first}.join ", " %>
 <% if !replaces.empty? -%>
 Replaces: <%= replaces.join(", ") %>
 <% end -%>
-<% if attributes[:deb_recommends_given?] -%>
+<% if attributes[:deb_recommends] and !attributes[:deb_recommends].empty? -%>
 Recommends: <%= attributes[:deb_recommends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
-<% if attributes[:deb_suggests_given?] -%>
+<% if attributes[:deb_suggests] and !attributes[:deb_suggests].empty? -%>
 Suggests: <%= attributes[:deb_suggests].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
 Section: <%= category %>

data/templates/rpm.erb

@@ -58,9 +58,8 @@ AutoProv: yes
 # Seems specifying BuildRoot is required on older rpmbuild (like on CentOS 5)
 # fpm passes '--define buildroot ...' on the commandline, so just reuse that.
 BuildRoot: %buildroot
-# Add prefix, must not end with /
 <% if !prefix.nil? and !prefix.empty? %>
-Prefix: <%= prefix.gsub(/([^\/]+)(\/$)/, '') %>
+Prefix: <%= prefix %>
 <% end -%>
 
 Group: <%= category %>
@@ -83,7 +82,7 @@ Packager: <%= maintainer %>
 <% dependencies.each do |req| -%>
 Requires: <%= req %>
 <% end -%>
-<% (attributes[:rpm_tags] or []).each do |tag| -%>
+<% (attributes[:rpm_tag] or []).each do |tag| -%>
 <%= tag %>
 <% end -%>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement