fpm-cookery 0.4.0 → 0.5.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.5.0 (2011-11-05)
+* Add git source handler.
+
 # v0.4.0 (2011-10-28)
 * Add svn source handler. (lusis)
 * Framework for alternate source handlers. (lusis)

data/README.md

@@ -53,7 +53,7 @@ __fpm-cookery__ is my attempt to build such a tool.
 * Apply custom patches.
 * Dependency checking.
 * Recipe validation.
-* More source types. (git, svn, ...)
+* More source types. (hg, bzr, ...)
 * Progress output and logging.
 * Extend recipe features and build/install helpers.
 * Configuration file. (for stuff like vendor and maintainer)
@@ -132,7 +132,6 @@ The following is an example recipe. I have some more in my recipe collection
 * No recipe validation yet.
 * No dependency validation yet.
 * No support for patches yet.
-* Only simple source/url types (via curl) for now.
 * No real logging output yet.
 * Pretty new and not well tested.
 

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

@@ -0,0 +1,57 @@
+require 'fpm/cookery/source_handler/template'
+
+module FPM
+  module Cookery
+    class SourceHandler
+      class Git < FPM::Cookery::SourceHandler::Template
+        CHECKSUM = false
+        NAME = :git
+
+        def fetch
+          if local_path.exist?
+            Dir.chdir(local_path) do
+              git('fetch', url)
+            end
+          else
+            Dir.chdir(cachedir) do
+              git('clone', url, local_path)
+            end
+          end
+
+          local_path
+        end
+
+        def extract
+          extracted_source = (builddir/local_path.basename('.git').to_s).to_s
+
+          Dir.chdir(local_path) do
+            if options[:sha]
+              git('reset', '--hard', options[:sha])
+              extracted_source << "-#{options[:sha]}"
+            elsif options[:tag]
+              git('checkout', '-f', options[:tag])
+              extracted_source << "-tag-#{options[:tag]}"
+            elsif options[:branch]
+              git('checkout', '-f', "origin/#{options[:branch]}")
+              extracted_source << "-branch-#{options[:branch]}"
+            else
+              git('checkout', '-f', 'origin/HEAD')
+              extracted_source << '-HEAD'
+            end
+
+            # Trailing '/' is important! (see git-checkout-index(1))
+            git('checkout-index', '-a', '-f', "--prefix=#{extracted_source}/")
+          end
+
+          extracted_source
+        end
+
+        private
+        def git(command, *args)
+          #puts "[DEBUG] git #{command} #{args.join(' ')}"
+          safesystem('git', command, *args)
+        end
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module FPM
 
         private
         def svn(url, path)
-          @options.has_key?(:revision) ? revision=@options[:revision] : revision='HEAD'
+          revision = options[:revision] || 'HEAD'
           safesystem('svn', 'export', '--force', '-q', '-r', revision, url, path)
         end
 

data/lib/fpm/cookery/source_handler.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 require 'fpm/cookery/source_handler/curl'
 require 'fpm/cookery/source_handler/svn'
+require 'fpm/cookery/source_handler/git'
 
 module FPM
   module Cookery

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/recipes/redis/recipe.rb

@@ -1,8 +1,15 @@
 class Redis < FPM::Cookery::Recipe
   homepage 'http://redis.io'
-  # different source methods
+
+  # Different source methods.
+  #
   #source   'https://github.com/antirez/redis/trunk', :with => :svn
   #source   'https://github.com/antirez/redis/trunk', :with => :svn, :revision => '2400'
+  #
+  #source   'https://github.com/antirez/redis', :with => :git, :tag => '2.4.2
+  #source   'https://github.com/antirez/redis', :with => :git, :branch => '2.4'
+  #source   'https://github.com/antirez/redis', :with => :git, :sha => '072a905'
+
   source    'http://redis.googlecode.com/files/redis-2.4.2.tar.gz'
   md5      'c4b0b5e4953a11a503cb54cf6b09670e'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000 Z
+date: 2011-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &84112030 !ruby/object:Gem::Requirement
+  requirement: &80020110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84112030
+  version_requirements: *80020110
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &84111800 !ruby/object:Gem::Requirement
+  requirement: &80019860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84111800
+  version_requirements: *80019860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84127950 !ruby/object:Gem::Requirement
+  requirement: &80019630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84127950
+  version_requirements: *80019630
 - !ruby/object:Gem::Dependency
   name: fpm
-  requirement: &84127720 !ruby/object:Gem::Requirement
+  requirement: &80019400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84127720
+  version_requirements: *80019400
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &84127470 !ruby/object:Gem::Requirement
+  requirement: &80019160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84127470
+  version_requirements: *80019160
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -92,6 +92,7 @@ files:
 - lib/fpm/cookery/recipe.rb
 - 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/svn.rb
 - lib/fpm/cookery/source_handler/template.rb
 - lib/fpm/cookery/source_integrity_check.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tool for building software packages with fpm.