pkgr 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9860507ebe18fd497f6cd0c2eafb4b43fa3e84
-  data.tar.gz: d1bc91d07dcab8e62cf382dd6b1317cbe6866065
+  metadata.gz: c4957e699c5faccb2beb397df7d38bbdc4bf0fb9
+  data.tar.gz: 8519e2b2f524e20c44a4df5353551c56f37f8e3f
 SHA512:
-  metadata.gz: 34286f726b3d4dc61931239d8ffd3570ea524ceddcf3b0d5a06635123904b6fc31af1be63b8a5e9a937766da79c888748f4b9eec49b51235905a863ec0cf9700
-  data.tar.gz: 56ea0451c22d005d56852efeb0c87ff231de587e4d833b6658fc10a102372c53098e23b9f0aa89a02af9be14453846d46307ef953537bff3a9d1803d02e05c5d
+  metadata.gz: 11d14b4e33696c5a7dbcafe08f65847a4524f153022829f5b29c37b21f2f8739fda1659b80fd4f0b51050be8a75e4c1028d004ac92304d7f0dbffcf3b80b1fc7
+  data.tar.gz: 99bb15a764f2716e7cddac6e5cd9ce852ff070c8b5237df322e762118110ce5ddf550c09b06057d361682483ff7992226fc2814753c98c9c67f5f0a8e71e23af

data/data/build_dependencies/sles.yml

@@ -0,0 +1,13 @@
+default:
+  - curl
+  - gcc
+  - gcc-c++
+  - kernel-devel
+  - libopenssl-devel
+  - readline-devel
+  - libxml2-devel
+  - libxslt-devel
+  - libevent-devel
+  - postgresql-devel
+  - libmysqlclient-devel
+  - sqlite3-devel

data/data/buildpacks/sles-12

@@ -0,0 +1,2 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#universal-staging,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58

data/data/cli/cli.sh.erb

@@ -24,57 +24,35 @@ usage() {
   echo "  $APP_NAME logs [--tail|-n NUMBER]"
   echo "  $APP_NAME config:get VAR"
   echo "  $APP_NAME config:set VAR=VALUE"
+  echo "  $APP_NAME configure"
   echo "  $APP_NAME reconfigure"
 }
 
+DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
 
-# Returns the type of process manager supported by the current distribution.
-setup_runner() {
-  if [ -f $(_p /etc/debian_version) ]; then
-    case "$(cat $(_p /etc/debian_version))" in
-      wheezy*|squeeze*|jessie*)
-        APP_RUNNER="upstart"
-        ;;
-      *)
-        APP_RUNNER="sysv"
-        SYSV_MANAGER="update-rc.d"
-        ;;
-    esac
-  elif [ -f $(_p /etc/redhat-release) ]; then
-    case "$(cat $(_p /etc/redhat-release))" in
-      CentOS*)
-        APP_RUNNER="upstart"
-        ;;
-      *)
-        APP_RUNNER="sysv"
-        SYSV_MANAGER="chkconfig"
-        ;;
-    esac
-  fi
-}
+. ${DEFAULT_FILE}
+
+for file in $(_p "${APP_HOME}/.profile.d")/*.sh; do
+  # .profile.d scripts assume HOME indicates the path to the app directory
+  if [ -f $file ]; then HOME=${APP_HOME} . $file; fi
+done
+
+if [ "$APP_CLI" != "" ] ; then
+  exec $APP_HOME/bin/$APP_CLI "$@"
+fi
 
-if [ ! 0 -eq ${EUID} ]; then
+if [ `id -u` -ne 0 ]; then
   echo "You must be executing with root privileges to launch commands."
   echo "Either log in as root, use sudo, or add sudo privileges for running ${APP_NAME} with your user."
   exit 1
 fi
 
-setup_runner
-DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
-
 # Source all environment variables for the app. This must be done as
 # privileged user since the config variables are only readable by root.
-. ${DEFAULT_FILE}
-
 for file in $(_p "/etc/${APP_NAME}/conf.d")/*; do
   if [ -f $file ]; then . $file; fi
 done
 
-for file in $(_p "${APP_HOME}/.profile.d")/*.sh; do
-  # .profile.d scripts assume HOME indicates the path to the app directory
-  if [ -f $file ]; then HOME=${APP_HOME} . $file; fi
-done
-
 # Return all the environment variables accessible to the app.
 show_env() {
   env -i ROOT_PATH=${ROOT_PATH} ${0} run env | sort
@@ -97,7 +75,7 @@ tail_logs() {
 
 current_number_of_processes() {
   PROCESS_NAME="$1"
-  if [ "${APP_RUNNER}" = "upstart" ]; then
+  if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
     echo $(ls -rv1 $(_p /etc/init/)${APP_NAME}-${PROCESS_NAME}-*.conf 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)\.conf/\1/g')
   else
     echo $(ls -rv1 $(_p /etc/init.d/)${APP_NAME}-${PROCESS_NAME}-* 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)/\1/g')
@@ -123,19 +101,19 @@ update_port() {
 
 sysv_enable() {
   local name="$1"
-  if [ "$SYSV_MANAGER" = "chkconfig" ] ; then
-    $SYSV_MANAGER "$name" on
-  elif [ "$SYSV_MANAGER" = "update-rc.d" ] ; then
-    $SYSV_MANAGER "$name" defaults
+  if [ "$APP_RUNNER_CLI" = "chkconfig" ] ; then
+    $APP_RUNNER_CLI "$name" on
+  elif [ "$APP_RUNNER_CLI" = "update-rc.d" ] ; then
+    $APP_RUNNER_CLI "$name" defaults
   fi
 }
 
 sysv_disable() {
   local name="$1"
-  if [ "$SYSV_MANAGER" = "chkconfig" ] ; then
-    $SYSV_MANAGER "$name" off
-  elif [ "$SYSV_MANAGER" = "update-rc.d" ] ; then
-    $SYSV_MANAGER -f "$name" remove
+  if [ "$APP_RUNNER_CLI" = "chkconfig" ] ; then
+    $APP_RUNNER_CLI "$name" off
+  elif [ "$APP_RUNNER_CLI" = "update-rc.d" ] ; then
+    $APP_RUNNER_CLI -f "$name" remove
   fi
 }
 
@@ -147,7 +125,7 @@ scale_up() {
 
   echo "Scaling up..."
 
-  if [ "${APP_RUNNER}" = "upstart" ]; then
+  if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
     # copy initd
     cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}") $(_p "/etc/init.d/")
     chmod 0755 $(_p "/etc/init.d/${APP_NAME}")
@@ -165,11 +143,11 @@ scale_up() {
       update_port $(_p "/etc/init/${PROCESS_ID}.conf") "${PROCESS_NAME}" $port $index
 
       # directly call initctl instead of service, otherwise CentOS 6.x does not understand.
-      initctl start "${PROCESS_ID}"
+      $APP_RUNNER_CLI start "${PROCESS_ID}"
     done
 
-    initctl start ${APP_NAME}-${PROCESS_NAME} || true
-    initctl start ${APP_NAME} || true
+    $APP_RUNNER_CLI start ${APP_NAME}-${PROCESS_NAME} || true
+    $APP_RUNNER_CLI start ${APP_NAME} || true
   else
     cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}") $(_p /etc/init.d/)
     chmod a+x $(_p "/etc/init.d/${APP_NAME}")
@@ -204,8 +182,8 @@ scale_down() {
     index=$((${i} + ${NEW_SCALE}))
     PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
 
-    if [ "${APP_RUNNER}" = "upstart" ]; then
-      initctl stop "${PROCESS_ID}"
+    if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
+      $APP_RUNNER_CLI stop "${PROCESS_ID}"
       rm -f $(_p "/etc/init/${PROCESS_ID}.conf")
     else
       $(_p "/etc/init.d/${PROCESS_ID}") stop
@@ -318,14 +296,14 @@ while : ; do
       CONFIG=(${2//=/ })
 
       VAR=${CONFIG[0]:?"Invalid variable name"}
-      VALUE=${CONFIG[1]:?"Invalid value"}
+      VALUE="${2:$((${#VAR} + 1))}"
 
       CONFIG_FILE=$(_p "/etc/${APP_NAME}/conf.d/other")
       touch ${CONFIG_FILE}
 
-      sed -i -r "s/^.*${VAR}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
+      sed -i -r "s/^\s*export\s+${VAR}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
 
-      echo "export ${VAR}=${VALUE}" >> "${CONFIG_FILE}"
+      echo "export ${VAR}=\"${VALUE}\"" >> "${CONFIG_FILE}"
 
       break;;
 

data/data/dependencies/sles.yml

@@ -0,0 +1,10 @@
+default:
+  - openssl
+  - readline
+  - libxml2
+  - libxslt
+  - libevent
+  - postgresql93
+  - libmysqlclient18
+  - sqlite3
+  - shadow

data/data/environment/default.erb

@@ -5,10 +5,14 @@ export APP_SAFE_NAME="<%= safe_name %>"
 export APP_GROUP="<%= group %>"
 export APP_USER="<%= user %>"
 export APP_WIZARDS="<%= wizards.map{|wizard_group| wizard_group.map{|w| w.name}.join("|")}.join(",") %>"
+export APP_RUNNER_TYPE="<%= distribution.runner.type %>"
+export APP_RUNNER_CLI="<%= distribution.runner.cli %>"
 # Legacy addons
 export APP_ADDONS="<%= addons.map{|addon| addon.name}.join(" ") %>"
-export HOME="/home/<%= user %>"
 export PORT=${PORT:=6000}
-<% if runner %>
-export PROCESS_MANAGER="<%= runner.split("-").first %>"
+<% if cli.is_a?(String) %>
+export HOME=${HOME:="/home/<%= user %>"}
+export APP_CLI="<%= cli %>"
+<% else %>
+export HOME="/home/<%= user %>"
 <% end %>

data/data/hooks/preinstall.sh

@@ -8,11 +8,11 @@ export APP_GROUP="<%= group %>"
 export APP_HOME="<%= home %>"
 
 if ! getent passwd "${APP_USER}" > /dev/null; then
-  if [ -f /etc/redhat-release ]; then
+  if [ -f /etc/redhat-release ] || [ -f /etc/SuSE-release ]; then
     if ! getent group "${APP_GROUP}" > /dev/null ; then
       groupadd --system "${APP_GROUP}"
     fi
-    adduser "${APP_USER}" -g "${APP_GROUP}" --system --create-home --shell /bin/bash
+    useradd "${APP_USER}" -g "${APP_GROUP}" --system --create-home --shell /bin/bash
   else
     if ! getent group "${APP_GROUP}" > /dev/null; then
       addgroup "${APP_GROUP}" --system --quiet

data/lib/pkgr/builder.rb

@@ -36,6 +36,7 @@ module Pkgr
       write_init
       setup_crons
       package
+      verify
       store_cache
     ensure
       teardown if config.clean
@@ -73,6 +74,7 @@ module Pkgr
           distribution.runner = Distributions::Runner.new(type, version.join("-"))
         end
       end
+      config.distribution = distribution
       # required to build proper Addon objects
       config.addons_dir = addons_dir
       # useful for templates that need to read files
@@ -193,6 +195,11 @@ module Pkgr
       app_package.error!
     end
 
+    def verify
+      return true unless config.verify
+      distribution.verify(Dir.pwd)
+    end
+
     def store_cache
       return true unless config.store_cache
       generate_cache_tarball = Mixlib::ShellOut.new %{tar czf cache.tar.gz -C #{compile_cache_dir} .}

data/lib/pkgr/cli.rb

@@ -35,6 +35,10 @@ module Pkgr
     method_option :maintainer,
       :type => :string,
       :desc => "Maintainer"
+    method_option :vendor,
+      :type => :string,
+      :desc => "Package vendor",
+      :default => "pkgr <https://github.com/crohr/pkgr>"
     method_option :architecture,
       :type => :string,
       :default => "x86_64",
@@ -113,6 +117,10 @@ module Pkgr
     method_option :store_cache,
       :type => :boolean,
       :desc => 'Output a tarball of the cache in the current directory (name: cache.tar.gz)'
+    method_option :verify,
+      :type => :boolean,
+      :default => true,
+      :desc => "Verifies output package"
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]

data/lib/pkgr/config.rb

@@ -26,8 +26,11 @@ module Pkgr
           end
         end
 
-        (targets[distribution.to_s] || {}).each do |k,v|
-          config[k] = v
+        distro_config = targets[distribution.to_s]
+        if distro_config.is_a?(Hash)
+          distro_config.each do |k,v|
+            config[k] = v
+          end
         end
 
         self.new(config)
@@ -68,8 +71,12 @@ module Pkgr
       name.gsub("-", "_")
     end
 
+    def cli?
+      @table.has_key?(:cli) ? @table[:cli] : true
+    end
+
     def home
-      "/opt/#{name}"
+      @table[:home] || "/opt/#{name}"
     end
 
     def user
@@ -204,7 +211,8 @@ module Pkgr
         "--homepage \"#{homepage}\"",
         "--architecture \"#{architecture}\"",
         "--description \"#{description}\"",
-        "--maintainer \"#{maintainer}\""
+        "--maintainer \"#{maintainer}\"",
+        "--vendor \"#{vendor}\""
       ]
       args.push "--dependencies #{dependencies.map{|d| "\"#{d}\""}.join}" unless dependencies.nil? || dependencies.empty?
       args.push "--build-dependencies #{build_dependencies.map{|d| "\"#{d}\""}.join}" unless build_dependencies.nil? || build_dependencies.empty?
@@ -226,6 +234,7 @@ module Pkgr
       args.push "--verbose" if verbose
       args.push "--store-cache" if store_cache
       args.push "--debug" if debug
+      args.push "--verify" if verify
       args.push "--no-clean" if !clean
       args.push "--no-edge" if !edge
       args

data/lib/pkgr/dispatcher.rb

@@ -7,7 +7,7 @@ module Pkgr
 
     def initialize(path, opts = {})
       opts = opts.dup
-      @path = File.expand_path(path)
+      @path = path == '-' ? path : File.expand_path(path)
       @host = opts.delete(:host)
       @config = Config.new(opts)
     end
@@ -20,7 +20,7 @@ module Pkgr
       setup
 
       if remote?
-        command = %{ ( cat "#{path}" | ssh "#{host}" pkgr package - #{config.to_args.join(" ")} ) && rsync "#{host}":~/*.deb .}
+        command = %{ ( cat "#{path}" | ssh "#{host}" pkgr package - #{config.to_args.join(" ")} ) && rsync -av --include './' --include '*.deb' --include '*.rpm' --exclude '*' "#{host}":~/ .}
         Pkgr.debug command
         IO.popen(command) do |io|
           until io.eof?
@@ -51,4 +51,4 @@ module Pkgr
       !host.nil?
     end
   end
-end
+end

data/lib/pkgr/distributions/base.rb

@@ -57,6 +57,11 @@ module Pkgr
         end
       end
 
+      # Verifies packages
+      def verify(output_dir)
+        true
+      end
+
       # e.g. data/buildpacks/ubuntu/12.04
       def default_buildpack_list
         data_file(File.join("buildpacks", slug))
@@ -102,18 +107,18 @@ module Pkgr
         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"))
 
-        # Put cli in /usr/bin, as redhat based distros don't have /usr/local/bin in their sudo PATH.
-        list.push Templates::FileTemplate.new("usr/bin/#{app_name}", data_file("cli", "cli.sh.erb"), mode: 0755)
+        if config.cli?
+          # Put cli in /usr/bin, as redhat based distros don't have /usr/local/bin in their sudo PATH.
+          list.push Templates::FileTemplate.new("usr/bin/#{app_name}", data_file("cli", "cli.sh.erb"), mode: 0755)
+        end
 
-        # NOTE: /etc/appname/conf.d/* files are no longer installed here, since we don't want to overwrite any pre-existing config.
-        # They're now installed in the postinstall script.
         list
       end
 
       # Returns a list of <Process, FileTemplate> tuples.
       def initializers_for(app_name, procfile_entries)
         list = []
-        procfile_entries.select(&:daemon?).each do |process|
+        procfile_entries.each do |process|
           Pkgr.debug "Adding #{process.inspect} to initialization scripts"
           runner.templates(process, app_name).each do |template|
             list.push [process, template]
@@ -185,3 +190,4 @@ end # module Pkgr
 
 require 'pkgr/distributions/debian'
 require 'pkgr/distributions/fedora'
+require 'pkgr/distributions/sles'

data/lib/pkgr/distributions/centos.rb

@@ -7,7 +7,7 @@ module Pkgr
       def runner
         # in truth it is 0.6.5, but it also works with 1.5 templates.
         # maybe adopt the same structure as pleaserun, with defaults, etc.
-        @runner ||= Runner.new("upstart", "1.5")
+        @runner ||= Runner.new("upstart", "1.5", "initctl")
       end
 
       def templates

data/lib/pkgr/distributions/debian.rb

@@ -1,6 +1,7 @@
 require 'pkgr/buildpack'
 require 'pkgr/process'
 require 'pkgr/distributions/base'
+require 'pkgr/fpm_command'
 
 module Pkgr
   module Distributions
@@ -12,7 +13,7 @@ module Pkgr
       end
 
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1")
+        @runner ||= Runner.new("sysv", "lsb-3.1", "update-rc.d")
       end
 
       def package_test_command(package)
@@ -28,7 +29,19 @@ module Pkgr
       end
 
       def fpm_command(build_dir)
-        DebianFpm.new(self, build_dir).command
+        DebianFpmCommand.new(self, build_dir).command
+      end
+
+      def verify(output_dir)
+        Dir.glob(File.join(output_dir, "*deb")).each do |package|
+          puts "-----> Verifying package #{File.basename(package)}"
+          Dir.mktmpdir do |dir|
+            verify_package = Mixlib::ShellOut.new %{dpkg-deb -x #{package} #{dir}}
+            verify_package.logger = Pkgr.logger
+            verify_package.run_command
+            verify_package.error!
+          end
+        end
       end
 
       def debconfig
@@ -58,47 +71,13 @@ module Pkgr
         addon.debian_dependency_name
       end
 
-      class DebianFpm
-        attr_reader :distribution, :build_dir, :config
-
-        def initialize(distribution, build_dir)
-          @distribution = distribution
-          @build_dir = build_dir
-          @config = distribution.config
-        end
-
-        def command
-          %{fpm #{args.join(" ")} .}
-        end
-
+      class DebianFpmCommand < FpmCommand
         def args
-          list = []
+          list = super
           list << "-t deb"
-          list << "-s dir"
-          list << "--verbose"
-          list << "--force"
-          list << "--exclude '**/.git**'"
-          list << %{-C "#{build_dir}"}
-          list << %{-n "#{config.name}"}
-          list << %{--version "#{config.version}"}
-          list << %{--iteration "#{config.iteration}"}
-          list << %{--url "#{config.homepage}"}
-          list << %{--provides "#{config.name}"}
           list << %{--deb-user "root"}
           list << %{--deb-group "root"}
-          list << %{--license "#{config.license}"} unless config.license.nil?
-          list << %{-a "#{config.architecture}"}
-          list << %{--description "#{config.description}"}
-          list << %{--maintainer "#{config.maintainer}"}
-          list << %{--template-scripts}
-          list << %{--deb-config #{distribution.debconfig.path}}
-          list << %{--deb-templates #{distribution.debtemplates.path}}
-          list << %{--before-install #{distribution.preinstall_file}}
-          list << %{--after-install #{distribution.postinstall_file}}
-          list << %{--before-remove #{distribution.preuninstall_file}}
-          list << %{--after-remove #{distribution.postuninstall_file}}
-          distribution.dependencies(config.dependencies).each{|d| list << "-d '#{d}'"}
-          list.compact
+          list
         end
       end
     end

data/lib/pkgr/distributions/fedora.rb

@@ -1,6 +1,7 @@
 require 'pkgr/buildpack'
 require 'pkgr/process'
 require 'pkgr/distributions/base'
+require 'pkgr/fpm_command'
 
 module Pkgr
   module Distributions
@@ -12,7 +13,7 @@ module Pkgr
       end
 
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1")
+        @runner ||= Runner.new("sysv", "lsb-3.1", "chkconfig")
       end
 
       def package_test_command(package)
@@ -28,28 +29,17 @@ module Pkgr
       end
 
       def fpm_command(build_dir)
-        %{
-          fpm -t rpm -s dir --verbose --force \
-          -C "#{build_dir}" \
-          -n "#{config.name}" \
-          --version "#{config.version}" \
-          --iteration "#{config.iteration}" \
-          --url "#{config.homepage}" \
-          --provides "#{config.name}" \
-          --deb-user "root" \
-          --deb-group "root" \
-          -a "#{config.architecture}" \
-          --description "#{config.description}" \
-          --maintainer "#{config.maintainer}" \
-          --template-scripts \
-          --before-install #{preinstall_file} \
-          --after-install #{postinstall_file} \
-          --before-remove #{preuninstall_file} \
-          --after-remove #{postuninstall_file} \
-          #{dependencies(config.dependencies).map{|d| "-d '#{d}'"}.join(" ")} \
-          .
-        }
+        FedoraFpmCommand.new(self, build_dir).command
       end
+
+      class FedoraFpmCommand < FpmCommand
+        def args
+          list = super
+          list << "-t rpm"
+          list
+        end
+      end
+
     end
   end
 end

data/lib/pkgr/distributions/redhat.rb

@@ -2,7 +2,7 @@ module Pkgr
   module Distributions
     class Redhat < Fedora
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1")
+        @runner ||= Runner.new("sysv", "lsb-3.1", "chkconfig")
       end
     end
   end

data/lib/pkgr/distributions/runner.rb

@@ -1,6 +1,6 @@
 module Pkgr
   module Distributions
-    class Runner < Struct.new(:type, :version)
+    class Runner < Struct.new(:type, :version, :cli)
       def sysv?
         type == "sysv"
       end

data/lib/pkgr/distributions/sles.rb

@@ -0,0 +1,47 @@
+require 'pkgr/buildpack'
+require 'pkgr/process'
+require 'pkgr/distributions/base'
+require 'pkgr/fpm_command'
+
+module Pkgr
+  module Distributions
+    # Contains the various components required to make a packaged app integrate well with a Debian system.
+    class Sles < Base
+      # Only keep major digits
+      def release
+        @release[/^[0-9]+/]
+      end
+
+      def runner
+        @runner ||= Runner.new("sysv", "lsb-3.1", "chkconfig")
+      end
+
+      def package_test_command(package)
+        "rpm -qa '#{package}' | grep '#{package}' > /dev/null 2>&1"
+      end
+
+      def package_install_command(packages)
+        "sudo zypper refresh ; sudo zypper install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
+      end
+
+      def installer_dependencies
+        super.push("which").push("net-tools").uniq
+      end
+
+      def fpm_command(build_dir)
+        SlesFpmCommand.new(self, build_dir).command
+      end
+
+      class SlesFpmCommand < FpmCommand
+        def args
+          list = super
+          list << "-t rpm"
+          list
+        end
+      end
+    end
+  end
+end
+
+require 'pkgr/distributions/redhat'
+require 'pkgr/distributions/centos'

data/lib/pkgr/distributions/ubuntu.rb

@@ -10,7 +10,7 @@ module Pkgr
       end
 
       def runner
-        @runner ||= Runner.new("upstart", "1.5")
+        @runner ||= Runner.new("upstart", "1.5", "initctl")
       end
 
       def templates

data/lib/pkgr/fpm_command.rb

@@ -0,0 +1,41 @@
+module Pkgr
+  class FpmCommand
+    attr_reader :distribution, :build_dir, :config
+
+    def initialize(distribution, build_dir)
+      @distribution = distribution
+      @build_dir = build_dir
+      @config = distribution.config
+    end
+
+    def command
+      %{fpm #{args.join(" ")} .}
+    end
+
+    def args
+      list = []
+      list << "-s dir"
+      list << "--verbose"
+      list << "--force"
+      list << "--exclude '**/.git**'"
+      list << %{-C "#{build_dir}"}
+      list << %{-n "#{config.name}"}
+      list << %{--version "#{config.version}"}
+      list << %{--iteration "#{config.iteration}"}
+      list << %{--url "#{config.homepage}"}
+      list << %{--provides "#{config.name}"}
+      list << %{--license "#{config.license}"} unless config.license.nil?
+      list << %{-a "#{config.architecture}"}
+      list << %{--description "#{config.description}"}
+      list << %{--maintainer "#{config.maintainer}"}
+      list << %{--vendor "#{config.vendor}"}
+      list << %{--template-scripts}
+      list << %{--before-install #{distribution.preinstall_file}}
+      list << %{--after-install #{distribution.postinstall_file}}
+      list << %{--before-remove #{distribution.preuninstall_file}}
+      list << %{--after-remove #{distribution.postuninstall_file}}
+      distribution.dependencies(config.dependencies).each{|d| list << "-d '#{d}'"}
+      list.compact
+    end
+  end
+end

data/lib/pkgr/process.rb

@@ -1,7 +1,5 @@
 module Pkgr
   class Process
-    DAEMON_PROCESSES = ["web", "worker"]
-
     attr_reader :name, :command
     attr_accessor :scale
 
@@ -10,9 +8,5 @@ module Pkgr
       @command = command
       @scale = scale || 1
     end
-
-    def daemon?
-      DAEMON_PROCESSES.include?(name)
-    end
   end
 end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,9 +108,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: Embeds your app dependencies (e.g. a specific ruby version and you gems
-  in the case of Rails apps) into a debian package, for easy installation. Provides
-  init scripts and more.
+description: Simplify the deployment of your applications by automatically packaging
+  your application and its dependencies on multiple platforms.
 email:
 - cyril.rohr@gmail.com
 executables:
@@ -126,11 +125,13 @@ files:
 - data/build_dependencies/centos.yml
 - data/build_dependencies/debian.yml
 - data/build_dependencies/fedora.yml
+- data/build_dependencies/sles.yml
 - data/build_dependencies/ubuntu.yml
 - data/buildpacks/centos-6
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
 - data/buildpacks/fedora-20
+- data/buildpacks/sles-12
 - data/buildpacks/ubuntu-10.04
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
@@ -138,6 +139,7 @@ files:
 - data/dependencies/centos.yml
 - data/dependencies/debian.yml
 - data/dependencies/fedora.yml
+- data/dependencies/sles.yml
 - data/dependencies/ubuntu.yml
 - data/environment/default.erb
 - data/hooks/postinstall.sh
@@ -168,8 +170,10 @@ files:
 - lib/pkgr/distributions/fedora.rb
 - lib/pkgr/distributions/redhat.rb
 - lib/pkgr/distributions/runner.rb
+- lib/pkgr/distributions/sles.rb
 - lib/pkgr/distributions/ubuntu.rb
 - lib/pkgr/env.rb
+- lib/pkgr/fpm_command.rb
 - lib/pkgr/git.rb
 - lib/pkgr/installer.rb
 - lib/pkgr/process.rb
@@ -200,6 +204,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Package any app as a debian package
+summary: Package any Ruby, NodeJS or Go app as a deb or rpm package
 test_files: []
 has_rdoc: