fpm-cookery 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db5b71e180868ebd32db10eb630c9d0a24f975d
-  data.tar.gz: de82341b062459e515d836d76eec7fb6fe30b926
+  metadata.gz: 0a665d466e70afc2e4c508512b2ba36cceac7337
+  data.tar.gz: 48dab70d5d15219594323fa6191054322d988eae
 SHA512:
-  metadata.gz: 298216d99ecf3533e188f31114c40230f90c22e5476bc57faa270467f0d4439f940b6b41624991257d8c2b99bc3b6b13454566c9314f44fcf35c39a14231caa2
-  data.tar.gz: e65f6b0a111d725c03c0093be43fa39c98b7dd664849189280051f0f945c47135f441ee8b60186fc4ff01405b1e41d6b2f16e2017868c6ed72441e61e4fc699f
+  metadata.gz: 46abd44a9cb99b4bec920d415310421e34354502c9826d05feee09d3adde552c2b9c10acb2b1b6017a57294eb8672ee5f73764dfec3c7cf0778c37c179b4340c
+  data.tar.gz: 2421b226b5b365a9ea1a0046c3a714f8826c24f07d21f89bbebc27739e8720358d5ed3d335f76b5f61b544a39d87b16d83ca2614869abea974b9b777cbf6f24d

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.1
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.28.0 (2015-07-10)
+* Add :extract option to git source handler.
+  Using ":extract => :clone" with a :git source handler will clone the
+  repository into the build directory.
+* Ignore more relative dependencies in dependency inspector. (sewhyte / #111)
+* Add support for extracting tar.xz files. (djhaskin987 / #109)
+
 # v0.27.0 (2015-04-02)
 * Make default prefix configurable. (#104)
 * Unbreak running on Ruby 2.2. (#105)

data/lib/fpm/cookery/dependency_inspector.rb

@@ -87,8 +87,8 @@ module FPM
           return false
         end
 
-        # We can't handle >=, <<, >>, <=
-        if package =~ />=|<<|>>|<=/
+        # We can't handle >=, <<, >>, <=, <, >
+        if package =~ />=|<<|>>|<=|<|>/
           Log.warn "Required package '#{package}' has a relative version requirement; not attempting to find/install a package to satisfy"
           return false
         end

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

@@ -23,7 +23,7 @@ module FPM
         def extract(config = {})
           Dir.chdir(builddir) do
             case local_path.extname
-            when '.bz2', '.gz', '.tgz'
+            when '.bz2', '.gz', '.tgz', '.xz'
               safesystem('tar', 'xf', local_path)
             when '.shar', '.bin'
               File.chmod(0755, local_path)

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

@@ -50,11 +50,21 @@ module FPM
               extracted_source << '-HEAD'
             end
 
-            # 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")
+            case options.fetch(:extract, :default).to_s.to_sym
+            when :clone
+              if File.exist?(extracted_source)
+                Log.info("Source directory has already been cloned into #{extracted_source}")
+              else
+                git('clone', '-l', '--recurse-submodules', Dir.pwd, extracted_source)
+              end
+            else
+              # 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
           end
 

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.27.0'
+    VERSION = '0.28.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.