fpm 0.1.9 → 0.2.0

data/lib/fpm/builder.rb

@@ -94,7 +94,7 @@ class FPM::Builder
   # TODO: [Jay] make this better.
   private
   def package_class_for(type)
-    type = FPM::Target::constants.find { |c| c.downcase == type }
+    type = FPM::Target::constants.find { |c| c.downcase.to_s == type }
     if !type
       raise ArgumentError, "unknown package type #{type.inspect}"
     end
@@ -105,7 +105,7 @@ class FPM::Builder
   # TODO: [Jay] make this better.
   private
   def source_class_for(type)
-    type = FPM::Source::constants.find { |c| c.downcase == type }
+    type = FPM::Source::constants.find { |c| c.downcase.to_s == type }
     if !type
       raise ArgumentError, "unknown package type #{type.inspect}"
     end

data/lib/fpm/source.rb

@@ -75,6 +75,7 @@ class FPM::Source
   private
   def tar(output, paths, chdir=".")
     dirs = []
+    paths = [ paths ] if paths.is_a? String
     paths.each do |path|
       while path != "/" and path != "."
         dirs << path if !dirs.include?(path) 

data/lib/fpm/source/gem.rb

@@ -91,7 +91,10 @@ class FPM::Source::Gem < FPM::Source
     args = ["gem", "install", "--quiet", "--no-ri", "--no-rdoc",
        "--install-dir", installdir, "--ignore-dependencies", @paths.first]
     system(*args)
-    tar(tar_path, ".", tmpdir)
+    
+    @paths = [ ::Gem::dir ]
+    tar(tar_path, ".#{@paths.first}", tmpdir)
+    FileUtils.rm_r(tmpdir)
 
     # TODO(sissel): Make a helper method.
     system(*["gzip", "-f", tar_path])

data/lib/fpm/source/npm.rb

@@ -0,0 +1,35 @@
+require "fpm/namespace"
+require "fpm/source"
+require "fileutils"
+
+class FPM::Source::Npm < FPM::Source
+  def get_source(params)
+    @npm = @paths.first
+  end # def get_source
+
+  def download(npm_name, version=nil)
+  end # def download
+
+  def get_metadata
+    # set self[:...] values
+    # :name
+    # :maintainer
+    # :url
+    # :category
+    # :dependencies
+  end # def get_metadata
+
+  def make_tarball!(tar_path, builddir)
+    tmpdir = "#{tar_path}.dir"
+    installdir = "#{tmpdir}/#{::Gem::dir}"
+    ::FileUtils.mkdir_p(installdir)
+    args = ["gem", "install", "--quiet", "--no-ri", "--no-rdoc",
+       "--install-dir", installdir, "--ignore-dependencies", @paths.first]
+    system(*args)
+    tar(tar_path, ".", tmpdir)
+
+    # TODO(sissel): Make a helper method.
+    system(*["gzip", "-f", tar_path])
+  end
+
+end # class FPM::Source::Gem

data/lib/fpm/target/rpm.rb

@@ -14,6 +14,10 @@ class FPM::Target::Rpm < FPM::Package
            "--define", "_sourcedir #{Dir.pwd}",
            "--define", "_rpmdir #{params[:output]}",
            "#{name}.spec"]
-    system(*args)
+    ret = system(*args)
+    if !ret
+      raise "rpmbuild failed"
+    end
+
   end
 end

data/templates/rpm.erb

@@ -12,8 +12,22 @@ License: <%= @license %>
 Source0:  %{_sourcedir}/data.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-<% if @dependencies && !@dependencies.empty? %>
-Requires: <%= @dependencies.join(", ") %>
+<% if !dependencies.empty? %>
+<%
+  properdeps = dependencies.collect do |d|
+    # Convert gem ~> X.Y.Z to '>= X.Y.Z' and < X.Y+1.0
+    if d =~ /\~>/
+      name, version = d.gsub(/[()~>]/, "").split(/ +/)[0..1]
+      nextversion = version.split(".").collect { |v| v.to_i }
+      nextversion[1] += 1
+      nextversion[2] = 0 
+      nextversion = nextversion.join(".")
+      ["#{name} >= #{version}", "#{name} < #{nextversion}"]
+    else
+      d
+    end
+  end
+%>Requires: <%= properdeps.join(", ") %>
 <% end %>
 
 %description
@@ -33,9 +47,9 @@ tar -zvxf %SOURCE0
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-<%= @source.paths.join("\n") %>
+<%# Trim leading '.' from paths if they are './blah...' %>
+<%= @source.paths.collect { |p| p.gsub(/^\.\//, "/") }.join("\n") %>
 
 %changelog

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -08:00
+date: 2011-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - lib/fpm/builder.rb
 - lib/fpm/namespace.rb
 - lib/fpm/source.rb
+- lib/fpm/source/npm.rb
 - lib/fpm/source/dir.rb
 - lib/fpm/source/rpm.rb
 - lib/fpm/source/gem.rb