fpm-cookery 0.16.1 → 0.16.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.16.2 (2013-10-19)
+* Add support for submodules in git provider. (narkisr / #50)
+* Set a default maintainer.
+* Fix problems with setting epoch. (#51)
+
 # v0.16.1 (2013-09-26)
 * Unbreak package building with broken symlinks.
 * Do not fail if git is not installed.

data/lib/fpm/cookery/package/maintainer.rb

@@ -1,11 +1,12 @@
 require 'fpm/cookery/shellout'
+require 'socket'
 
 module FPM
   module Cookery
     module Package
       class Maintainer < Struct.new(:recipe, :config)
         def maintainer
-          config_maintainer || recipe_maintainer || git_maintainer
+          config_maintainer || recipe_maintainer || git_maintainer || default_maintainer
         end
 
         def to_s
@@ -37,6 +38,10 @@ module FPM
         def git_config(key)
           FPM::Cookery::Shellout.git_config_get(key)
         end
+
+        def default_maintainer
+          "<#{ENV['USER']}@#{Socket.gethostname}>"
+        end
       end
     end
   end

data/lib/fpm/cookery/package/package.rb

@@ -94,6 +94,10 @@ module FPM
         def vendor=(value)
           fpm.vendor = value
         end
+
+        def epoch=(value)
+          fpm.epoch = value
+        end
       end
     end
   end

data/lib/fpm/cookery/path.rb

@@ -62,6 +62,9 @@ module FPM
         raise "#{src} does not exist" unless File.symlink? src or File.exist? src
 
         mkpath
+
+        # We used to use :preserve => true here, but that broke package
+        # building when the file tree contains broken symlinks.
         FileUtils.cp_r src, dst
 
         # if File.symlink? src

data/lib/fpm/cookery/source_handler/git.rb

@@ -24,6 +24,9 @@ module FPM
             Dir.chdir(cachedir) do
               git('clone', url, local_path)
             end
+            Dir.chdir(local_path) do
+              git('submodule', 'update', '--init') if options[:submodule]
+            end
           end
 
           local_path
@@ -49,6 +52,10 @@ module FPM
 
             # Trailing '/' is important! (see git-checkout-index(1))
             git('checkout-index', '-a', '-f', "--prefix=#{extracted_source}/")
+
+            if options[:submodule]
+              git('submodule', 'foreach', "mkdir -p #{extracted_source}/$path && cp -r . #{extracted_source}/$path")
+            end
           end
 
           extracted_source

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.16.1'
+    VERSION = '0.16.2'
   end
 end

data/spec/package_maintainer_spec.rb

@@ -10,8 +10,10 @@ describe 'Maintainer' do
 
   let(:maintainer) { klass.new(recipe, config) }
 
-  def with_shellout_stub(&spec)
+  def with_shellout_stub(opts = {}, &spec)
     callable = lambda do |key|
+      return if opts[:nil]
+
       case key
       when 'user.name'
         'John Doe'
@@ -25,6 +27,16 @@ describe 'Maintainer' do
     FPM::Cookery::Shellout.stub(:git_config_get, callable, &spec)
   end
 
+  def with_env_stub(env)
+    old_env = ENV.to_hash
+    env.each do |key, value|
+      ENV[key] = value
+    end
+    yield
+  ensure
+    ENV.replace(old_env)
+  end
+
   describe '#to_s' do
     context 'with maintainer set in recipe' do
       it 'returns the recipe maintainer' do
@@ -63,7 +75,18 @@ describe 'Maintainer' do
           maintainer.to_s.must_equal 'John Doe <john@example.com>'
         end
       end
+    end
 
+    context 'without valid git data' do
+      it 'returns a default maintainer' do
+        Socket.stub(:gethostname, lambda { 'hostname' }) do
+          with_shellout_stub(:nil => true) do
+            with_env_stub('USER' => 'john') do
+              maintainer.to_s.must_equal '<john@hostname>'
+            end
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1095322893557635482
+      hash: 2714022872265180185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1095322893557635482
+      hash: 2714022872265180185
 requirements: []
 rubyforge_project: fpm-cookery
 rubygems_version: 1.8.25