pkgr 1.3.2 → 1.4.0

data/lib/pkgr/distributions/redhat.rb

@@ -1,51 +1,9 @@
-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 Redhat < Base
-      # Only keep major adigits
-      def release
-        @release[/^[0-9]+/]
-      end
-
+    class Redhat < Fedora
       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 check-update && sudo yum install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
-      end
-
-      def fpm_command(build_dir, config)
-        %{
-          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(config)} \
-          --after-install #{postinstall_file(config)} \
-          #{dependencies(config.dependencies).map{|d| "-d '#{d}'"}.join(" ")} \
-          .
-        }
-      end
     end
   end
 end
-
-require 'pkgr/distributions/centos'

data/lib/pkgr/distributions/ubuntu.rb

@@ -12,6 +12,12 @@ module Pkgr
       def runner
         @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/installer.rb

@@ -0,0 +1,66 @@
+require 'pkgr/command'
+require 'fileutils'
+
+module Pkgr
+  class Installer
+    DEFAULT_URL = "https://github.com/pkgr/installer.git#master"
+
+    attr_reader :url, :branch
+    attr_reader :distribution
+
+    def initialize(installer_url, distribution)
+      @installer_url = installer_url
+      @installer_url = DEFAULT_URL if @installer_url == true || @installer_url.nil? || @installer_url.empty?
+      @url, @branch = @installer_url.split("#", 2)
+      @branch ||= "master"
+      @distribution = distribution
+    end
+
+    def shell
+      Command.new(Pkgr.logger)
+    end
+
+    def setup
+      shell.run!("git clone --depth=1 --branch=\"#{branch}\" \"#{url}\" #{installer_tmp_dir}")
+      self
+    end
+
+    def call(config)
+      Dir.chdir(installer_tmp_dir) do
+        config.wizards.each do |addon_group|
+          addon_group.each do |addon|
+            addon_dir = "addons/#{addon.name}"
+            FileUtils.mkdir_p addon_dir
+            puts "-----> [wizard] adding #{addon.name} wizard (#{addon.url}##{addon.branch})"
+            shell.run!(
+              "curl -L --max-redirs 3 --retry 5 -s '#{addon.tarball_url}' | tar xzf - --strip-components=1 -C '#{addon_dir}'")
+          end
+        end
+
+        shell.stream!(
+          "./bin/compile",
+          {
+            "APP_NAME" => config.name,
+            "APP_VERSION" => config.version,
+            "APP_ITERATION" => config.iteration,
+            "APP_SAFE_NAME" => config.safe_name,
+            "APP_USER" => config.user,
+            "APP_GROUP" => config.group,
+            "APP_WORKSPACE" => config.source_dir,
+            # mysql|postgres,apache2|nginx,smtp
+            "APP_WIZARDS" => config.wizards.map{|addon_group| addon_group.map(&:name).join("|")}.join(",")
+          }
+        )
+      end
+
+      FileUtils.mv installer_tmp_dir, File.join(config.build_dir, "usr", "share", config.name, "installer")
+
+      config.dependencies.push(*distribution.installer_dependencies)
+      config
+    end
+
+    def installer_tmp_dir
+      @installer_tmp_dir ||= Dir.mktmpdir
+    end
+  end
+end

data/lib/pkgr/version.rb

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

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 description: Embeds your app dependencies (e.g. a specific ruby version and you gems
@@ -135,41 +120,30 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- lib/pkgr/builder.rb
-- lib/pkgr/buildpack.rb
-- lib/pkgr/cli.rb
-- lib/pkgr/config.rb
-- lib/pkgr/dispatcher.rb
-- lib/pkgr/distributions/base.rb
-- lib/pkgr/distributions/centos.rb
-- lib/pkgr/distributions/debian.rb
-- lib/pkgr/distributions/redhat.rb
-- lib/pkgr/distributions/runner.rb
-- lib/pkgr/distributions/ubuntu.rb
-- lib/pkgr/distributions.rb
-- lib/pkgr/env.rb
-- lib/pkgr/git.rb
-- lib/pkgr/process.rb
-- lib/pkgr/templates/dir_template.rb
-- lib/pkgr/templates/file_template.rb
-- lib/pkgr/version.rb
-- lib/pkgr.rb
+- LICENSE
+- README.md
+- bin/pkgr
 - data/build_dependencies/centos.yml
 - data/build_dependencies/debian.yml
+- data/build_dependencies/fedora.yml
 - data/build_dependencies/ubuntu.yml
 - data/buildpacks/centos-6
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
+- data/buildpacks/fedora-20
 - data/buildpacks/ubuntu-10.04
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
 - data/cli/cli.sh.erb
 - data/dependencies/centos.yml
 - data/dependencies/debian.yml
+- data/dependencies/fedora.yml
 - data/dependencies/ubuntu.yml
 - data/environment/default.erb
 - data/hooks/postinstall.sh
+- data/hooks/postuninstall.sh
 - data/hooks/preinstall.sh
+- data/hooks/preuninstall.sh
 - data/init/sysv/lsb-3.1/master.erb
 - data/init/sysv/lsb-3.1/process.erb
 - data/init/sysv/lsb-3.1/process_master.erb
@@ -178,33 +152,54 @@ files:
 - data/init/upstart/1.5/process.conf.erb
 - data/init/upstart/1.5/process_master.conf.erb
 - data/logrotate/logrotate.erb
-- LICENSE
-- README.md
-- bin/pkgr
+- lib/pkgr.rb
+- lib/pkgr/addon.rb
+- lib/pkgr/builder.rb
+- lib/pkgr/buildpack.rb
+- lib/pkgr/cli.rb
+- lib/pkgr/command.rb
+- lib/pkgr/config.rb
+- lib/pkgr/cron.rb
+- lib/pkgr/dispatcher.rb
+- lib/pkgr/distributions.rb
+- lib/pkgr/distributions/base.rb
+- lib/pkgr/distributions/centos.rb
+- lib/pkgr/distributions/debian.rb
+- lib/pkgr/distributions/fedora.rb
+- lib/pkgr/distributions/redhat.rb
+- lib/pkgr/distributions/runner.rb
+- lib/pkgr/distributions/ubuntu.rb
+- lib/pkgr/env.rb
+- lib/pkgr/git.rb
+- lib/pkgr/installer.rb
+- lib/pkgr/process.rb
+- lib/pkgr/templates/dir_template.rb
+- lib/pkgr/templates/file_template.rb
+- lib/pkgr/version.rb
 homepage: http://github.com/crohr/pkgr
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Package any app as a debian package
 test_files: []
+has_rdoc: