fpm 0.2.23 → 0.2.24

data/bin/fpm

@@ -72,7 +72,7 @@ def main(args)
       settings.source_type = st
     end # -s 
 
-    opts.on("-S PACKAGE_SUFFIX", "which suffix to append to package and dependances") do |sfx|
+    opts.on("-S PACKAGE_SUFFIX", "which suffix to append to package and dependencies") do |sfx|
       settings.suffix = sfx
     end # -S
 

data/lib/fpm.rb

@@ -8,4 +8,5 @@ require "fpm/target/rpm"
 require "fpm/source"
 require "fpm/source/dir"
 require "fpm/source/gem"
+require "fpm/source/python"
 require "fpm/source/rpm"

data/lib/fpm/builder.rb

@@ -92,8 +92,9 @@ class FPM::Builder
       })
     end
 
-    cleanup!
+    garbage << @source.garbage if @source.respond_to?(:garbage)
 
+    cleanup!
   end # def assemble!
 
   private

data/lib/fpm/source/pyfpm/__init__.py

@@ -0,0 +1 @@
+__all__ = [ "list_dependencies" ]

data/lib/fpm/source/pyfpm/get_metadata.py

@@ -0,0 +1,79 @@
+from distutils.core import Command
+import json
+import re
+import time
+
+# Note, the last time I coded python daily was at Google, so it's entirely
+# possible some of my techniques below are outdated or bad.
+# If you have fixes, let me know.
+
+class get_metadata(Command):
+  description = "get package metadata"
+  user_options = []
+
+  def initialize_options(self):
+    pass
+  # def initialize_options
+
+  def finalize_options(self):
+    pass
+  # def finalize_options
+
+  def run(self):
+    #print type(self.distribution)
+    #for i in sorted(dir(self.distribution)):
+      #if i.startswith("_"):
+        #continue
+      ###print "%s: %r" % (i, self.__getattr__(i))
+      #print "%s" % i
+
+    data = {
+      "name": self.distribution.get_name(),
+      "version": self.distribution.get_version(),
+      "author": "%s <%s>" % (self.distribution.get_author(),
+        self.distribution.get_author_email()),
+      "description": self.distribution.get_description(),
+      "license": self.distribution.get_license(),
+      "url": self.distribution.get_url(),
+    }
+
+    # If there are python C/extension modules, we'll want to build a native
+    # arch package.
+    if self.distribution.has_ext_modules():
+      data["architecture"] = "native"
+    else:
+      data["architecture"] = "all"
+    # end if
+
+    dependencies = []
+    try:
+      dependencies = self.distribution.install_requires
+    except:
+      pass
+
+    final_deps = []
+    dep_re = re.compile("([^<>= ]+)(?:\s*([<>=]{1,2})\s*(.*))?$")
+    for dep in dependencies:
+      # python deps are strings that look like:
+      # "packagename"
+      # "packagename >= version"
+      # Replace 'packagename' with 'python#{suffix}-packagename'
+      m = dep_re.match(dep)
+      if m is None:
+        print "Bad dep: %s" % dep
+        time.sleep(3)
+      elif m.groups()[1] is None:
+        name, cond, version = m.groups()[0], ">=", 0
+      else:
+        name, cond, version = m.groups()
+      # end if
+
+      final_deps.append("%s %s %s" % (name, cond, version))
+    # end for i in dependencies
+
+    data["dependencies"] = final_deps
+
+    #print json.dumps(data, indent=2)
+    print json.dumps(data, indent=2)
+  # def run
+# class list_dependencies

data/lib/fpm/source/python.rb

@@ -0,0 +1,102 @@
+require "fpm/namespace"
+require "fpm/source"
+require "rubygems/package"
+require "rubygems"
+require "fileutils"
+require "tmpdir"
+require "json"
+
+class FPM::Source::Python < FPM::Source
+  def get_source(params)
+    package = @paths.first
+    if ["setup.py", "."].include?(package)
+      # Assume we're building from an existing python package.
+      # Source already acquired, nothing to do!
+      return
+    end
+
+    if !File.exists?(package) 
+      download(package, params[:version])
+    else
+      @paths = [ File.expand_path(package) ]
+    end
+  end # def get_source
+
+  def download(package, version=nil)
+    puts "Trying to download #{package} (using easy_install)"
+    @tmpdir = ::Dir.mktmpdir("python-build", ::Dir.pwd)
+
+    if version.nil?
+      want_pkg = "#{package}"
+    else
+      want_pkg = "#{package}==#{version}"
+    end
+    system("easy_install", "--editable", "--build-directory", @tmpdir, want_pkg)
+
+    # easy_install will put stuff in @tmpdir/packagename/, flatten that.
+    #  That is, we want @tmpdir/setup.py, and start with
+    #  @tmpdir/somepackage/setup.py
+    dirs = ::Dir.glob(File.join(@tmpdir, "*"))
+    if dirs.length != 1
+      raise "Unexpected directory layout after easy_install. Maybe file a bug? The directory is #{@tmpdir}"
+    end
+    @paths = dirs
+  end # def download
+
+  def get_metadata
+    setup_py = @paths.first
+    if File.directory?(setup_py)
+      setup_py = File.join(setup_py, "setup.py")
+      @paths = [setup_py]
+    end
+
+    if !File.exists?(setup_py)
+      raise "Unable to find python package; tried #{setup_py}"
+    end
+
+    pylib = File.expand_path(File.dirname(__FILE__))
+    setup_cmd = "env PYTHONPATH=#{pylib} python #{setup_py} --command-packages=pyfpm get_metadata"
+    output = ::Dir.chdir(File.dirname(setup_py)) { `#{setup_cmd}` }
+    puts output
+    metadata = JSON.parse(output[/\{.*\}/msx])
+    #p metadata
+
+    self[:architecture] = metadata["architecture"]
+    self[:description] = metadata["description"]
+    self[:license] = metadata["license"]
+    self[:version] = metadata["version"]
+    self[:name] = "python#{self[:suffix]}-#{metadata["name"]}"
+    self[:url] = metadata["url"]
+
+    self[:dependencies] = metadata["dependencies"].collect do |dep|
+      name, cmp, version = dep.split
+      "python#{self[:suffix]}-#{name} #{cmp} #{version}"
+    end
+  end # def get_metadata
+
+  def make_tarball!(tar_path, builddir)
+    setup_py = @paths.first
+    dir = File.dirname(setup_py)
+
+    # Some setup.py's assume $PWD == current directory of setup.py, so let's
+    # chdir first.
+    ::Dir.chdir(dir) do
+      system("python", "setup.py", "bdist")
+    end
+
+    dist_tar = ::Dir.glob(File.join(dir, "dist", "*.tar.gz")).first
+    puts "Found dist tar: #{dist_tar}"
+    puts "Copying to #{tar_path}"
+
+    @paths = [ "." ]
+
+    system("cp", dist_tar, "#{tar_path}.gz")
+  end # def make_tarball!
+
+  def garbage
+    trash = []
+    trash << @tmpdir if @tmpdir
+    return trash
+  end # def garbage
+
+end # class FPM::Source::Gem

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 2
-  - 23
-  version: 0.2.23
+  - 24
+  version: 0.2.24
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -51,9 +51,14 @@ files:
 - lib/fpm/namespace.rb
 - lib/fpm/source.rb
 - lib/fpm/rubyfixes.rb
+- lib/fpm/source/python.rb
 - lib/fpm/source/npm.rb
 - lib/fpm/source/dir.rb
 - lib/fpm/source/rpm.rb
+- lib/fpm/source/pyfpm/__init__.pyc
+- lib/fpm/source/pyfpm/get_metadata.pyc
+- lib/fpm/source/pyfpm/get_metadata.py
+- lib/fpm/source/pyfpm/__init__.py
 - lib/fpm/source/gem.rb
 - lib/fpm/target/deb.rb
 - lib/fpm/target/rpm.rb