fpm 0.2.4 → 0.2.5

data/bin/fpm

@@ -11,6 +11,7 @@ require "fpm"
 
 def main(args)
   settings = OpenStruct.new
+  settings.exclude = []
 
   opts = OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
@@ -68,6 +69,16 @@ def main(args)
             "A path to prefix files with when building the target package. This may not be necessary for all source types. For example, the 'gem' type will prefix with your gem directory (gem env | grep -A1 PATHS:)") do |prefix|
       settings.prefix = prefix
     end
+
+    opts.on("-e", "--edit", "Edit the specfile before building") do
+      settings.edit = true
+    end
+
+    opts.on("-x PATTERN", "--exclude PATTERN",
+            "Exclude paths matching pattern (according to tar --exclude)") do |pattern|
+      settings.exclude << pattern
+    end # -x / --exclude
+
   end # OptionParser
 
   opts.parse!(args)

data/lib/fpm/builder.rb

@@ -35,9 +35,12 @@ class FPM::Builder
       :version => settings.version,
       :name => settings.package_name,
       :prefix => settings.prefix,
-      :suffix => settings.suffix
+      :suffix => settings.suffix,
+      :exclude => settings.exclude
     )
 
+    @edit = !!settings.edit
+
     @paths = paths
     @package = package_class_for(settings.package_type).new(@source)
     # Append dependencies given from settings (-d flag for fpm)
@@ -67,6 +70,7 @@ class FPM::Builder
 
       generate_md5sums
       generate_specfile
+      edit_specfile if @edit
     end
 
     ::Dir.chdir(builddir) do
@@ -129,6 +133,16 @@ class FPM::Builder
     end
   end
 
+  private
+  def edit_specfile
+    editor = ENV['FPM_EDITOR'] || ENV['EDITOR'] || 'vi'
+    system("#{editor} '#{package.specfile(builddir)}'")
+    unless File.size? package.specfile(builddir)
+      puts "Empty specfile.  Aborting."
+      exit 1
+    end
+  end
+
   private
   def generate_md5sums
     md5sums = checksum(paths)

data/lib/fpm/source.rb

@@ -83,9 +83,21 @@ class FPM::Source
         path = File.dirname(path)
       end
     end # paths.each
-    system(*["tar", "-C", chdir, "--owner=root", "--group=root", 
-           "-cf", output, "--no-recursion", *dirs]) if dirs.any?
-    system(*["tar", "-C", chdir,
-           "--owner=root", "--group=root", "-rf", output, *paths])
+
+    excludes = self[:exclude].map { |e| ["--exclude", e] }.flatten
+    # TODO(sissel): To properly implement excludes as regexps, we
+    # will need to find files ourselves. That may be more work
+    # than it is worth. For now, rely on tar's --exclude.
+    dir_tar = ["tar", "-C", chdir, "--owner=root", "--group=root" ] \
+              + excludes \
+              + ["-cf", output, "--no-recursion" ] \
+              + dirs
+    system(*dir_tar) if dirs.any?
+
+    files_tar = [ "tar", "-C", chdir ] \
+                + excludes \
+                + [ "--owner=root", "--group=root", "-rf", output ] \
+                + paths
+    system(*files_tar)
   end # def tar
 end

data/lib/fpm/source/dir.rb

@@ -10,15 +10,21 @@ class FPM::Source::Dir < FPM::Source
     if self[:prefix]
       self[:prefix] = self[:prefix][1..-1] if self[:prefix] =~ /^\//
       # Prefix all files with a path.
-      FileUtils.mkdir_p(self[:prefix])
-      paths.each do |path|
+      ::FileUtils.mkdir_p(self[:prefix])
+      @paths.each do |path|
         # Trim @root (--chdir)
         path = path[@root.size .. -1] if path.start_with?(@root)
 
         # Copy to self[:prefix] (aka --prefix)
-        dest = "#{builddir}/tarbuild/#{self[:prefix]}/#{path}"
-        FileUtils.mkdir_p(dest)
+        if File.directory?(path)
+          dest = "#{builddir}/tarbuild/#{self[:prefix]}/#{path}"
+        else
+          dest = "#{builddir}/tarbuild/#{self[:prefix]}/#{File.dirname(path)}"
+        end
+
+        ::FileUtils.mkdir_p(dest)
         rsync = ["rsync", "-a", path, dest]
+        p rsync
         system(*rsync)
 
         # FileUtils.cp_r is pretty silly about how it copies files in some
@@ -26,10 +32,13 @@ class FPM::Source::Dir < FPM::Source
         # Use rsync instead..
         #FileUtils.cp_r(path, dest)
       end
+
+      # Prefix paths with 'prefix' if necessary.
+      if self[:prefix]
+        @paths = @paths.collect { |p| File.join("/", self[:prefix], p) }
+      end
+
       ::Dir.chdir("#{builddir}/tarbuild") do
-        puts "TAR"
-        puts tar_path
-        puts "#{builddir}/tarbuild"
         system("ls #{builddir}/tarbuild")
         tar(tar_path, ".")
       end
@@ -39,5 +48,5 @@ class FPM::Source::Dir < FPM::Source
 
     # TODO(sissel): Make a helper method.
     system(*["gzip", "-f", tar_path])
-  end
-end
+  end # def make_tarball!
+end # class FPM::Source::Dir

data/lib/fpm/target/rpm.rb

@@ -12,12 +12,17 @@ class FPM::Target::Rpm < FPM::Package
            "--define", "buildroot #{Dir.pwd}/BUILD",
            "--define", "_topdir #{Dir.pwd}",
            "--define", "_sourcedir #{Dir.pwd}",
-           "--define", "_rpmdir #{params[:output]}",
+           "--define", "_rpmdir #{Dir.pwd}/RPMS",
            "#{name}.spec"]
     ret = system(*args)
     if !ret
       raise "rpmbuild failed"
     end
 
+    Dir["#{Dir.pwd}/RPMS/**/*.rpm"].each do |path|
+      # This should only output one rpm, should we verify this?
+      system("mv", path, params[:output])
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling