easyfpm 0.1.0.pre → 0.2.0.pre

data/lib/easyfpm/packaging.rb

@@ -118,7 +118,6 @@ class EASYFPM::Packaging
           fpmconf += " --after-remove "+labelhashconf[param]
         when "pkg-iteration"
           fpmconf += " --iteration "+labelhashconf[param]
-          fpmconf += labelhashconf["pkg-suffix"] if labelhashconf.has_key? "pkg-suffix"
         when "pkg-epoch"
           fpmconf += " --epoch "+labelhashconf[param]
         when "pkg-vendor"
@@ -138,9 +137,8 @@ class EASYFPM::Packaging
             fpmconf += " -d '"+pkgdepend+"'"
           end #labelhashconf[param].each
         when "pkg-suffix"
-          #if iteration defines, suffix is with it, else it is like an iteration
-          next if labelhashconf.has_key? "pkg-iteration"
-          fpmconf += " --iteration 1"+labelhashconf[param]
+          #Due to a lack in fpm, the pkg-suffix is use only in package renaming
+          next 
         when "pkg-changelog"
           case packageType
             when "deb","rpm"
@@ -297,9 +295,11 @@ class EASYFPM::Packaging
 
       #Do we have a specific output dir ?
       # there's a bug with fpm and this feature, so easyfpm take it itself for the moment
-      if labelconf.has_key? "pkg-output-dir"
+      if labelconf.has_key? "pkg-output-dir" or labelconf.has_key? "pkg-suffix"
         #Making a new tmpdir for working in
         makingConf["pkg-output-dir"] = Dir.mktmpdir("easyfpm-output-dir")
+        #if pkg-output-dir is not defined, we have to put the result in the current dir
+        labelconf["pkg-output-dir"] = Dir.getwd unless labelconf.has_key? "pkg-output-dir"
       end
 
       #We are ready to generate the fpm command
@@ -308,7 +308,7 @@ class EASYFPM::Packaging
       puts "fpm "+fpmCmdOptions if (@verbose or @debug or @dryrun)
       
       unless @dryrun
-        if makingConf.has_key? "pkg-output-dir"
+        if makingConf.has_key? "pkg-output-dir" 
           #returnCode = system "cd "+makingConf["pkg-output-dir"]+" && fpm "+fpmCmdOptions
           Open3.popen2e("cd "+makingConf["pkg-output-dir"]+" && fpm "+fpmCmdOptions) do |stdin, stdout_err, wait_thr|
             #fpm uses Cabin::channel for logging
@@ -336,32 +336,47 @@ class EASYFPM::Packaging
 
                 #Here we have the pkg-output-dir treatment
                 if message == "Created package" and path
+                  if labelconf.has_key? "pkg-suffix"
+                    #We have to rename the package
+                    case labelconf["pkg-type"]
+                      when "rpm", "deb"
+                        #Suffix has to be fixed before arch and extension
+                        newpathmatch = /^(.+)(\.[^.]+\.[^.]+)$/.match(path)
+                        newpath=newpathmatch[1]+labelconf["pkg-suffix"]+newpathmatch[2]
+                    else
+                      #By default suffix is before extension
+                      newpathmatch = /^(.+)(\.[^.]+)$/.match(path)
+                      newpath=newpathmatch[1]+labelconf["pkg-suffix"]+newpathmatch[2]
+                    end
+                  else
+                    newpath=path
+                  end
                   if File.exists?(makingConf["pkg-output-dir"]+"/"+path)
                     puts (message+" "+makingConf["pkg-output-dir"]+"/"+path)
                     outline=nil
-                    if File.exists?(labelconf["pkg-output-dir"]+"/"+path)
+                    if File.exists?(labelconf["pkg-output-dir"]+"/"+newpath)
                       if labelconf.has_key?("pkg-force") and (labelconf["pkg-force"] == "yes")
                         #Move file
                         if (@verbose or @debug)
-                          FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+path, :force => true, :verbose => true)
+                          FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+newpath, :force => true, :verbose => true)
                         else
-                          FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+path, :force => true)
+                          FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+newpath, :force => true)
                         end #if (@verbose or @debug)
-                        puts "Package moved to #{labelconf["pkg-output-dir"]}/#{path}"
+                        puts "Package moved to #{labelconf["pkg-output-dir"]}/#{newpath}"
                         # We suppress
                       else
-                        warn labelconf["pkg-output-dir"]+"/"+path+" already exists, use '--pkg-force yes' to force copy"
+                        warn labelconf["pkg-output-dir"]+"/"+newpath+" already exists, use '--pkg-force yes' to force copy"
                         returnCode = false
                       end #if labelconf.has_key? "pkg-force" and labelconf["pkg-force"] == "yes"
                     else
                       #Move file
                       if (@verbose or @debug)
-                        FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+path, :verbose => true)
+                        FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+newpath, :verbose => true)
                       else
-                        FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+path)
+                        FileUtils.mv(makingConf["pkg-output-dir"]+"/"+path, labelconf["pkg-output-dir"]+"/"+newpath)
                       end
-                      puts "Package moved to #{labelconf["pkg-output-dir"]}/#{path}"
-                    end #if File.exists?(labelconf["pkg-output-dir"]+"/"+path)
+                      puts "Package moved to #{labelconf["pkg-output-dir"]}/#{newpath}"
+                    end #if File.exists?(labelconf["pkg-output-dir"]+"/"+newpath)
                   end #if File.exists?(makingConf["pkg-output-dir"]+"/"+path)
                 end #message == "Created package" and path
                 #We display the message if not filtered

metadata

@@ -1,76 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easyfpm
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 1
-  - 0
-  - pre
-  version: 0.1.0.pre
+version: !ruby/object:Gem::Version
+  version: 0.2.0.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Erwan SEITE
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-15 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ptools
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fpm
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: fpm
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: unixconfigstyle
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: unixconfigstyle
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-description: "  Simplify packaging with fpm by using config files.\n  The aim is to have 1 config file to create many packages for one script module (deb, rpm).\n  For the moment, the source MUST be a directory, but this tool can manage a changelog format and also mapping files if the module tree is different from the targeted (deployment) tree.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: ! "  Simplify packaging with fpm by using config files.\n  The aim is
+  to have 1 config file to create many packages for one script module (deb, rpm).\n
+  \ For the moment, the source MUST be a directory, but this tool can manage a changelog
+  format and also mapping files if the module tree is different from the targeted
+  (deployment) tree.\n"
 email: wanix.fr@gmail.com
-executables: 
+executables:
 - easyfpm
 - easyfpm-translatecl
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
 - THANKS
@@ -81,16 +80,16 @@ extra_rdoc_files:
 - doc/samples/install_scripts/post-delete.sh
 - doc/samples/install_scripts/pre-delete.sh
 - doc/samples/install_scripts/pre-install.sh
-files: 
+files:
 - lib/easyfpm.rb
-- lib/easyfpm/exceptions.rb
-- lib/easyfpm/pkgchangelog.rb
-- lib/easyfpm/packaging.rb
-- lib/easyfpm/namespace.rb
-- lib/easyfpm/mapping.rb
 - lib/easyfpm/version.rb
 - lib/easyfpm/commandline.rb
+- lib/easyfpm/mapping.rb
+- lib/easyfpm/exceptions.rb
 - lib/easyfpm/configuration.rb
+- lib/easyfpm/packaging.rb
+- lib/easyfpm/pkgchangelog.rb
+- lib/easyfpm/namespace.rb
 - README.md
 - LICENSE
 - THANKS
@@ -103,41 +102,29 @@ files:
 - doc/samples/install_scripts/pre-install.sh
 - bin/easyfpm
 - bin/easyfpm-translatecl
-has_rdoc: true
 homepage: https://github.com/wanix/easyfpm
-licenses: 
+licenses:
 - GPLv2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wrapper for fpm
 test_files: []
-