fpm-cookery 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7f46e1eb70773b5bfacf698d04a89225eb95ed
-  data.tar.gz: 12121c4b25f7a217724da9a8ec040aba3411e576
+  metadata.gz: bf8725d7f5c012b6be0b89abc7209dffbf02be84
+  data.tar.gz: 1dca9003a4f4100cb5e09e139845a3d0ffdfc506
 SHA512:
-  metadata.gz: d527a0a19a001c6e1efcbc2638727ac9f8eab6e389c693bc3efca07f5438757283f709e10621f986e7ad929cf4345b2f52835898703c7a13cf4be4c029b90b6a
-  data.tar.gz: eb924a9ed4ccc11fcd2e8850de9c95e1c9cd2c2d30926278419ba8cd99814c27cc4ba6ca5d0230cb3bf10135735f143331478e8a00f8331460b190782b322a6a
+  metadata.gz: a15c22968d8e574370a13b09a8b4609d6fc6faf5430b5f618b15d8a7c7821624d994bd2f3405acd298489b165372e5b5943100977a3611cf64b96899334bbbe4
+  data.tar.gz: 267f5de36d79f2bb3b52e038cada34086c2e88b8ae729074ed93866d8e9988d8c6826b8079ed0ca3c78a31bf2204416aac0c47a12d70a8ffdc8eaefa3dd5552a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.21.0 (2014-04-07)
+* Unbreak rpm packages by reverting the `%files` change from #67.
+* Remove default revision. (smasset / #76)
+  __WARNING__: This changes the default package names and metadata!
+* Add support for python/pypi packages. (Mic92 / #73, smasset / #78)
+
 # v0.20.1 (2014-03-14)
 * Unbreak omnibus and chain packagers. (#69)
 

data/README.md

@@ -1,5 +1,7 @@
 # fpm-cookery - For building software
 
+[![Build Status](https://travis-ci.org/bernd/fpm-cookery.svg)](https://travis-ci.org/bernd/fpm-cookery)
+
 A tool for building software packages with
 [fpm](https://github.com/jordansissel/fpm).
 

data/fpm-cookery.gemspec

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

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

@@ -33,7 +33,6 @@ module FPM
           @fpm.attributes[:rpm_group] = 'root'
           @fpm.attributes[:rpm_defattrfile] = '-'
           @fpm.attributes[:rpm_defattrdir] = '-'
-          @fpm.attributes[:rpm_auto_add_directories?] = true
 
           # TODO replace remove_excluded_files() in packager with this.
           @fpm.attributes[:excludes] = []

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

@@ -0,0 +1,25 @@
+require 'fpm/package/python'
+require 'fpm/cookery/package/package'
+
+module FPM
+  module Cookery
+    module Package
+      class Python < FPM::Cookery::Package::Package
+        def fpm_object
+          FPM::Package::Python.new
+        end
+
+        def package_setup
+          fpm.version = recipe.version
+
+          fpm.attributes[:python_fix_name?] = true
+          fpm.attributes[:python_fix_dependencies?] = true
+        end
+
+        def package_input
+          fpm.input(recipe.name)
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,10 @@ module FPM
       # * https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
       # * https://fedoraproject.org/wiki/Packaging:NamingGuidelines?rd=Packaging/NamingGuidelines#Package_Versioning
       class Version
+        REVISION_DELIMITER = {
+          :default => '-'
+        }
+
         VENDOR_DELIMITER = {
           :deb     => '+',
           :rpm     => '.',
@@ -26,16 +30,19 @@ module FPM
           @config[:vendor] || @recipe.vendor
         end
 
+        def revision_delimiter
+          REVISION_DELIMITER[:default]
+        end
+
         def vendor_delimiter
           VENDOR_DELIMITER[@target.to_sym] || VENDOR_DELIMITER[:default]
         end
 
         def to_s
-          if vendor
-            "#{version}-#{revision}#{vendor_delimiter}#{vendor}"
-          else
-            "#{version}-#{revision}"
-          end
+          s_revision = revision ? "#{revision_delimiter}#{revision}" : ""
+          s_vendor = vendor ? "#{vendor_delimiter}#{vendor}" : ""
+
+          "#{version}#{s_revision}#{s_vendor}"
         end
         alias_method :to_str, :to_s
 

data/lib/fpm/cookery/recipe.rb

@@ -8,6 +8,7 @@ require 'fpm/cookery/path_helper'
 require 'fpm/cookery/package/dir'
 require 'fpm/cookery/package/gem'
 require 'fpm/cookery/package/npm'
+require 'fpm/cookery/package/python'
 
 module FPM
   module Cookery
@@ -85,9 +86,6 @@ module FPM
         @tmp_root = @config.tmp_root ? Path.new(@config.tmp_root) : @workdir
         @pkgdir = @config.pkg_dir && Path.new(@config.pkg_dir)
         @cachedir = @config.cache_dir && Path.new(@config.cache_dir)
-
-        # Set some defaults.
-        revision || self.class.revision(1)
       end
 
       def workdir=(value)  @workdir  = Path.new(value) end
@@ -161,5 +159,11 @@ module FPM
         FPM::Cookery::Package::NPM.new(self, config)
       end
     end
+
+    class PythonRecipe < BaseRecipe
+      def input(config)
+        FPM::Cookery::Package::Python.new(self, config)
+      end
+    end
   end
 end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.20.1'
+    VERSION = '0.21.0'
   end
 end

data/recipes/fpm-cookery-gem/fpm.rb

@@ -1,6 +1,6 @@
 class FpmRubyGem < FPM::Cookery::RubyGemRecipe
   name    "fpm"
-  version "0.4.39"
+  version "1.0.2"
 
   chain_package true
   chain_recipes "json", "cabin", "backports", "arr-pm", "clamp", "childprocess", "ftw"

data/recipes/fpm-cookery-gem/recipe.rb

@@ -1,7 +1,7 @@
 class FpmCookeryRubyGem < FPM::Cookery::RubyGemRecipe
   name    "fpm-cookery"
-  version "0.15.0"
+  version "0.20.1"
 
   chain_package true
-  chain_recipes "fpm", "facter", "puppet", "addressable"
+  chain_recipes "fpm", "facter", "puppet", "addressable", "systemu"
 end

data/recipes/fpm-cookery-gem/systemu.rb

@@ -0,0 +1,4 @@
+class RgenRubyGem < FPM::Cookery::RubyGemRecipe
+  name    "systemu"
+  version "2.6.4"
+end

data/recipes/python-requests/recipe.rb

@@ -0,0 +1,7 @@
+class PythonRequests < FPM::Cookery::PythonRecipe
+  homepage "http://python-requests.org"
+  name "requests"
+  build_depends ["python-setuptools"]
+  depends ["python"]
+  version "2.2.1"
+end

data/recipes/python-test/recipe.rb

@@ -0,0 +1,4 @@
+class MinitestPython < FPM::Cookery::PythonRecipe
+  name    "minitest"
+  version "1.1.0"
+end

data/spec/package_spec.rb

@@ -148,10 +148,6 @@ describe 'Package' do
       it 'sets excludes' do
         expect(attributes[:excludes]).to eq([])
       end
-
-      it 'sets rpm_auto_add_directories?' do
-        expect(attributes[:rpm_auto_add_directories?]).to eq(true)
-      end
     end
 
     it 'calls the package_setup method' do

data/spec/recipe_spec.rb

@@ -118,8 +118,8 @@ describe "Recipe" do
       check_attribute(:revision, '12')
     end
 
-    it "sets a default revision of 1" do
-      expect(recipe.revision).to eq(1)
+    it "does not set a default revision" do
+      expect(recipe.revision).to eq(nil)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ files:
 - lib/fpm/cookery/package/maintainer.rb
 - lib/fpm/cookery/package/npm.rb
 - lib/fpm/cookery/package/package.rb
+- lib/fpm/cookery/package/python.rb
 - lib/fpm/cookery/package/version.rb
 - lib/fpm/cookery/packager.rb
 - lib/fpm/cookery/path.rb
@@ -184,6 +185,7 @@ files:
 - recipes/fpm-cookery-gem/puppet.rb
 - recipes/fpm-cookery-gem/recipe.rb
 - recipes/fpm-cookery-gem/rgen.rb
+- recipes/fpm-cookery-gem/systemu.rb
 - recipes/fpm-cookery/fpm-cook.bin
 - recipes/fpm-cookery/recipe.rb
 - recipes/fpm-cookery/ruby.rb
@@ -194,6 +196,8 @@ files:
 - recipes/omnibustest/recipe.rb
 - recipes/omnibustest/ruby.rb
 - recipes/open4/recipe.rb
+- recipes/python-requests/recipe.rb
+- recipes/python-test/recipe.rb
 - recipes/redis/recipe.rb
 - recipes/redis/redis-server.init.d
 - spec/config_spec.rb