fpm 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97d0ee2d01e8912d39b6a9be2c54f3af38fa03e2
-  data.tar.gz: 042b0fe90b2bdb5ec204a6709249f09ddc832eca
+  metadata.gz: e83b02439330a08aecf2eccc09088636385bcd32
+  data.tar.gz: ea88fac823151665fd45183cfeb0324635e25ae4
 SHA512:
-  metadata.gz: 5ba235fa296df13ef2e4e48ba73b6450db1eb89187a8e211dd66c05137ffb79c8449493bc8cfd91c23391c481852d492dc25b62d6843cdd7d9547b604fab36b3
-  data.tar.gz: 6077f710316bfbb5b9f5c50410a2a24e178434829640bb0ff52993e5bf67ae9ef6e370a24cef48c8d837dfd424c7340a63cd5565d28341393fe11ccc2243d5b7
+  metadata.gz: 4f3d69a8f1331c530720feccfa22549baa05e3ee0de6424c81f348fa78168116a730688c6c4b8fbaf477a9b0c3d8ce16b325fbb646b75880ad6d4b397279932a
+  data.tar.gz: 0d40b1dd3c676391e773a3e8af16cf4bd0649826aa2ce9adfb1402f4a0c3761c34ce3c8e849d1b8ec8daf409f34313d2ce5ca6d0338171ecea67c63bf046b189

data/CHANGELOG.rst

@@ -1,6 +1,13 @@
 Release Notes and Change Log
 ============================
 
+1.8.0 (December 28, 2016)
+^^^^^^^^^^^^^^^^^^^^^^^^^
+* virtualenv: Add `--virtualenv-setup-install` flag to run `setup.py install` after pip finishes installing things. (`#1218`_; John Stowers)
+* virtualenv: Add `--virtualenv-system-site-package` flag which creates the virtualenv in a way that allows it to use the system python packages. (`#1218`_; John Stowers)
+* cpan: Fix bug preventing some perl modules from being installed (`#1236`_, `#1241`_; Richard Grainger)
+* rpm: Documentation improvements (`#1242`_; Nick Griffiths)
+
 1.7.0 (November 28, 2016)
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 * virtualenv: Fix a bug where `pip` might be run incorrectly (`#1210`_; Nico Griffiths)

data/lib/fpm/package/cpan.rb

@@ -309,17 +309,16 @@ class FPM::Package::CPAN < FPM::Package
                  :distribution => distribution,
                  :version => cpan_version)
 
-    # default to latest versionunless we specify one
+    # default to latest version unless we specify one
     if cpan_version.nil?
-      self.version = metadata["version"]
+      self.version = "#{metadata["version"]}"
     else
-      if metadata["version"] =~ /^v\d/
-        self.version = "v#{cpan_version}"
-      else
-        self.version = cpan_version
-      end
+      self.version = "#{cpan_version}"
     end
-
+    
+    # remove 'v' prefix from version if it is there
+    self.version.sub!(/^v/, '')
+    
     # Search metacpan to get download URL for this version of the module
     metacpan_search_url = "http://api.metacpan.org/v0/release/_search"
     metacpan_search_query = '{"query":{"match_all":{}},"filter":{"term":{"release.name":"' + "#{distribution}-#{self.version}" + '"}}}'

data/lib/fpm/package/virtualenv.rb

@@ -30,6 +30,13 @@ class FPM::Package::Virtualenv < FPM::Package
     :multivalued => true, :attribute_name => :virtualenv_pypi_extra_index_urls,
     :default => nil
 
+  option "--setup-install", :flag, "After building virtualenv run setup.py install "\
+  "useful when building a virtualenv for packages and including their requirements from "
+  "requirements.txt"
+
+  option "--system-site-packages", :flag, "Give the virtual environment access to the "\
+  "global site-packages"
+
   private
 
   # Input a package.
@@ -77,7 +84,13 @@ class FPM::Package::Virtualenv < FPM::Package
 
     ::FileUtils.mkdir_p(virtualenv_build_folder)
 
-    safesystem("virtualenv", virtualenv_build_folder)
+    if self.attributes[:virtualenv_system_site_packages?]
+        logger.info("Creating virtualenv with --system-site-packages")
+        safesystem("virtualenv", "--system-site-packages", virtualenv_build_folder)
+    else
+        safesystem("virtualenv", virtualenv_build_folder)
+    end
+
     pip_exe = File.join(virtualenv_build_folder, "bin", "pip")
     python_exe = File.join(virtualenv_build_folder, "bin", "python")
 
@@ -104,6 +117,12 @@ class FPM::Package::Virtualenv < FPM::Package
     pip_args = [python_exe, pip_exe, "install", "-i", attributes[:virtualenv_pypi]] << extra_index_url_args << target_args
     safesystem(*pip_args.flatten)
 
+    if attributes[:virtualenv_setup_install?]
+      logger.info("Running PACKAGE setup.py")
+      setup_args = [python_exe, "setup.py", "install"]
+      safesystem(*setup_args.flatten)
+    end
+
     if ! is_requirements_file && package_version.nil?
       frozen = safesystemout(python_exe, pip_exe, "freeze")
       frozen_version = frozen[/#{package}==[^=]+$/]

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -320,4 +320,3 @@ signing_key:
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: