fpm-cookery 0.6.0 → 0.7.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.7.0 (2011-11-26)
+* Add hg (mercurial) source handler.
+* Fix tags fetchting for the git source handler.
+
 # v0.6.0 (2011-11-19)
 * Add a logging/output system.
 * Improve extracted source detection for the curl and svn source handler.

data/lib/fpm/cookery/source_handler.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'fpm/cookery/source_handler/curl'
 require 'fpm/cookery/source_handler/svn'
 require 'fpm/cookery/source_handler/git'
+require 'fpm/cookery/source_handler/hg'
 require 'fpm/cookery/log'
 
 module FPM

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

@@ -12,6 +12,7 @@ module FPM
           if local_path.exist?
             Dir.chdir(local_path) do
               git('fetch', url)
+              git('fetch', '--tags', url)
             end
           else
             Dir.chdir(cachedir) do
@@ -49,7 +50,7 @@ module FPM
 
         private
         def git(command, *args)
-          #Log.debug "git #{command} #{args.join(' ')}"
+          Log.debug "git #{command} #{args.join(' ')}"
           safesystem('git', command, *args)
         end
       end

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

@@ -0,0 +1,50 @@
+require 'fpm/cookery/source_handler/template'
+require 'fpm/cookery/log'
+
+module FPM
+  module Cookery
+    class SourceHandler
+      class Hg < FPM::Cookery::SourceHandler::Template
+        CHECKSUM = false
+        NAME = :hg
+
+        def fetch
+          if local_path.exist?
+            Dir.chdir(local_path) do
+              hg('pull')
+              hg('update')
+            end
+          else
+            Dir.chdir(cachedir) do
+              hg('clone', url, local_path)
+            end
+          end
+
+          local_path
+        end
+
+        def extract
+          src = (builddir/local_path.basename('.hg').to_s).to_s
+
+          Dir.chdir(local_path) do
+            if options[:rev]
+              src << "-#{options[:rev]}"
+              hg('archive', '-y', '-r', options[:rev], '-t', 'files', src)
+            else
+              src << '-tip'
+              hg('archive', '-y', '-t', 'files', src)
+            end
+          end
+
+          src
+        end
+
+        private
+        def hg(command, *args)
+          Log.debug "hg #{command} #{args.join(' ')}"
+          safesystem('hg', command, *args)
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000 Z
+date: 2011-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &82971890 !ruby/object:Gem::Requirement
+  requirement: &81673760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82971890
+  version_requirements: *81673760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &82971550 !ruby/object:Gem::Requirement
+  requirement: &81673550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82971550
+  version_requirements: *81673550
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82970380 !ruby/object:Gem::Requirement
+  requirement: &81075460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82970380
+  version_requirements: *81075460
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &82969850 !ruby/object:Gem::Requirement
+  requirement: &81075040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82969850
+  version_requirements: *81075040
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &82968920 !ruby/object:Gem::Requirement
+  requirement: &81074500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82968920
+  version_requirements: *81074500
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -98,6 +98,7 @@ files:
 - lib/fpm/cookery/source_handler.rb
 - lib/fpm/cookery/source_handler/curl.rb
 - lib/fpm/cookery/source_handler/git.rb
+- lib/fpm/cookery/source_handler/hg.rb
 - lib/fpm/cookery/source_handler/svn.rb
 - lib/fpm/cookery/source_handler/template.rb
 - lib/fpm/cookery/source_integrity_check.rb