fpm-cookery 0.17.1 → 0.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWMwNGZiYzMzOWE5Yzk2ODVhZmVhNjUyZWJlNjllNGYzMmRlYmY1Nw==
+    M2M5MjYyNTYzYzM3YjU4Njc4MTk1ZWZlODAxZDYzMTU5YzYwMjY3Yg==
   data.tar.gz: !binary |-
-    ZmI4ZWU1OGUyMjAzNGI2MTk5MTcwODE5N2FjMTA0ZjQ0YTE2ZWQyZg==
+    NWU4YTk1NzJkNzljNzc5MmRlNDBkOGU5YTYwMmVlYTgzYzA3M2JjNQ==
 SHA512:
   metadata.gz: !binary |-
-    MjdlODY3MWUwMjE2M2ZjNjE3MTg5ZDE3NmY5M2M3MzkzN2ExMGRiOTIwZDM5
-    NDY3YTBlMWQ5OGE3ZDk2YmMyNDMxMWFlZmU4N2M3MTc3NTI2OWM0OWE3MzZi
-    MDI4YzE2YTRmNDkwZGNiN2FjNTRmMTFkYzdiN2M3Yjk4OTk5MTU=
+    OTA5YTI3Yjg3NTZhODgyMmZkNGNhZmQ0Mjg3Yjc0ODI4ZmMyZmRhNGYyODdh
+    MDJlN2QyOWQxZWY0ZGNjMmZjNjMxNzdmZjQwYjgzMTA1NTAxMDQ5ZGI4MzBi
+    YjQyZmEwNDJmMWYwMDBhY2U3OWFmYTEwYWJhMTc0ZTM2ZjYwMTM=
   data.tar.gz: !binary |-
-    YmU0ODYxNzdlZTU0MDdmNzlhZjNlYTM4YjE1ZmRjMzA3N2Y0OGQ5NjQ2NTcz
-    YjIzNmU4MGU5NTA3Mjk3NWRmZjI1YWE1MDZmNTkzNGZjNTkxM2IxYWY4MWM1
-    YjgxYjg2NWYxNzY4NDIzNzUyYTkzM2YwMGNiMzU4Mzc5ZjI1YTQ=
+    MjAwMDhmMTQ5YmQzMWQ4ZWJmNDJhNjlkMTBiMzE0ZjBlM2EyN2EwOTdjOGFk
+    MDVmM2JmYzA5ODgyMWU1MWJkNWYxY2U3MDE0MDZjMjAzNTk3NzMyZjA1OWI2
+    ODM1MjY2YTY3NWFiNDcyZTM0MjE0MDJkZmFhMmQ2YzJjZWM4NDc=

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.18.0 (2014-03-01)
+* Do not set a default value for the vendor attribute.
+  __WARNING__: This changes the default package names!
+* Change package name computation regarding version, revision and vendor.
+  __WARNING__: This changes the default package names!
+* Start default revision at 1.
+* Unbreak omnibus packaging. (#64)
+* Add support for npm recipes. (bracki / #65)
+
 # v0.17.1 (2014-02-07)
 * Unbreak deb package building.
 

data/lib/fpm/cookery/omnibus_packager.rb

@@ -8,8 +8,9 @@ module FPM
 
       attr_reader :packager, :recipe
 
-      def initialize(packager)
+      def initialize(packager, config = {})
         @packager = packager
+        @config = config
         @recipe = packager.recipe
         @depends = []
       end

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

@@ -0,0 +1,22 @@
+require 'fpm/package/npm'
+require 'fpm/cookery/package/package'
+
+module FPM
+  module Cookery
+    module Package
+      class NPM < FPM::Cookery::Package::Package
+        def fpm_object
+          FPM::Package::NPM.new
+        end
+
+        def package_setup
+          fpm.version = recipe.version
+        end
+
+        def package_input
+          fpm.input(recipe.name)
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,10 @@
 module FPM
   module Cookery
     module Package
+      # See the following URLs for package naming conventions.
+      #
+      # * 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
         VENDOR_DELIMITER = {
           :deb     => '+',
@@ -28,7 +32,7 @@ module FPM
 
         def to_s
           if vendor
-            "#{version}#{vendor_delimiter}#{vendor}#{revision}"
+            "#{version}-#{revision}#{vendor_delimiter}#{vendor}"
           else
             "#{version}-#{revision}"
           end

data/lib/fpm/cookery/recipe.rb

@@ -7,6 +7,7 @@ require 'fpm/cookery/utils'
 require 'fpm/cookery/path_helper'
 require 'fpm/cookery/package/dir'
 require 'fpm/cookery/package/gem'
+require 'fpm/cookery/package/npm'
 
 module FPM
   module Cookery
@@ -80,8 +81,7 @@ module FPM
         @filename = Path.new(filename).expand_path
 
         # Set some defaults.
-        vendor || self.class.vendor('fpm')
-        revision || self.class.revision(0)
+        revision || self.class.revision(1)
       end
 
       def workdir=(value)  @workdir  = Path.new(value) end
@@ -145,5 +145,11 @@ module FPM
         FPM::Cookery::Package::Gem.new(self, config)
       end
     end
+
+    class NPMRecipe < BaseRecipe
+      def input(config)
+        FPM::Cookery::Package::NPM.new(self, config)
+      end
+    end
   end
 end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.17.1'
+    VERSION = '0.18.0'
   end
 end

data/spec/package_spec.rb

@@ -110,7 +110,7 @@ describe 'Package' do
       let(:attributes) { package.fpm.attributes }
 
       it 'sets deb_compression' do
-        attributes[:deb_compression].must_equal 'gzip'
+        attributes[:deb_compression].must_equal 'gz'
       end
 
       it 'sets deb_user' do

data/spec/package_version_spec.rb

@@ -90,10 +90,22 @@ describe 'Version' do
   describe '#to_s' do
     it 'returns a string representation of the version' do
       recipe.version = '2.1.3'
-      recipe.vendor = 'testing'
+      recipe.vendor = 'testing1'
       recipe.revision = 5
 
-      version.to_s.must_equal '2.1.3+testing5'
+      version.to_s.must_equal '2.1.3-5+testing1'
+    end
+
+    context 'with target rpm' do
+      def target; 'rpm'; end
+
+      it 'returns a string representation of the version' do
+        recipe.version = '2.1.3'
+        recipe.vendor = 'testing1'
+        recipe.revision = 5
+
+        version.to_s.must_equal '2.1.3-5.testing1'
+      end
     end
 
     context 'without vendor' do
@@ -103,6 +115,17 @@ describe 'Version' do
 
         version.to_s.must_equal '2.1.3-5'
       end
+
+      context 'with target rpm' do
+        def target; 'rpm'; end
+
+        it 'returns a string representation of the version' do
+          recipe.version = '2.1.3'
+          recipe.revision = 5
+
+          version.to_s.must_equal '2.1.3-5'
+        end
+      end
     end
   end
 
@@ -114,7 +137,7 @@ describe 'Version' do
       recipe.vendor = 'foo'
       recipe.revision = 1
 
-      version.to_str.must_equal '1.3.foo1'
+      version.to_str.must_equal '1.3-1.foo'
     end
   end
 end

data/spec/recipe_spec.rb

@@ -119,8 +119,8 @@ describe "Recipe" do
       check_attribute(:revision, '12')
     end
 
-    it "sets a default revision" do
-      recipe.revision.must_equal 0
+    it "sets a default revision of 1" do
+      recipe.revision.must_equal 1
     end
   end
 
@@ -141,8 +141,8 @@ describe "Recipe" do
       check_attribute(:vendor, 'myvendor')
     end
 
-    it "sets a default vendor" do
-      recipe.vendor.must_equal 'fpm'
+    it "does not set a default vendor" do
+      recipe.vendor.must_equal nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -143,6 +143,7 @@ files:
 - lib/fpm/cookery/package/dir.rb
 - lib/fpm/cookery/package/gem.rb
 - lib/fpm/cookery/package/maintainer.rb
+- lib/fpm/cookery/package/npm.rb
 - lib/fpm/cookery/package/package.rb
 - lib/fpm/cookery/package/version.rb
 - lib/fpm/cookery/packager.rb
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.