pkgr 1.5.1 → 1.7.3

data/lib/pkgr/dispatcher.rb

@@ -42,7 +42,7 @@ module Pkgr
         v = (Git.new(path).latest_tag || "").gsub(/^[^\d]+(\d.*)/, '\1')
         # If it's not a Git archive, try to figure out svn revision number
         begin
-          v = `cd #{path.to_s}&&svn info|grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
+          v = `cd #{path.to_s} && svn info 2>/dev/null | grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
         rescue
         end
         v = "0.0.0" if v !~ /^\d/

data/lib/pkgr/distributions/amazon.rb

@@ -1,6 +1,43 @@
 module Pkgr
+
   module Distributions
-    class Amazon < Redhat
+
+    class Amazon < Base
+
+      def release
+        @release[/^[0-9]+/]
+      end
+
+      def runner
+        @runner ||= Runner.new("upstart", "1.5", "initctl")
+      end
+
+      def package_test_command(package)
+        "rpm -qa '#{package}' | grep '#{package}' > /dev/null 2>&1"
+      end
+
+      def package_install_command(packages)
+        "sudo yum -q check-update ; sudo yum install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
+      end
+
+      def installer_dependencies
+        super.push("which").uniq
+      end
+
+      def fpm_command(build_dir)
+        AmazonFpmCommand.new(self, build_dir).command
+      end
+
+      class AmazonFpmCommand < FpmCommand
+        def args
+          list = super
+          list << "-t" << "rpm"
+          list
+        end
+      end
+
     end
+
   end
+
 end

data/lib/pkgr/distributions/base.rb

@@ -30,7 +30,8 @@ module Pkgr
       def target
         {
           "centos-6" => "el:6",
-          "centos-7" => "el:7"
+          "centos-7" => "el:7",
+          "centos-8" => "el:8"
         }.fetch(slug, slug.sub("-", ":"))
       end
 
@@ -76,12 +77,10 @@ module Pkgr
 
       # Returns a list of Buildpack objects
       def buildpacks
-        custom_buildpack_uri = config.buildpack
-        if custom_buildpack_uri
-          uuid = Digest::SHA1.hexdigest(custom_buildpack_uri)
-          [Buildpack.new(custom_buildpack_uri, :custom, config.env)]
+        if config.buildpacks
+          [:custom, config.buildpacks.map { |url| Buildpack.new(url, :custom, config.env) }]
         else
-          load_buildpack_list
+          [:builtin, load_buildpack_list]
         end
       end # def buildpacks
 
@@ -101,16 +100,17 @@ module Pkgr
         app_name = config.name
         list = []
 
