pkgr 1.3.2 → 1.4.0

data/lib/pkgr/config.rb

@@ -64,6 +64,10 @@ module Pkgr
       @table.delete(key)
     end
 
+    def safe_name
+      name.gsub("-", "_")
+    end
+
     def home
       "/opt/#{name}"
     end
@@ -93,7 +97,7 @@ module Pkgr
     end
 
     def env
-      Pkgr::Env.new(@table[:env])
+      @table[:env].is_a?(Pkgr::Env) ? @table[:env] : Pkgr::Env.new(@table[:env])
     end
 
     def valid?
@@ -111,6 +115,30 @@ module Pkgr
       @errors ||= []
     end
 
+    def addons
+      # make proper Addon objects out of existing addon slugs
+      (@table[:addons] || []).map do |addon_slug|
+        Addon.new(addon_slug, addons_dir, self)
+      end
+    end
+
+    def installer
+      return nil if @table[:installer].nil? || @table[:installer] == false
+      @table[:installer]
+    end
+
+    def wizards
+      @wizards ||= (@table[:wizards] || []).map do |wizard_string|
+        wizard_string.split(/\s*\|\s*/).map do |wizard|
+          Addon.new(wizard, nil, nil)
+        end
+      end
+    end
+
+    def crons
+      @table[:crons] || []
+    end
+
     def before_hook
       if before_precompile.nil? || before_precompile.empty?
         before_steps = self.before || []
@@ -155,6 +183,16 @@ module Pkgr
       Pathname.new(source_dir).join(@table[:after_install]).realpath.to_s
     end
 
+    def before_remove
+      return nil if @table[:before_remove].nil?
+      Pathname.new(source_dir).join(@table[:before_remove]).realpath.to_s
+    end
+
+    def after_remove
+      return nil if @table[:after_remove].nil?
+      Pathname.new(source_dir).join(@table[:after_remove]).realpath.to_s
+    end
+
     # TODO: DRY this with cli.rb
     def to_args
       args = [
@@ -175,6 +213,9 @@ module Pkgr
       args.push "--after-precompile \"#{after_precompile}\"" unless after_precompile.nil? || after_precompile.empty?
       args.push "--before-install \"#{before_install}\"" unless before_install.nil? || before_install.empty?
       args.push "--after-install \"#{after_install}\"" unless after_install.nil? || after_install.empty?
+      args.push "--before-remove \"#{before_remove}\"" unless before_remove.nil? || before_remove.empty?
+      args.push "--after-remove \"#{after_remove}\"" unless after_remove.nil? || after_remove.empty?
+
       args.push "--license \"#{license}\"" unless license.nil? || license.empty?
       args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
       args.push "--buildpack_list \"#{buildpack_list}\"" unless buildpack_list.nil? || buildpack_list.empty?
@@ -183,6 +224,7 @@ module Pkgr
       args.push "--env #{env.variables.map{|v| "\"#{v}\""}.join(" ")}" if env.present?
       args.push "--auto" if auto
       args.push "--verbose" if verbose
+      args.push "--store-cache" if store_cache
       args.push "--debug" if debug
       args.push "--no-clean" if !clean
       args.push "--no-edge" if !edge

data/lib/pkgr/cron.rb

@@ -0,0 +1,12 @@
+module Pkgr
+  class Cron
+    # the source, in /opt/app-name/...
+    attr_reader :source
+    # the destination, most likely in /etc/cron.d/...
+    attr_reader :destination
+
+    def initialize(source, destination)
+      @source, @destination = source, destination
+    end
+  end
+end

data/lib/pkgr/dispatcher.rb

@@ -36,14 +36,13 @@ module Pkgr
 
     def tarify
       tmpfile = Tempfile.new(["pkgr-tarball", ".tar.gz"])
-      system("tar czf #{tmpfile.path} --exclude .git --exclude .svn -C \"#{path}\" .") || raise(Pkgr::Errors::Base, "Can't compress input directory")
+      system("tar czf #{tmpfile.path} --exclude .svn -C \"#{path}\" .") || raise(Pkgr::Errors::Base, "Can't compress input directory")
       # Remove any non-digit characters that may be before the version number
       config.version ||= begin
         v = (Git.new(path).latest_tag || "").gsub(/^[^\d]+(\d.*)/, '\1')
         v = "0.0.0" if v !~ /^\d/
         v
       end
-      config.compile_cache_dir ||= File.join(path, ".git", "cache")
       config.name ||= File.basename(path)
       @path = tmpfile.path
     end

data/lib/pkgr/distributions.rb

@@ -1,11 +1,13 @@
 require 'pkgr/templates/file_template'
 require 'pkgr/templates/dir_template'
 require 'pkgr/distributions/base'
+require 'pkgr/config'
 require 'facter'
 
 module Pkgr
   module Distributions
-    def current(force_os = nil)
+    def current(config = Config.new)
+      force_os = config.force_os
       os, release = if force_os.nil?
         [Facter.value('operatingsystem'), Facter.value('operatingsystemrelease')]
       else
@@ -15,7 +17,7 @@ module Pkgr
       os.downcase!
 
       klass = const_get(os.capitalize)
-      klass.new(release)
+      klass.new(release, config)
     rescue NameError => e
       raise Errors::UnknownDistribution, "Don't know about the current distribution you're on: #{os}-#{release}"
     end

data/lib/pkgr/distributions/base.rb

@@ -1,7 +1,9 @@
 require 'pkgr/buildpack'
 require 'pkgr/env'
 require 'pkgr/distributions/runner'
+require 'pkgr/config'
 require 'yaml'
+require 'open-uri'
 
 module Pkgr
   module Distributions
@@ -9,8 +11,10 @@ module Pkgr
     class Base
       attr_reader :release
       attr_writer :runner
+      attr_accessor :config
 
-      def initialize(release)
+      def initialize(release, config = Config.new)
+        @config = config
         @release = release
       end
 
@@ -32,7 +36,7 @@ module Pkgr
       end
 
       # Check if all build dependencies are present.
-      def check(config)
+      def check
         missing_packages = (build_dependencies(config.build_dependencies) || []).select do |package|
           test_command = package_test_command(package)
           Pkgr.debug "sh(#{test_command})"
@@ -42,6 +46,7 @@ module Pkgr
         unless missing_packages.empty?
           install_command = package_install_command(missing_packages)
           if config.auto
+            puts "-----> Installing missing build dependencies: #{missing_packages.join(", ")}"
             package_install = Mixlib::ShellOut.new(install_command)
             package_install.logger = Pkgr.logger
             package_install.run_command
@@ -58,13 +63,13 @@ module Pkgr
       end # def default_buildpack_list
 
       # Returns a list of Buildpack objects
-      def buildpacks(config)
+      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)]
         else
-          load_buildpack_list(config)
+          load_buildpack_list
         end
       end # def buildpacks
 
@@ -79,7 +84,7 @@ module Pkgr
       end # def build_dependencies
 
       # Returns a list of file and directory templates.
-      def templates(config)
+      def templates
         app_name = config.name
         list = []
 
@@ -89,8 +94,9 @@ module Pkgr
           config.home.gsub(/^\//, ""),
           "etc/#{app_name}/conf.d",
           "etc/default",
-          "etc/init",
-          "var/log/#{app_name}"
+          "var/log/#{app_name}",
+          "var/db/#{app_name}",
+          "usr/share/#{app_name}"
         ].each{|dir| list.push Templates::DirTemplate.new(dir) }
 
         list.push Templates::FileTemplate.new("etc/default/#{app_name}", data_file("environment", "default.erb"))
@@ -116,23 +122,45 @@ module Pkgr
         list
       end
 
-      def preinstall_file(config)
-        @preinstall_file ||= generate_hook_file("preinstall.sh", config)
+      def crons_dir
+        "etc/cron.d"
+      end
+
+      def add_addon(addon)
+        nil
+      end
+
+      def preinstall_file
+        @preinstall_file ||= generate_hook_file("preinstall.sh")
         @preinstall_file.path
       end
 
-      def postinstall_file(config)
-        @postinstall_file ||= generate_hook_file("postinstall.sh", config)
+      def postinstall_file
+        @postinstall_file ||= generate_hook_file("postinstall.sh")
         @postinstall_file.path
       end
 
+      def preuninstall_file
+        @preuninstall_file ||= generate_hook_file("preuninstall.sh")
+        @preuninstall_file.path
+      end
+
+      def postuninstall_file
+        @postuninstall_file ||= generate_hook_file("postuninstall.sh")
+        @postuninstall_file.path
+      end
+
+      def installer_dependencies
+        ["dialog", "bash"]
+      end
+
       protected
 
-      def load_buildpack_list(config)
+      def load_buildpack_list
         file = config.buildpack_list || default_buildpack_list
         return [] if file.nil?
 
-        File.read(file).split("\n").map do |line|
+        open(file).read.split("\n").map do |line|
           url, *raw_env = line.split(",")
           buildpack_env = (config.env || Env.new).merge(Env.new(raw_env))
           Buildpack.new(url, :builtin, buildpack_env)
@@ -143,7 +171,7 @@ module Pkgr
         File.new(File.join(Pkgr.data_dir, *names))
       end
 
-      def generate_hook_file(hook_name, config)
+      def generate_hook_file(hook_name)
         source = data_file("hooks", hook_name)
         file = Tempfile.new("postinstall")
         file.write ERB.new(File.read(source)).result(config.sesame)
@@ -156,4 +184,4 @@ module Pkgr
 end # module Pkgr
 
 require 'pkgr/distributions/debian'
-require 'pkgr/distributions/redhat'
+require 'pkgr/distributions/fedora'

data/lib/pkgr/distributions/centos.rb

@@ -1,12 +1,20 @@
-require "pkgr/distributions/redhat"
+require "pkgr/distributions/fedora"
 
 module Pkgr
   module Distributions
     # Contains the various components required to make a packaged app integrate well with a CentOS system.
-    class Centos < Redhat
+    class Centos < Fedora
       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")
       end
+
+      def templates
+        list = super
+        list.push Templates::DirTemplate.new("etc/init")
+        list
+      end
     end
   end
 end

data/lib/pkgr/distributions/debian.rb

@@ -23,33 +23,83 @@ module Pkgr
         "sudo apt-get update && sudo apt-get install --force-yes -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
       end
 
-      def fpm_command(build_dir, config)
-        %{fpm #{fpm_args(build_dir, config).join(" ")} .}
-      end
-
-      def fpm_args(build_dir, config)
-        args = []
-        args << "-t deb"
-        args << "-s dir"
-        args << "--verbose"
-        args << "--force"
-        args << %{-C "#{build_dir}"}
-        args << %{-n "#{config.name}"}
-        args << %{--version "#{config.version}"}
-        args << %{--iteration "#{config.iteration}"}
-        args << %{--url "#{config.homepage}"}
-        args << %{--provides "#{config.name}"}
-        args << %{--deb-user "root"}
-        args << %{--deb-group "root"}
-        args << %{--license "#{config.license}"} unless config.license.nil?
-        args << %{-a "#{config.architecture}"}
-        args << %{--description "#{config.description}"}
-        args << %{--maintainer "#{config.maintainer}"}
-        args << %{--template-scripts}
-        args << %{--before-install #{preinstall_file(config)}}
-        args << %{--after-install #{postinstall_file(config)}}
-        dependencies(config.dependencies).each{|d| args << "-d '#{d}'"}
-        args
+      def installer_dependencies
+        super.push("debianutils").uniq
+      end
+
+      def fpm_command(build_dir)
+        DebianFpm.new(self, build_dir).command
+      end
+
+      def debconfig
+        @debconfig ||= begin
+          tmpfile = Tempfile.new("debconfig")
+          tmpfile.puts "#!/bin/bash"
+          tmpfile.rewind
+          tmpfile
+        end
+        @debconfig
+      end
+
+      def debtemplates
+        @debtemplates ||= Tempfile.new("debtemplates")
+      end
+
+      def add_addon(addon)
+        # make a debian package out of the addon
+        Dir.chdir(addon.dir) do
+          make_package = Mixlib::ShellOut.new %{dpkg-buildpackage -b -d}
+          make_package.logger = Pkgr.logger
+          make_package.run_command
+          make_package.error!
+        end
+        FileUtils.mv(Dir.glob(File.join(File.dirname(addon.dir), "*.deb")), Dir.pwd)
+        # return name of the dependency
+        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
+
+        def args
+          list = []
+          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
+        end
       end
     end
   end

data/lib/pkgr/distributions/fedora.rb

@@ -0,0 +1,58 @@
+require 'pkgr/buildpack'
+require 'pkgr/process'
+require 'pkgr/distributions/base'
+
+module Pkgr
+  module Distributions
+    # Contains the various components required to make a packaged app integrate well with a Debian system.
+    class Fedora < Base
+      # Only keep major digits
+      def release
+        @release[/^[0-9]+/]
+      end
+
+      def runner
+        @runner ||= Runner.new("sysv", "lsb-3.1")
+      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)
+        %{
+          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(" ")} \
+          .
+        }
+      end
+    end
+  end
+end
+
+require 'pkgr/distributions/redhat'
+require 'pkgr/distributions/centos'