pkgr 1.5.1 → 1.6.0

data/data/dependencies/debian.yml

@@ -5,23 +5,34 @@ default:
   - openssl
   - libxml2
   - libxslt1.1
-  - libreadline5
-  - libreadline6
 debian-6:
   - libssl0.9.8
   - libmysqlclient16
   - libevent-1.4-2
   - libevent-core-1.4-2
   - libevent-extra-1.4-2
+  - libreadline5
+  - libreadline6
 debian-7:
   - libssl1.0.0
   - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
-ubuntu-16.04:
+  - libreadline5
+  - libreadline6
+debian-8:
   - libssl1.0.0
-  - libmysqlclient20
+  - libmysqlclient18
+  - libevent-2.0-5
+  - libevent-core-2.0-5
+  - libevent-extra-2.0-5
+  - libreadline5
+  - libreadline6
+debian-9:
+  - libssl1.0.2
+  - libmariadbclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+  - libreadline7

data/data/dependencies/sles.yml

@@ -12,4 +12,4 @@ sles-11:
   - postgresql
 sles-12:
   - libmysqlclient18
-  - postgresql93
+  - postgresql

data/data/hooks/postinstall.sh

@@ -13,6 +13,7 @@ LOGS="/var/log/${APP_NAME}"
 chown -R ${APP_USER}.${APP_GROUP} ${APP_HOME}
 
 # link app log directory to /var/log/NAME
+mkdir -p ${LOGS}
 rm -rf ${HOME_LOGS}
 ln -fs ${LOGS} ${HOME_LOGS}
 chown -R ${APP_USER}.${APP_GROUP} ${LOGS}
@@ -43,7 +44,7 @@ echo "=============="
 # Call custom postinstall script.
 CUSTOM_POSTINSTALL_SCRIPT="<%= Base64.encode64 File.read(after_install) %>"
 
-tmpfile=$(mktemp)
+<%= "tmpfile=$(#{"TMPDIR=\"#{tmpdir}\" " if tmpdir}mktemp)" %>
 chmod a+x "${tmpfile}"
 echo "${CUSTOM_POSTINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
 

data/data/hooks/postuninstall.sh

@@ -18,7 +18,7 @@ fi
 # Call custom postuninstall script.
 CUSTOM_POSTUNINSTALL_SCRIPT="<%= Base64.encode64 File.read(after_remove) %>"
 
-tmpfile=$(mktemp)
+<%= "tmpfile=$(#{"TMPDIR=\"#{tmpdir}\" " if tmpdir}mktemp)" %>
 chmod a+x "${tmpfile}"
 echo "${CUSTOM_POSTUNINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
 

data/data/hooks/preinstall.sh

@@ -27,7 +27,7 @@ fi
 # https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html
 CUSTOM_PREINSTALL_SCRIPT="<%= Base64.encode64 File.read(before_install) %>"
 
-tmpfile=$(mktemp)
+<%= "tmpfile=$(#{"TMPDIR=\"#{tmpdir}\" " if tmpdir}mktemp)" %>
 chmod a+x "${tmpfile}"
 echo "${CUSTOM_PREINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
 

data/data/hooks/preuninstall.sh

@@ -10,7 +10,7 @@ export APP_HOME="<%= home %>"
 <% if before_remove && File.readable?(before_remove) %>
 CUSTOM_PREUNINSTALL_SCRIPT="<%= Base64.encode64 File.read(before_remove) %>"
 
-tmpfile=$(mktemp)
+<%= "tmpfile=$(#{"TMPDIR=\"#{tmpdir}\" " if tmpdir}mktemp)" %>
 chmod a+x "${tmpfile}"
 echo "${CUSTOM_PREUNINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
 

data/data/init/systemd/default/process.service.erb

@@ -4,7 +4,7 @@ Requires=<%= name %>-<%= process_name %>.service
 After=<%= name %>-<%= process_name %>.service
 
 [Service]
-Environment=PORT=PORT_NUM
+Environment=APP_PROCESS_INDEX=__PROCESS_INDEX__
 ExecStart=/usr/bin/<%= name %> run <%= process_name %>
 Restart=always
 StandardOutput=syslog

data/data/init/sysv/lsb-3.1/process.erb

@@ -14,19 +14,18 @@
 ### END INIT INFO
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-export PORT=PORT_NUM
+export APP_PROCESS_INDEX=__PROCESS_INDEX__
 
 name="<%= name %>"
 process_name="<%= process_name %>"
 user="<%= user %>"
 group="<%= group %>"
-full_process_name="${name}-${process_name}-PROCESS_NUM"
+full_process_name="${name}-${process_name}-${APP_PROCESS_INDEX}"
 pidfile="/var/run/${full_process_name}.pid"
 
-
 start() {
   # Run the program!
-  ${name} run ${process_name} >> /var/log/${name}/${process_name}-PROCESS_NUM.log 2>&1 &
+  ${name} run ${process_name} >> /var/log/${name}/${process_name}-${APP_PROCESS_INDEX}.log 2>&1 &
 
   # Generate the pidfile from here. If we instead made the forked process
   # generate it there will be a race condition between the pidfile writing

data/data/init/upstart/1.5/process.conf.erb

@@ -2,6 +2,6 @@ start on starting <%= name %>-<%= process_name %>
 stop on stopping <%= name %>-<%= process_name %>
 respawn
 
-env PORT=PORT_NUM
+env APP_PROCESS_INDEX=__PROCESS_INDEX__
 
 exec <%= name %> run <%= process_name %> >> /var/log/<%= name %>/<%= process_name %>-PROCESS_NUM.log 2>&1

data/lib/pkgr/builder.rb

@@ -107,20 +107,23 @@ module Pkgr
 
     # Pass the app through the buildpack
     def compile
-      if buildpack_for_app
-        puts "-----> #{buildpack_for_app.banner} app"
+      begin
+        FileUtils.mkdir_p(app_home_dir)
+      rescue Errno::EACCES => e
+        Pkgr.logger.warn "Can't create #{app_home_dir.inspect}, which may be needed by some buildpacks."
+      end
+      FileUtils.mkdir_p(compile_cache_dir)
+      FileUtils.mkdir_p(compile_env_dir)
 
-        begin
-          FileUtils.mkdir_p(app_home_dir)
-        rescue Errno::EACCES => e
-          Pkgr.logger.warn "Can't create #{app_home_dir.inspect}, which may be needed by some buildpacks."
+      if buildpacks_for_app.size > 0
+        run_hook config.before_hook
+
+        buildpacks_for_app.each do |buildpack|
+          puts "-----> #{buildpack.banner} app"
+          buildpack.compile(source_dir, compile_cache_dir, compile_env_dir)
+          buildpack.release(source_dir)
         end
-        FileUtils.mkdir_p(compile_cache_dir)
-        FileUtils.mkdir_p(compile_env_dir)
 
-        run_hook config.before_hook
-        buildpack_for_app.compile(source_dir, compile_cache_dir, compile_env_dir)
-        buildpack_for_app.release(source_dir)
         run_hook config.after_hook
       else
         raise Errors::UnknownAppType, "Can't find a buildpack for your app"
@@ -285,17 +288,23 @@ module Pkgr
       @distribution ||= Distributions.current(config)
     end
 
-    # List of available buildpacks for the current distribution.
-    def buildpacks
-      distribution.buildpacks
-    end
-
-    # Buildpack detected for the app, if any.
-    def buildpack_for_app
+    # Buildpacks detected for the app, if any. If multiple buildpacks are explicitly specified, all are used
+    def buildpacks_for_app
       raise "#{source_dir} does not exist" unless File.directory?(source_dir)
-      @buildpack_for_app ||= buildpacks.find do |buildpack|
-        buildpack.setup(config.edge, config.home)
-        buildpack.detect(source_dir)
+      @buildpacks_for_app ||= begin
+        mode, buildpacks = distribution.buildpacks
+        case mode
+        when :custom
+          buildpacks.find_all do |buildpack|
+            buildpack.setup(config.edge, config.home)
+            buildpack.detect(source_dir)
+          end
+        else
+          [buildpacks.find do |buildpack|
+            buildpack.setup(config.edge, config.home)
+            buildpack.detect(source_dir)
+          end].compact
+        end
       end
     end
 
@@ -307,7 +316,7 @@ module Pkgr
     def run_hook(file)
       return true if file.nil?
 
-      cmd = %{env -i APP_NAME="#{config.name}" PATH="$PATH"#{config.env} bash '#{file}' 2>&1}
+      cmd = %{env -i APP_NAME="#{config.name}" PATH="$PATH" #{config.env} bash '#{file}' 2>&1}
 
       Pkgr.logger.debug "Running hook in #{source_dir}: #{file.inspect}"
       puts "-----> Running hook: #{file.inspect}"

data/lib/pkgr/buildpack.rb

@@ -20,7 +20,7 @@ module Pkgr
       @url, @branch = url.split("#")
       @branch ||= "master"
       @type = type
-      @env = env
+      @env = env || Env.new
     end
 
     def buildpack_cache_dir
@@ -28,7 +28,7 @@ module Pkgr
     end
 
     def detect(path)
-      buildpack_detect = Mixlib::ShellOut.new("#{dir}/bin/detect \"#{path}\"")
+      buildpack_detect = Mixlib::ShellOut.new("env -i #{compound_environment(path)} #{dir}/bin/detect \"#{path}\"")
       buildpack_detect.logger = Pkgr.logger
       buildpack_detect.run_command
       @banner = buildpack_detect.stdout.chomp
@@ -36,7 +36,7 @@ module Pkgr
     end
 
     def compile(path, compile_cache_dir, compile_env_dir)
-      cmd = %{env -i PATH="$PATH"#{env} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
+      cmd = %{env -i #{compound_environment(path)} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
       Pkgr.debug "Running #{cmd.inspect}"
 
       Dir.chdir(path) do
@@ -53,7 +53,7 @@ module Pkgr
     end
 
     def release(path)
-      buildpack_release = Mixlib::ShellOut.new("#{dir}/bin/release \"#{path}\" > #{path}/.release")
+      buildpack_release = Mixlib::ShellOut.new("env -i #{compound_environment(path)} #{dir}/bin/release \"#{path}\" > #{path}/.release")
       buildpack_release.logger = Pkgr.logger
       buildpack_release.run_command
       buildpack_release.exitstatus == 0
@@ -75,7 +75,7 @@ module Pkgr
     def refresh(edge = true)
       return if !edge
       Dir.chdir(dir) do
-        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && ( git reset --hard #{branch} || git reset --hard origin/#{branch} )")
+        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && ( git reset --hard #{branch} || git reset --hard origin/#{branch} ) && chmod -f +x bin/detect && chmod -f +x bin/compile && chmod -f +x bin/release")
         buildpack_refresh.logger = Pkgr.logger
         buildpack_refresh.run_command
         buildpack_refresh.error!
@@ -104,5 +104,17 @@ module Pkgr
         buildpack_replace.error!
       end
     end
+
+  private
+
+    def compound_environment(path)
+      Env.new(['PATH=$PATH']).merge(env).merge(exported_environment(File.join(path, "export")))
+    end
+
+    def exported_environment(path)
+      Env.from_export(path)
+    rescue Errno::ENOENT
+      Env.new
+    end
   end
 end

data/lib/pkgr/cli.rb

@@ -31,7 +31,7 @@ module Pkgr
 
     method_option :buildpack,
       :type => :string,
-      :desc => "Custom buildpack to use"
+      :desc => "Custom buildpack to use. May be a single string or a list."
     method_option :buildpack_list,
       :type => :string,
       :desc => "Specify a file containing a list of buildpacks to use (--buildpack takes precedence if given)"
@@ -54,6 +54,9 @@ module Pkgr
     method_option :homepage,
       :type => :string,
       :desc => "Project homepage"
+    method_option :home,
+      :type => :string,
+      :desc => "Project home"
     method_option :description,
       :type => :string,
       :desc => "Project description"
@@ -111,7 +114,6 @@ module Pkgr
       :desc => "Specific system dependencies that must be present before building"
     method_option :disable_default_dependencies,
       :type => :boolean,
-      :default => false,
       :desc => "Disable default dependencies"
     method_option :host,
       :type => :string,
@@ -152,8 +154,10 @@ module Pkgr
       :desc => "Recursively mark a directory as being owned by the package"
     method_option :disable_cli,
       :type => :boolean,
-      :default => false,
       :desc => "Disable installing CLI"
+    method_option :tmpdir,
+      :type => :string,
+      :desc => 'Set a custom tmpdir for hook scripts to get created in'
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]

data/lib/pkgr/config.rb

@@ -100,6 +100,10 @@ module Pkgr
       @table[:group] || user
     end
 
+    def tmpdir
+      @table[:tmpdir]
+    end
+
     def architecture
       @table[:architecture] || "x86_64"
     end
@@ -124,6 +128,10 @@ module Pkgr
       @table[:env].is_a?(Pkgr::Env) ? @table[:env] : Pkgr::Env.new(@table[:env])
     end
 
+    def buildpacks
+      @table[:buildpack].is_a?(String) ? @table[:buildpack].split(",") : @table[:buildpack]
+    end
+
     def valid?
       @errors = []
       @errors.push("name can't be blank") if name.nil? || name.empty?
@@ -223,6 +231,7 @@ module Pkgr
         "--group \"#{group}\"",
         "--iteration \"#{iteration}\"",
         "--homepage \"#{homepage}\"",
+        "--home \"#{home}\"",
         "--architecture \"#{architecture}\"",
         "--description \"#{description}\"",
         "--maintainer \"#{maintainer}\"",
@@ -251,6 +260,7 @@ module Pkgr
       args.push "--verify" if verify
       args.push "--no-clean" if !clean
       args.push "--no-edge" if !edge
+      args.push "--tmpdir" if !tmpdir
       args
     end
   end

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

@@ -76,12 +76,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 +99,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 +194,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/
           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'