-        # directories
-        [
-          "usr/bin",
+        directories = [
           config.home.gsub(/^\//, ""),
           "etc/#{app_name}/conf.d",
           "etc/default",
           "var/log/#{app_name}",
           "var/db/#{app_name}",
           "usr/share/#{app_name}"
-        ].each{|dir| list.push Templates::DirTemplate.new(dir) }
+        ]
+
+        directories << "usr/bin" if config.cli?
+        directories.each{|dir| list.push Templates::DirTemplate.new(dir) }
 
         list.push Templates::FileTemplate.new("etc/default/#{app_name}", data_file("environment", "default.erb"))
         list.push Templates::FileTemplate.new("etc/logrotate.d/#{app_name}", data_file("logrotate", "logrotate.erb"))
@@ -195,3 +195,4 @@ end # module Pkgr
 require 'pkgr/distributions/debian'
 require 'pkgr/distributions/fedora'
 require 'pkgr/distributions/sles'
+require 'pkgr/distributions/amazon'

data/lib/pkgr/distributions/debian.rb

@@ -14,7 +14,7 @@ module Pkgr
 
       def runner
         @runner ||= case release
-        when /^8/
+        when /^8/, /^9/, /^10/
           Runner.new("systemd", "default", "systemctl")
         else
           Runner.new("sysv", "lsb-3.1", "update-rc.d")

data/lib/pkgr/distributions/redhat.rb

@@ -24,5 +24,3 @@ module Pkgr
     end
   end
 end
-
-require 'pkgr/distributions/amazon'

data/lib/pkgr/distributions/ubuntu.rb

@@ -11,10 +11,10 @@ module Pkgr
 
       def runner
         @runner ||= case release
-        when /^16.04/
-          Runner.new("systemd", "default", "systemctl")
-        else
+        when /^12.04/, /^14.04/
           Runner.new("upstart", "1.5", "initctl")
+        else
+          Runner.new("systemd", "default", "systemctl")
         end
       end
 

data/lib/pkgr/env.rb

@@ -1,13 +1,20 @@
+require 'pkgr/env_value'
+
 module Pkgr
   class Env
     attr_reader :variables
 
+    def self.from_export(file)
+      new(File.read(file).split("\n").map { |line| line.sub(/^export\s+/, "") })
+    end
+
     def initialize(variables = nil)
       @variables = variables || []
+      @variables.compact!
     end
 
     def to_s
-      to_hash.map {|k, v| " #{k}=#{v}" }.join
+      to_hash.map{|k, v| [k, v.quote].join("=")}.join(" ")
     end
 
     def present?
@@ -23,13 +30,12 @@ module Pkgr
     end
 
     private
-
     def create_env_hash_from_string
       return {} if variables == []
 
       variables.inject({}) do |h, var|
-        name, value = var.split('=')
-        h[name.strip] = value.strip
+        name, value = var.split('=', 2)
+        h[name.strip] = EnvValue.new(value || "").strip.unquote
         h
       end
     end

data/lib/pkgr/env_value.rb

@@ -0,0 +1,55 @@
+class EnvValue < String
+  def quote(type=:double, count=nil)
+    if Integer === type
+      tmp   = count
+      count = type
+      type  = tmp || :mixed
+    else
+      count ||= 1
+    end
+
+    type = type.to_s unless Integer===type
+
+    case type
+    when "'", 'single', 's', 1
+      f = "'" * count
+      b = f
+    when '"', 'double', 'd', 2
+      f = '"' * count
+      b = f
+    when '`', 'back', 'b', -1
+      f = '`' * count
+      b = f
+    when "`'", 'bracket', 'sb'
+      f = "`" * count
+      b = "'" * count
+    when "'\"", 'mixed', "m", Integer
+      c = (count.to_f / 2).to_i
+      f = '"' * c
+      b = f
+      if count % 2 != 0
+        f = "'" + f
+        b = b + "'"
+      end
+    else
+      raise ArgumentError, "unrecognized quote type -- #{type}"
+    end
+    "#{f}#{self}#{b}"
+  end
+
+  def unquote
+    s = self.dup
+
+    case self[0,1]
+    when "'", '"', '`'
+      s[0] = ''
+    end
+
+    case self[-1,1]
+    when "'", '"', '`'
+      s[-1] = ''
+    end
+
+    return s
+  end
+end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.5.1"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 description: Simplify the deployment of your applications by automatically packaging
   your application and its dependencies on multiple platforms.
 email:
@@ -132,9 +132,12 @@ files:
 - data/buildpacks/amazon-2015
 - data/buildpacks/centos-6
 - data/buildpacks/centos-7
+- data/buildpacks/centos-8
+- data/buildpacks/debian-10
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
 - data/buildpacks/debian-8
+- data/buildpacks/debian-9
 - data/buildpacks/fedora-20
 - data/buildpacks/sles-11
 - data/buildpacks/sles-12
@@ -142,6 +145,8 @@ files:
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
 - data/buildpacks/ubuntu-16.04
+- data/buildpacks/ubuntu-18.04
+- data/buildpacks/ubuntu-20.04
 - data/cli/cli.sh.erb
 - data/dependencies/amazon.yml
 - data/dependencies/centos.yml
@@ -185,6 +190,7 @@ files:
 - lib/pkgr/distributions/sles.rb
 - lib/pkgr/distributions/ubuntu.rb
 - lib/pkgr/env.rb
+- lib/pkgr/env_value.rb
 - lib/pkgr/fpm_command.rb
 - lib/pkgr/git.rb
 - lib/pkgr/installer.rb
@@ -205,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,9 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Package any Ruby, NodeJS or Go app as a deb or rpm package
 test_files: []
-has_rdoc: