fpm-cookery 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8dcc176b33a7c7e5528cc48f2cca03f9df91ac
-  data.tar.gz: 95f2469915db560eb6e658cafb42769c1f11acf8
+  metadata.gz: 2db5b71e180868ebd32db10eb630c9d0a24f975d
+  data.tar.gz: de82341b062459e515d836d76eec7fb6fe30b926
 SHA512:
-  metadata.gz: 14585fd542f177e7a08367979698a6c9f39aa1cda129e79a543e07cb0e7640cc3a7d7c9e326a81d728c3ff13dddf0bb7d7a8726d0d574f79141942fc359e9682
-  data.tar.gz: 23bae9ba992f8c2f1049435e6b4bcc9da0da01c794779d5cfb661234d83713f1d155178871b743472dc697e2dfbd5ed06458cb459ea265ce6720ba51a18b6769
+  metadata.gz: 298216d99ecf3533e188f31114c40230f90c22e5476bc57faa270467f0d4439f940b6b41624991257d8c2b99bc3b6b13454566c9314f44fcf35c39a14231caa2
+  data.tar.gz: e65f6b0a111d725c03c0093be43fa39c98b7dd664849189280051f0f945c47135f441ee8b60186fc4ff01405b1e41d6b2f16e2017868c6ed72441e61e4fc699f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.27.0 (2015-04-02)
+* Make default prefix configurable. (#104)
+* Unbreak running on Ruby 2.2. (#105)
+* Fix Puppet dependecy. (#105)
+
 # v0.26.1 (2015-02-22)
 * Revert "Avoid using git ls-files in gemspec".
 

data/fpm-cookery.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fpm", "~> 1.1"
   s.add_runtime_dependency "facter"
-  s.add_runtime_dependency "puppet", ">= 3.4.3"
+  s.add_runtime_dependency "puppet", "~> 3.4"
   s.add_runtime_dependency "addressable"
   s.add_runtime_dependency "systemu"
 end

data/lib/fpm/cookery/dependency_inspector.rb

@@ -1,17 +1,24 @@
-require 'puppet'
-require 'puppet/resource'
-require 'puppet/transaction/report'
 require 'fpm/cookery/facts'
 require 'fpm/cookery/log'
 
-# Init Puppet before using it
-Puppet.initialize_settings
+begin
+  require 'puppet'
+  require 'puppet/resource'
+  require 'puppet/transaction/report'
+
+  # Init Puppet before using it
+  Puppet.initialize_settings
+rescue Exception
+end
 
 module FPM
   module Cookery
     class DependencyInspector
-
       def self.verify!(depends, build_depends)
+        unless defined?(Puppet::Resource)
+          Log.warn "Unable to load Puppet. Automatic dependency installation disabled."
+          return
+        end
 
         Log.info "Verifying build_depends and depends with Puppet"
 

data/lib/fpm/cookery/path_helper.rb

@@ -15,7 +15,7 @@ module FPM
 
       # Most of the path helper stuff comes from brew2deb and homebrew.
       def prefix(path = nil)
-        current_pathname_for('usr')/path
+        current_pathname_for(default_prefix || '/usr')/path
       end
 
       def etc(path = nil)
@@ -70,6 +70,8 @@ module FPM
 
       private
       def current_pathname_for(dir)
+        dir.gsub!(%r{^/}, '') if dir
+
         if omnibus_installing?
           Path.new("/#{dir}")
         else

data/lib/fpm/cookery/recipe.rb

@@ -71,7 +71,8 @@ module FPM
       attr_rw :arch, :description, :homepage, :maintainer, :md5, :name,
               :revision, :section, :sha1, :sha256, :spec, :vendor, :version,
               :pre_install, :post_install, :pre_uninstall, :post_uninstall,
-              :license, :omnibus_package, :omnibus_dir, :chain_package
+              :license, :omnibus_package, :omnibus_dir, :chain_package,
+              :default_prefix
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
                    :exclude, :patches, :provides, :replaces, :omnibus_recipes,

data/lib/fpm/cookery/version.rb

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

data/spec/path_helper_spec.rb

@@ -6,6 +6,7 @@ describe "PathHelper" do
     Class.new {
       include FPM::Cookery::PathHelper
 
+      def default_prefix; '/usr' end
       def destdir; FPM::Cookery::Path.new('/tmp/dest') end
     }.new
   end

data/spec/recipe_spec.rb

@@ -193,6 +193,12 @@ describe "Recipe" do
     end
   end
 
+  describe "#default_prefix" do
+    it "can be set" do
+      check_attribute(:default_prefix, '/usr/local')
+    end
+  end
+
   def self.spec_recipe_attribute_list(name, list)
     class_eval %Q{
       describe "##{name}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,16 +70,16 @@ dependencies:
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement