fpm 0.4.0pre1 → 0.4.0pre2

data/lib/fpm/command.rb

@@ -92,7 +92,7 @@ class FPM::Command < Clamp::Command
   option ["-S", "--package-name-suffix"], "PACKAGE_NAME_SUFFIX",
     "a name suffix to append to package and dependencies."
   option ["-e", "--edit"], :flag,
-    "Edit the package spec before building."
+    "Edit the package spec before building.", :default => false
   option ["-x", "--exclude"], "EXCLUDE_PATTERN",
     "Exclude paths matching pattern (shell wildcard globs valid here)" do |val|
     @exclude_pattern ||= []
@@ -167,6 +167,7 @@ class FPM::Command < Clamp::Command
     @logger = Cabin::Channel.get
     @logger.subscribe(STDOUT)
     @logger.level = :warn
+
     validator = Validator.new(self)
     if !validator.ok?
       validator.messages.each do |message|
@@ -176,7 +177,6 @@ class FPM::Command < Clamp::Command
       @logger.fatal("Fix the above problems, and you'll be rolling packages in no time!")
       return 1
     end
-
     input_class = FPM::Package.types[input_type]
     output_class = FPM::Package.types[output_type]
 
@@ -198,10 +198,11 @@ class FPM::Command < Clamp::Command
         # clamp makes option attributes available as accessor methods
         # do --foo-bar is available as 'foo_bar'
         # make these available as package attributes.
+        attr = "#{attr}?" if !respond_to?(attr)
         input.attributes[attr.to_sym] = send(attr) if respond_to?(attr)
       end
     end
-    
+
     args.each do |arg| 
       input.input(arg) 
     end

data/lib/fpm/package.rb

@@ -1,13 +1,12 @@
-require "fpm/namespace"
-require "fpm/util"
-require "socket" # for Socket.gethostname
-require "cabin"
-require "tmpdir"
+require "fpm/namespace" # local
+require "fpm/util" # local
+require "tmpdir" # stdlib
+require "socket" # stdlib, for Socket.gethostname
+require "shellwords" # stdlib, for Shellwords.escape
+require "cabin" # gem "cabin"
 
 # This class is the parent of all packages.
 # If you want to implement an FPM package type, you'll inherit from this.
-#
-# There are 
 class FPM::Package
   include FPM::Util
   include Cabin::Inspectable
@@ -269,6 +268,17 @@ class FPM::Package
       .gsub("TYPE", type.to_s)
   end # def to_s
 
+  def edit_file(path)
+    editor = ENV['FPM_EDITOR'] || ENV['EDITOR'] || 'vi'
+    @logger.info("Launching editor", :file => path)
+    safesystem("#{editor} #{Shellwords.escape(path)}")
+
+    if File.size(path) == 0
+      raise "Empty file after editing: #{path.inspect}"
+    end
+  end # def edit_file
+
+
   class << self
     # This method is invoked when subclass occurs.
     # 
@@ -332,5 +342,6 @@ class FPM::Package
   public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files)
 
   # Package internal public api
-  public(:cleanup_staging, :cleanup_build, :staging_path, :converted_from)
+  public(:cleanup_staging, :cleanup_build, :staging_path, :converted_from,
+         :edit_file)
 end # class FPM::Package

data/lib/fpm/package/rpm.rb

@@ -108,7 +108,8 @@ class FPM::Package::RPM < FPM::Package
     rpmspec = template("rpm.erb").result(binding)
     specfile = File.join(build_path("SPECS"), "#{name}.spec")
     File.write(specfile, rpmspec)
-    File.write("/tmp/rpm.spec", rpmspec)
+
+    edit_file(specfile) if attributes[:edit?]
 
     args << specfile
     #if defines.empty?

data/templates/rpm.erb

@@ -88,6 +88,13 @@ fi
 <%# Output config files and then regular files. -%>
 <%= config_files.collect { |c| '%config ' + c }.join("\n") -%>
 <%# list only files, not directories? %>
-<%= files.reject { |f| File.directory?(File.join(staging_path, f)) }.collect { |f| "/#{f}" }.join("\n") %>
+<%= 
+  # Reject directories, then prefix files with "/", then make sure
+  # paths with spaces are quoted. I hate rpm so much.
+  files.reject { |f| File.directory?(File.join(staging_path, f)) } \
+    .collect { |f| "/#{f}" } \
+    .collect { |f| f[/\s/] and "\"#{f}\"" or f } \
+    .join("\n") 
+%>
 
 %changelog

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.0pre1
+  version: 0.4.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14920820 !ruby/object:Gem::Requirement
+  requirement: &21926160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14920820
+  version_requirements: *21926160
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &14920320 !ruby/object:Gem::Requirement
+  requirement: &21924700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *14920320
+  version_requirements: *21924700
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &14919820 !ruby/object:Gem::Requirement
+  requirement: &21921940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *14919820
+  version_requirements: *21921940
 - !ruby/object:Gem::Dependency
   name: arr-pm
-  requirement: &14919440 !ruby/object:Gem::Requirement
+  requirement: &23174960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14919440
+  version_requirements: *23174960
 - !ruby/object:Gem::Dependency
   name: rush
-  requirement: &14918980 !ruby/object:Gem::Requirement
+  requirement: &23174500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14918980
+  version_requirements: *23174500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14918560 !ruby/object:Gem::Requirement
+  requirement: &23174080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14918560
+  version_requirements: *23174080
 - !ruby/object:Gem::Dependency
   name: insist
-  requirement: &14918140 !ruby/object:Gem::Requirement
+  requirement: &23173660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14918140
+  version_requirements: *23173660
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!