fpm 0.2.6 → 0.2.7

data/bin/fpm

@@ -14,8 +14,6 @@ def main(args)
   settings.exclude = []
 
   opts = OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} [options]"
-    
     # TODO(sissel): Maybe this should be '-o OUTPUT' ?
     opts.on("-p PACKAGEFILE", "--package PACKAGEFILE",
             "The package file to manage") do |path|
@@ -83,6 +81,24 @@ def main(args)
 
   opts.parse!(args)
 
+  ok = true
+  if settings.package_type.nil?
+    $stderr.puts "Missing package target type (no -t flag?)"
+    ok = false
+  end
+
+  if settings.source_type.nil?
+    $stderr.puts "Missing package source type (no -s flag?)"
+    ok = false
+  end
+
+  if !ok
+    $stderr.puts "There were errors; see above."
+    $stderr.puts 
+    $stderr.puts opts.help
+    return 1
+  end
+
   builder = FPM::Builder.new(settings, args)
   builder.assemble!
   puts "Created #{builder.output}"

data/lib/fpm/package.rb

@@ -45,7 +45,9 @@ class FPM::Package
     @source = source
 
     @name = source[:name] # || fail
-    @version = source[:version] # || fail
+
+    # Default version is 1.0 in case nobody told us a specific version.
+    @version = source[:version] || "1.0"
 
     @dependencies = source[:dependencies] || []
     # Iteration can be nil. If nil, the fpm package implementation is expected

data/lib/fpm/target/deb.rb

@@ -27,5 +27,13 @@ class FPM::Target::Deb < FPM::Package
     system("ar -qc #{params[:output]} debian-binary control.tar.gz data.tar.gz")
 
   end # def build
+
+  def default_output
+    if iteration
+      "#{name}_#{version}-#{iteration}_#{architecture}.#{type}"
+    else
+      "#{name}_#{version}_#{architecture}.#{type}"
+    end
+  end # def default_output
 end # class FPM::Deb
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.2.6
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -64,17 +72,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling