packtory 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7d98a0c6496136f736656de91783bfaf8d3b3cea65043eb5f326145fecd013
-  data.tar.gz: 9f88ebd4c88dfbbacad221bffa3eb046c19b9035fb5e62d1279e37a2a2b7f7e1
+  metadata.gz: 89ce5682603992d2f8f3ab91c1cf9f4cbffec6fabb6e8ad8266cad3c5d0d7991
+  data.tar.gz: f3cb9c7d329089a444e72896e1838952e4d824d7e1685ddd5c55eafed25740f9
 SHA512:
-  metadata.gz: 9402607bf4d7a9aea39301f8c5ecda8fd190e311c7e57bac7180da8d1b3ce643eb00562addbd0162fa6535cd5eb2735c63b62404c5de9bfb563427bdec8f948b
-  data.tar.gz: d57a1818e84972e27f11352b55f58171e29ab9b4c44e8e12007a402a31d51c6cabc4370eb53f11e4503d4f9afccbd09bb6a092a13f2d42eba02388c9372994fa
+  metadata.gz: 4c10ca88570290d7a80a48fa1e888d6685a4b2cd926a98f074bd6bf7cb2108772d561d920165f9739a925465265f3fa05093ed1354ceb7fbe7bf09776b4c4438
+  data.tar.gz: 3f91d64c122e7f08cd622a63e698bccaf45bc752fbae6507396fe6afd14a4974775f73bff528b427856c1c79d866444b4bedda70548f4c3d7781aaf4e90d0b3f

data/README.md

@@ -1,7 +1,7 @@
 # Overview
 
 This is packtory, an easy to use system packaging tool for your Ruby
-gems. Build package for Debian, RPM, and _soon_ Homebrew, directly
+gems. Build package for Debian, RPM, and Homebrew, directly
 from your gem repo.
 
 Support for building native extensions is available, using a post-install step of the target package.
@@ -41,7 +41,7 @@ env PACKAGE_DEPENDENCIES="mysql,mysql-dev,libxml++>=2.6" packtory <root_path_to_
 
 # Requirements
 
-This gem depends on `fpm` to build the final system package. You will need to install it manually:
+This gem depends on `fpm` to build the final system package. You may install it manually:
 
 ```
 gem install fpm
@@ -62,23 +62,35 @@ brew install rpm
 
 # Compatibility
 
-If not specified, this buildpack will detect for a gemspec (\*.gemspec) file at the root path of your repo, then use that to gather the files of your gem and gem dependencies. After which, it vendorized all files to build the target package.
+If not specified, this buildpack will detect for a gemspec (\*.gemspec) file at the root
+path of your repo, then use that to gather the files of your gem and gem dependencies. After which,
+it vendorized all files to build the target package.
 
-If a gem has native extensions, the extensions are not built at the time of building the package, but rather, a post-install script is included, that builds them right after the target package is installed in the system. If any native extensions requires other system libraries, you may specify additional package dependencies to be installed prior to installing the target package.
+If a gem has native extensions, the extensions are not built at the time of building the
+package, but rather, a post-install script is included, that builds them right after the
+target package is installed in the system. If any native extensions requires other system
+libraries, you may specify additional package dependencies to be installed prior to
+installing the target package.
 
 As of this version, this buildpack do not support packaging gems without a specific gemspec file.
 
 # Limitations
 
-Note, the build process will not load the code of your gem or the other dependencies. Only the code in the gemspec is loaded using the ruby version of the build environment. Please make sure the gemspec may be loaded properly, and additional code requirements are compatible.
+Note, the build process will not load the code of your gem or the other dependencies.
+Only the code in the gemspec is loaded using the ruby version of the build environment.
+Please make sure the gemspec may be loaded properly, and additional code requirements
+are compatible.
 
 # Contribution and Improvements
 
-Please fork the code, make the changes, and submit a pull request for us to review your contributions.
+Please fork the code, make the changes, and submit a pull request for us to review
+your contributions.
 
 ## Feature requests
 
-If you think it would be nice to have a particular feature that is presently not implemented, we would love to hear that and consider working on it. Just open an issue in Github.
+If you think it would be nice to have a particular feature that is presently not
+implemented, we would love to hear that and consider working on it. Just open an
+issue in Github.
 
 # Questions
 

data/bin/packtory

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path('../../lib', __FILE__)
+this_file = __FILE__
+while File.symlink?(this_file)
+  this_file = File.readlink(this_file)
+end
+
+$:.unshift File.expand_path('../../lib', this_file)
 require 'packtory'
 
 Packtory::Command.run(ARGV)

data/bin/support/after_install_script

@@ -1,14 +1,14 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
+this_dir=$(cd $(dirname $0); pwd)
 
 PACKAGE_PATH="<%= pg_PACKAGE_PATH %>"
 
 # this is a special trap, in case the fpm templating did not its job
 if [[ $PACKAGE_PATH == \<* ]]; then
-    PACKAGE_PATH=""
+    PACKAGE_PATH="$(dirname $(dirname "$this_dir"))"
 fi
 
-this_dir=$(cd $(dirname $0); pwd)
-
 if [ -n "$PACKAGE_PATH" ]; then
     eval "export PACKAGE_PATH=$PACKAGE_PATH"
 else
@@ -28,6 +28,6 @@ extensions_path=$PACKAGE_PATH/extensions
 if [ -d $extensions_path ]; then
     for gemspec in $extensions_path/*.gemspec; do
         echo "== Processing $(basename $gemspec) =="
-        $gem_build_extensions_path $PACKAGE_PATH/bundle $gemspec
+        /usr/bin/ruby $gem_build_extensions_path $PACKAGE_PATH/bundle $gemspec
     done
 fi

data/bin/support/fpm

@@ -14,4 +14,8 @@ else
     fi
 fi
 
-$fpm_ruby "$@"
+if [ -n "$FPM_USE_RUBY_PATH" ]; then
+    $FPM_USE_RUBY_PATH $fpm_ruby "$@"
+else
+    $fpm_ruby "$@"
+fi

data/bin/support/gem_build_extensions

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
 require 'rubygems'
 require 'rubygems/installer'
@@ -21,8 +21,8 @@ end
 puts 'Bundle path   : %s' % bundle_path
 puts 'Gemspec path  : %s' % gemspec_path
 
-spec = eval(File.read(gemspec_path)).tap do |spec|
-  spec.loaded_from = gemspec_path
+spec = eval(File.read(gemspec_path)).tap do |s|
+  s.loaded_from = gemspec_path
 end
 
 gem_path = File.join(bundle_path, spec.name)

data/lib/packtory/brew_package.rb

@@ -0,0 +1,26 @@
+require 'bundler'
+
+module Packtory
+  class BrewPackage
+    INSTALL_PREFIX = '/usr/local/opt'
+    PACKAGE_PATH = '.'
+
+    def self.build_package(opts = { })
+      packager = Packer.new({ :bin_path => './bin',
+                              :install_as_subpath => true }.merge(opts))
+      fpm_exec = FpmExec.new(packager, INSTALL_PREFIX)
+
+      sfiles_map = packager.prepare_files(INSTALL_PREFIX, PACKAGE_PATH)
+      package_filename = '%s-%s.tar.gz' % [ packager.package_name, packager.version ]
+      pkg_file_path = fpm_exec.build(sfiles_map, package_filename, type: :tgz)
+
+      if File.exist?(pkg_file_path)
+        Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      else
+        Bundler.ui.error '[ERROR] Package not found: %s' % [ pkg_file_path ]
+      end
+
+      [ packager, pkg_file_path ]
+    end
+  end
+end

data/lib/packtory/bundler/setup.rb

@@ -0,0 +1,21 @@
+# Adding require paths to load path (empty if no gems is needed)
+
+<% if Packtory.config[:setup_reset_gem_paths] -%>
+require 'rubygems'
+
+ENV['GEM_HOME'] = ''
+ENV['GEM_PATH'] = ''
+Gem.clear_paths
+<% end -%>
+
+<%
+packer.for_each_bundle_gems do |gem_name, bhash, rpaths|
+  concat("# == Gem: %s, version: %s\n" % [ bhash[:spec].name, bhash[:spec].version ])
+
+  rpaths.each do |rpath|
+    concat("$:.unshift File.expand_path('../../%s%s', __FILE__)\n" % [ gem_name, rpath ])
+  end
+
+  concat("\n")
+end
+%>

data/lib/packtory/command.rb

@@ -13,6 +13,12 @@ module Packtory
         @fpm_exec_path = Packtory.bin_support_fpm_path
       end
 
+      if !ENV['FPM_USE_RUBY_PATH'].nil? && !ENV['FPM_USE_RUBY_PATH'].empty?
+        Packtory.config[:fpm_use_ruby_path] = ENV['FPM_USE_RUBY_PATH']
+      elsif !ENV['RUBY_PATH'].nil? && !ENV['RUBY_PATH'].empty?
+        Packtory.config[:fpm_use_ruby_path] = ENV['RUBY_PATH']
+      end
+
       if @fpm_exec_path.nil? || @fpm_exec_path.empty?
         say 'ERROR: `fpm` executable is not in path. Perhaps, install fpm first?'
         exit 1
@@ -30,25 +36,36 @@ module Packtory
       end
 
       say 'Using fpm path   : %s' % @fpm_exec_path
-      say 'Using fpm        : %s' % `#{@fpm_exec_path} -v`.strip
+      unless Packtory.config[:fpm_use_ruby_path].nil?
+        say 'Fpm using ruby   : %s' % Packtory.config[:fpm_use_ruby_path]
+      end
 
+      say 'Using fpm        : %s' % `#{exec_fpm} -v`.strip
       say 'Using build path : %s' % @build_path
 
-      Packer.config[:fpm_exec_path] = @fpm_exec_path
-      Packer.config[:path] = @build_path
+      Packtory.config[:fpm_exec_path] = @fpm_exec_path
+      Packtory.config[:path] = @build_path
 
       if ENV['FPM_EXEC_VERBOSE'] && ENV['FPM_EXEC_VERBOSE'] == '1'
-        Packer.config[:fpm_exec_verbose] = true
+        Packtory.config[:fpm_exec_verbose] = true
       end
 
       if !ENV['FPM_EXEC_LOG'].nil? && !ENV['FPM_EXEC_LOG'].empty?
-        Packer.config[:fpm_exec_verbose] = true
-        Packer.config[:fpm_exec_log] = ENV['FPM_EXEC_LOG']
+        Packtory.config[:fpm_exec_verbose] = true
+        Packtory.config[:fpm_exec_log] = ENV['FPM_EXEC_LOG']
       end
 
       self
     end
 
+    def exec_fpm
+      if Packtory.config[:fpm_use_ruby_path].nil?
+        @fpm_exec_path
+      else
+        'env FPM_USE_RUBY_PATH=%s %s' % [ Packtory.config[:fpm_use_ruby_path], @fpm_exec_path ]
+      end
+    end
+
     def detect_specfile(argv)
       if ENV['GEM_SPECFILE']
         @gemspec_file = ENV['GEM_SPECFILE']
@@ -74,7 +91,7 @@ module Packtory
       end
 
       say 'Using spec file  : %s' % @gemspec_file
-      Packer.config[:gemspec] = @gemspec_file
+      Packtory.config[:gemspec] = @gemspec_file
 
       self
     end
@@ -95,11 +112,11 @@ module Packtory
         end
 
         say 'Using Gemfile    : %s' % @bundle_gemfile
-        Packer.config[:gemfile] = @bundle_gemfile
+        Packtory.config[:gemfile] = @bundle_gemfile
       end
 
       if ENV['BUNDLER_INCLUDE']
-        Packer.config[:bundler_include] = true
+        Packtory.config[:bundler_include] = true
       end
 
       self
@@ -116,7 +133,7 @@ module Packtory
         say 'Using ruby deps  : latest'
       end
 
-      Packer.config[:dependencies]['ruby'] = @ruby_version
+      Packtory.config[:dependencies]['ruby'] = @ruby_version
       @deps['ruby'] = @ruby_version
 
       if ENV['PACKAGE_DEPENDENCIES']
@@ -126,7 +143,7 @@ module Packtory
             pname = $~[1]
             pver = $~[2]
 
-            Packer.config[:dependencies][pname] = pver
+            Packtory.config[:dependencies][pname] = pver
             @deps[pname] = pver
           end
         end
@@ -142,19 +159,22 @@ module Packtory
         packages << :rpm
       elsif ENV['PACKAGE_OUTPUT'] == 'deb'
         packages << :deb
+      elsif ENV['PACKAGE_OUTPUT'] == 'tgz'
+        packages << :tgz
+      elsif ENV['PACKAGE_OUTPUT'] == 'brew'
+        packages << :brew
       else
-        # Debian is the default output
         packages << :deb
       end
 
       say 'Package output   : %s' % packages.join(', ')
-      Packer.config[:packages] = packages
+      Packtory.config[:packages] = packages
 
       if ENV['PACKAGE_PATH']
         pkg_path = File.expand_path(ENV['PACKAGE_PATH'])
 
         say 'Package path     : %s' % pkg_path
-        Packer.config[:pkg_path] = pkg_path
+        Packtory.config[:pkg_path] = pkg_path
       end
 
       self
@@ -166,7 +186,7 @@ module Packtory
       info_h = {
         :version => ::Packtory::VERSION,
         :fpm_version => `#{@fpm_exec_path} -v`.strip
-      }.merge(Packer.config)
+      }.merge(Packtory.config)
 
       File.open(dump_file, 'w') do |f|
         f.write(YAML.dump(info_h))
@@ -191,14 +211,14 @@ module Packtory
 
       say '=================='
 
-      Packer.setup
+      Packtory.setup
 
       if ENV['TEST_DUMPINFO']
         test_dumpinfo(argv)
       elsif ENV['TEST_NOBUILD']
         # do nothing
       else
-        Packer.build_package
+        Packtory.build_package
       end
     end
 

data/lib/packtory/config.rb

@@ -0,0 +1,116 @@
+module Packtory
+  class Config
+    DEFAULT_CONFIG = {
+      :path => nil,
+      :pkg_path => nil,
+      :gemspec => nil,
+      :gemfile => nil,
+      :binstub => nil,
+      :bin_path => nil,
+      :install_as_subpath => false,
+      :setup_reset_gem_paths => true,
+      :packages => nil,
+      :architecture => 'all',
+
+      # maybe specified, if wanting to override as set in gemspec file
+      :package_name => nil,
+      :working_path => nil,
+
+      :dependencies => { },
+      :bundle_working_path => nil,
+
+      :fpm_use_ruby_path => nil,
+      :fpm_exec_path => nil,
+      :fpm_exec_verbose => false,
+      :fpm_exec_log => nil,
+
+      :bundler_silent => false,
+      :bundler_local => false,
+      :bundler_include => false
+    }
+
+    DEFAULT_PACKAGES = [ :deb ]
+    PACKTORY_PACKFILE = 'Packfile'
+
+    def self.config
+      if defined?(@@global_config)
+        @@global_config
+      else
+        reset_config!
+      end
+    end
+
+    def self.configure
+      yield config
+    end
+
+    def self.reset_config!
+      @@global_config = DEFAULT_CONFIG.merge({ })
+    end
+
+    def self.setup_defaults
+      if ENV.include?('PACKTORY_PACKAGES') && !ENV['PACKTORY_PACKAGES'].empty?
+        config[:packages] = ENV['PACKTORY_PACKAGES'].split(',').collect { |p| p.to_sym }
+      elsif config[:packages].nil?
+        config[:packages] = DEFAULT_PACKAGES
+      end
+
+      if ENV.include?('PACKTORY_BUNDLE_WORKING_PATH')
+        config[:bundle_working_path] = File.expand_path(ENV['PACKTORY_BUNDLE_WORKING_PATH'])
+      end
+
+      unless config[:dependencies].include?('ruby')
+        config[:dependencies]['ruby'] = nil
+      end
+    end
+
+    def self.search_up(*names)
+      previous = nil
+      current  = File.expand_path(config[:path] || Dir.pwd).untaint
+      found_path = nil
+
+      until !File.directory?(current) || current == previous || !found_path.nil?
+        names.each do |name|
+          path = File.join(current, name)
+          if File.exists?(path)
+            found_path = path
+            break
+          end
+        end
+
+        if found_path.nil?
+          previous = current
+          current = File.expand_path("..", current)
+        end
+      end
+
+      found_path
+    end
+
+    def self.load_packfile
+      packfile_path = nil
+
+      if ENV.include?('PACKTORY_PACKFILE')
+        packfile_path = File.expand_path(ENV['PACKTORY_PACKFILE'])
+      else
+        packfile_path = search_up(PACKTORY_PACKFILE)
+      end
+
+      unless packfile_path.nil?
+        load packfile_path
+      end
+
+      packfile_path
+    end
+
+    def self.load_patch
+      PatchBundlerNoMetadataDeps.patch!
+    end
+
+    def self.setup
+      load_patch
+      load_packfile
+      setup_defaults
+    end
+  end
+end

data/lib/packtory/deb_package.rb

@@ -12,7 +12,11 @@ module Packtory
       package_filename = '%s_%s_%s.deb' % [ packager.package_name, packager.version, packager.architecture ]
       pkg_file_path = fpm_exec.build(sfiles_map, package_filename, type: :deb)
 
-      Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      if File.exist?(pkg_file_path)
+        Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      else
+        Bundler.ui.error '[ERROR] Package not found: %s' % [ pkg_file_path ]
+      end
 
       [ packager, pkg_file_path ]
     end

data/lib/packtory/fpm_exec.rb

@@ -3,14 +3,14 @@ require 'bundler'
 module Packtory
   class FpmExec
     def self.fpm_exec_path
-      if !Packer.config[:fpm_exec_path].nil? && !Packer.config[:fpm_exec_path].empty?
-        Packer.config[:fpm_exec_path]
+      if !Packtory.config[:fpm_exec_path].nil? && !Packtory.config[:fpm_exec_path].empty?
+        Packtory.config[:fpm_exec_path]
       else
         Packtory.bin_support_fpm_path
       end
     end
 
-    def initialize(packager, prefix_path)
+    def initialize(packager, prefix_path = nil)
       @packager = packager
       @prefix_path = prefix_path
     end
@@ -23,23 +23,29 @@ module Packtory
 
       Bundler.ui.info 'CMD: %s' % cmd
 
-      if Packer.config[:fpm_exec_verbose]
-        Bundler.clean_system('%s' % cmd)
-      else
-        Bundler.clean_system('%s >/dev/null 2>&1' % cmd)
+      unless Packtory.config[:fpm_exec_verbose]
+        cmd = '%s >/dev/null 2>&1' % cmd
       end
 
+      Bundler.clean_system(cmd)
+
       pkg_file
     end
 
     def build_cmd(sfiles_map, pkg_file, opts = { })
-      cmd = '%s --log %s -f -s dir' % [ self.class.fpm_exec_path, Packer.config[:fpm_exec_log] || 'warn' ]
+      cmd = '%s --log %s -f -s dir' % [ self.class.fpm_exec_path, Packtory.config[:fpm_exec_log] || 'warn' ]
+
+      unless Packtory.config[:fpm_use_ruby_path].nil?
+        cmd = 'env FPM_USE_RUBY_PATH=%s %s' % [ Packtory.config[:fpm_use_ruby_path], cmd ]
+      end
 
       case opts[:type]
       when :rpm
         cmd << ' -t rpm --rpm-os linux'
       when :deb
         cmd << ' -t deb'
+      when :tgz
+        cmd << ' -t tar'
       else
         raise 'Unsupported type: %s' % opts[:type]
       end
@@ -56,7 +62,7 @@ module Packtory
 
       cmd << ' -p %s --after-install %s --template-scripts %s %s %s' %
              [ pkg_file,
-               after_install_script,
+               Packtory.after_install_script_path,
                package_dependencies,
                template_values,
                source_files_map(sfiles_map) ]
@@ -87,9 +93,5 @@ module Packtory
         end
       end.join(' ')
     end
-
-    def after_install_script
-      File.expand_path('../../../bin/support/after_install_script', __FILE__)
-    end
   end
 end

data/lib/packtory/packages.rb

@@ -0,0 +1,40 @@
+module Packtory
+  module Packages
+    PACKAGE_METHOD_MAP = {
+      :deb => :build_deb,
+      :rpm => :build_rpm,
+      :tgz => :build_tgz,
+      :brew => :build_brew
+    }
+
+    def self.build_package(opts = { })
+      packages = Packtory.config[:packages]
+      built = [ ]
+
+      packages.each do |pack|
+        build_method = PACKAGE_METHOD_MAP[pack]
+        unless build_method.nil?
+          built << send(build_method, opts)
+        end
+      end
+
+      built
+    end
+
+    def self.build_deb(opts = { })
+      DebPackage.build_package(opts)
+    end
+
+    def self.build_rpm(opts = { })
+      RpmPackage.build_package(opts)
+    end
+
+    def self.build_tgz(opts = { })
+      TgzPackage.build_package(opts)
+    end
+
+    def self.build_brew(opts = { })
+      BrewPackage.build_package(opts)
+    end
+  end
+end

data/lib/packtory/packer.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'bundler'
+require 'erb'
 
 module Packtory
   class Packer
@@ -8,135 +9,7 @@ module Packtory
     BUNDLE_PACKTORY_TOOLS_PATH = 'packtory_tools'
     BUNDLE_BUNDLER_SETUP_FILE = 'bundler/setup.rb'
 
-    PACKTORY_PACKFILE = 'Packfile'
-
-    DEFAULT_CONFIG = {
-      :path => nil,
-      :pkg_path => nil,
-      :gemspec => nil,
-      :gemfile => nil,
-      :binstub =>  nil,
-      :packages => nil,
-      :architecture => 'all',
-
-      # maybe specified, if wanting to override as set in gemspec file
-      :package_name => nil,
-      :working_path => nil,
-
-      :dependencies => { },
-      :bundle_working_path => nil,
-
-      :fpm_exec_path => nil,
-      :fpm_exec_verbose => false,
-      :fpm_exec_log => nil,
-
-      :bundler_silent => false,
-      :bundler_local => false,
-      :bundler_include => false
-    }
-
-    DEFAULT_PACKAGES = [ :deb, :rpm ]
-    DEFAULT_LOCAL_BIN_PATH = '/usr/local/bin'
-
-    PACKAGE_METHOD_MAP = {
-      :deb => :build_deb,
-      :rpm => :build_rpm
-    }
-
-    def self.load_patch
-      PatchBundlerNoMetadataDeps.patch!
-    end
-
-    def self.setup
-      load_patch
-      load_packfile
-      setup_defaults
-    end
-
-    def self.setup_defaults
-      if ENV.include?('PACKTORY_PACKAGES') && !ENV['PACKTORY_PACKAGES'].empty?
-        config[:packages] = ENV['PACKTORY_PACKAGES'].split(',').collect { |p| p.to_sym }
-      elsif config[:packages].nil?
-        config[:packages] = DEFAULT_PACKAGES
-      end
-
-      if ENV.include?('PACKTORY_BUNDLE_WORKING_PATH')
-        config[:bundle_working_path] = File.expand_path(ENV['PACKTORY_BUNDLE_WORKING_PATH'])
-      end
-
-      unless config[:dependencies].include?('ruby')
-        config[:dependencies]['ruby'] = nil
-      end
-    end
-
-    def self.load_packfile
-      packfile_path = nil
-
-      if ENV.include?('PACKTORY_PACKFILE')
-        packfile_path = File.expand_path(ENV['PACKTORY_PACKFILE'])
-      else
-        packfile_path = search_up(PACKTORY_PACKFILE)
-      end
-
-      unless packfile_path.nil?
-        load packfile_path
-      end
-
-      packfile_path
-    end
-
-    def self.search_up(*names)
-      previous = nil
-      current  = File.expand_path(config[:path] || Dir.pwd).untaint
-      found_path = nil
-
-      until !File.directory?(current) || current == previous || !found_path.nil?
-        names.each do |name|
-          path = File.join(current, name)
-          if File.exists?(path)
-            found_path = path
-            break
-          end
-        end
-
-        if found_path.nil?
-          previous = current
-          current = File.expand_path("..", current)
-        end
-      end
-
-      found_path
-    end
-
-    def self.configure
-      yield config
-    end
-
-    def self.config
-      if defined?(@@global_config)
-        @@global_config
-      else
-        @@global_config = DEFAULT_CONFIG.merge({ })
-      end
-    end
-
-    def self.build_package(opts = { })
-      packages = config[:packages]
-      packages.each do |pack|
-        build_method = PACKAGE_METHOD_MAP[pack]
-        unless build_method.nil?
-          send(build_method, opts)
-        end
-      end
-    end
-
-    def self.build_deb(opts = { })
-      DebPackage.build_package(opts)
-    end
-
-    def self.build_rpm(opts = { })
-      RpmPackage.build_package(opts)
-    end
+    DEFAULT_BIN_PATH = '/usr/local/bin'
 
     def self.silence_warnings
       original_verbosity = $VERBOSE
@@ -151,7 +24,7 @@ module Packtory
     attr_reader :gemspec_file
 
     def initialize(opts = { })
-      @opts = self.class.config.merge(opts)
+      @opts = Packtory.config.merge(opts)
 
       unless @opts[:gemfile].nil?
         @gemfile = Pathname.new(@opts[:gemfile])
@@ -241,11 +114,13 @@ module Packtory
           cached_gems[spec.name] = spec.source.send(:cached_gem, spec)
         end
 
-        if @opts[:bundler_include]
+        if detect_bundler_include
           bundler_source = Bundler::Source::Rubygems.new('remotes' => 'https://rubygems.org')
-          @bundler_spec = Bundler::RemoteSpecification.
-                           new('bundler', Bundler::VERSION,
-                               Gem::Platform::RUBY, bundler_source.fetchers.first)
+
+          @bundler_spec =
+            Bundler::RemoteSpecification.new('bundler', Bundler::VERSION,
+                                             Gem::Platform::RUBY, bundler_source.fetchers.first)
+
           @bundler_spec.remote = Bundler::Source::Rubygems::Remote.new(bundler_source.remotes.first)
 
           bundler_source.send(:fetch_gem, @bundler_spec)
@@ -365,15 +240,25 @@ GEMFILE
       @opts[:architecture]
     end
 
+    def detect_bundler_include
+      if @opts[:bundler_include]
+        true
+      elsif !gemspec.dependencies.detect { |d| d.name == 'bundler' }.nil?
+        true
+      else
+        false
+      end
+    end
+
     def bundle_gems
       bgems = { }
-      specs = bundler_definition.specs_for([ :default ])
 
+      specs = bundler_definition.specs_for([ :default ])
       specs.each do |spec|
         next if gemspec.nil? || spec.name == gemspec.name
 
         if spec.name == 'bundler'
-          if @opts[:bundler_include]
+          if detect_bundler_include
             spec = @bundler_spec
           else
             next
@@ -459,48 +344,37 @@ GEMFILE
         files = gather_packtory_tools_for_package(files)
       end
 
+      files[Packtory.bundler_setup_path] = { :target_path => File.join(BUNDLE_TARGET_PATH, BUNDLE_BUNDLER_SETUP_FILE) }
+
       files
     end
 
     def gather_packtory_tools_for_package(files)
-      gem_build_extensions_path = Packtory.gem_build_extensions_path
       target_tools_path = File.join(BUNDLE_PACKTORY_TOOLS_PATH)
 
+      gem_build_extensions_path = Packtory.gem_build_extensions_path
       files[gem_build_extensions_path] = File.join(target_tools_path, File.basename(gem_build_extensions_path))
 
+      after_install_script_path = Packtory.after_install_script_path
+      files[after_install_script_path] = { :target_path => File.join(target_tools_path,
+                                                                     File.basename(after_install_script_path)),
+                                           :values => { 'pg_PACKAGE_PATH' => '$(dirname "$this_dir")' } }
+
       files
     end
 
-    def create_bundle_setup_rb
-      bundle_setup_file = File.join(BUNDLE_TARGET_PATH, BUNDLE_BUNDLER_SETUP_FILE)
-      bundle_setup_path = File.join(package_working_path, package_name, bundle_setup_file)
-
-      FileUtils.mkpath(File.dirname(bundle_setup_path))
-
+    def for_each_bundle_gems(&block)
       bgems = bundle_gems
-      File.open(bundle_setup_path, 'w') do |f|
-        f.puts '# Adding require paths to load path (empty if no gems is needed)'
-        f.puts ''
-
-        bgems.each do |gem_name, bhash|
-          spec = bhash[:spec]
-          f.puts '# == Gem: %s, version: %s' % [ spec.name, spec.version ]
-
-          src_paths = bhash[:require_paths]
-          if src_paths.count > 0
-            rpaths = src_paths.dup
-          else
-            rpaths = [ '/lib' ]
-          end
-
-          rpaths.each do |rpath|
-            load_path_line = "$:.unshift File.expand_path('../../%s%s', __FILE__)" % [ gem_name, rpath ]
-            f.puts(load_path_line)
-          end
+      bgems.each do |gem_name, bhash|
+        src_paths = bhash[:require_paths]
+        if src_paths.count > 0
+          rpaths = src_paths.dup
+        else
+          rpaths = [ '/lib' ]
         end
-      end
 
-      [ bundle_setup_file, bundle_setup_path ]
+        yield(gem_name, bhash, rpaths)
+      end
     end
 
     def gather_files
@@ -514,27 +388,76 @@ GEMFILE
 
       files = gather_files_for_package
       files.each do |fsrc, ftarget|
+        tvalues = nil
+
         if fsrc =~ /^\//
           fsrc_path = fsrc
-      else
-        fsrc_path = File.join(root_path, fsrc)
+        else
+          fsrc_path = File.join(root_path, fsrc)
         end
 
-        ftarget_path = File.join(prefix_path, ftarget)
+        case ftarget
+        when String
+          ftarget_path = File.join(prefix_path, ftarget)
+        when Hash
+          ftarget_path = File.join(prefix_path, ftarget[:target_path])
+          tvalues = ftarget[:values]
+        end
 
         FileUtils.mkpath(File.dirname(ftarget_path))
         FileUtils.cp_r(fsrc_path, ftarget_path)
-      end
 
-      fsrc, ftarget = create_bundle_setup_rb
-      files[fsrc] = ftarget
+        if ftarget.is_a?(Hash)
+          tf = TemplateFile.new(self, ftarget_path, tvalues)
+          tf.evaluate!
+        end
+
+        ftarget_path
+      end
 
       files
     end
 
+    class TemplateFile
+      def initialize(packer, file_path, tvalues)
+        @packer = packer
+        @file_path = file_path
+        @tvalues = tvalues
+      end
+
+      def evaluate!
+        erb = ERB.new(File.read(@file_path), nil, '-', '@output_buffer')
+        File.write(@file_path, erb.result(binding))
+
+        @file_path
+      end
+
+      def packer; @packer; end
+
+      def concat(str)
+        @output_buffer << str
+      end
+
+      private
+
+      def method_missing(k, *args)
+        if @tvalues.nil?
+          super
+        elsif @tvalues.include?(k.to_s)
+          @tvalues[k.to_s]
+        elsif @tvalues.include?(k)
+          @tvalues[k]
+        else
+          super
+        end
+      end
+    end
+
     def create_binstub(binstub_fname, prefix_path)
       binstub_code = <<CODE
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
+
+ENV['RUBY_PATH'] = '/usr/bin/ruby'
 
 require "%s"
 load "%s"
@@ -543,10 +466,16 @@ CODE
       src_bin_path = File.join(package_working_path, 'bin', binstub_fname)
       FileUtils.mkpath(File.dirname(src_bin_path))
 
-      bundler_setup_path = File.join(prefix_path, package_name, BUNDLE_TARGET_PATH, BUNDLE_BUNDLER_SETUP_FILE)
+      if @opts[:install_as_subpath]
+        target_path = File.join(prefix_path, package_name, package_name)
+      else
+        target_path = File.join(prefix_path, package_name)
+      end
+
+      bundler_setup_path = File.join(target_path, BUNDLE_TARGET_PATH, BUNDLE_BUNDLER_SETUP_FILE)
 
       bindir_name = gemspec.nil? ? 'bin' : gemspec.bindir
-      actual_bin_path = File.join(prefix_path, package_name, bindir_name, binstub_fname)
+      actual_bin_path = File.join(target_path, bindir_name, binstub_fname)
 
       File.open(src_bin_path, 'w') { |f| f.write(binstub_code % [ bundler_setup_path, actual_bin_path ]) }
       FileUtils.chmod(0755, src_bin_path)
@@ -554,27 +483,25 @@ CODE
       src_bin_path
     end
 
-    def build_source_files(prefix_path)
+    def build_file_map(prefix_path, package_path = nil)
       files = { }
 
       source_path = File.join(package_working_path, package_name, '/')
-      target_path = File.join(prefix_path, package_name)
+      target_path = File.join(package_path || prefix_path, package_name)
       files[source_path] = target_path
 
       files
     end
 
-    def prepare_files(prefix_path)
-      gather_files
-
-      files = build_source_files(prefix_path)
+    def add_bin_files(files, prefix_path, package_path = nil)
+      bin_path = @opts[:bin_path] || DEFAULT_BIN_PATH
 
       if @opts[:binstub].nil?
         unless gemspec.nil? || gemspec.executables.nil? || gemspec.executables.empty?
           @opts[:binstub] = { }
 
           gemspec.executables.each do |exec_fname|
-            @opts[:binstub][exec_fname] = File.join(DEFAULT_LOCAL_BIN_PATH, exec_fname)
+            @opts[:binstub][exec_fname] = File.join(bin_path, exec_fname)
           end
         end
       end
@@ -586,5 +513,14 @@ CODE
 
       files
     end
+
+    def prepare_files(prefix_path, package_path = nil)
+      gather_files
+
+      files = build_file_map(prefix_path, package_path)
+      files = add_bin_files(files, prefix_path, package_path)
+
+      files
+    end
   end
 end

data/lib/packtory/rpm_package.rb

@@ -12,7 +12,11 @@ module Packtory
       package_filename = '%s_%s_%s.rpm' % [ packager.package_name, packager.version, packager.architecture ]
       pkg_file_path = fpm_exec.build(sfiles_map, package_filename, type: :rpm)
 
-      Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      if File.exist?(pkg_file_path)
+        Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      else
+        Bundler.ui.error '[ERROR] Package not found: %s' % [ pkg_file_path ]
+      end
 
       [ packager, pkg_file_path ]
     end

data/lib/packtory/tgz_package.rb

@@ -0,0 +1,24 @@
+require 'bundler'
+
+module Packtory
+  class TgzPackage
+    INSTALL_PREFIX = '.'
+
+    def self.build_package(opts = { })
+      packager = Packer.new({ :binstub => { } }.merge(opts))
+      fpm_exec = FpmExec.new(packager, INSTALL_PREFIX)
+
+      sfiles_map = packager.prepare_files(INSTALL_PREFIX)
+      package_filename = '%s_%s_%s.tar.gz' % [ packager.package_name, packager.version, packager.architecture ]
+      pkg_file_path = fpm_exec.build(sfiles_map, package_filename, type: :tgz)
+
+      if File.exist?(pkg_file_path)
+        Bundler.ui.info 'Created package: %s (%s bytes)' % [ pkg_file_path, File.size(pkg_file_path) ]
+      else
+        Bundler.ui.error '[ERROR] Package not found: %s' % [ pkg_file_path ]
+      end
+
+      [ packager, pkg_file_path ]
+    end
+  end
+end

data/lib/packtory/version.rb

@@ -1,3 +1,3 @@
 module Packtory
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/packtory.rb

@@ -4,15 +4,37 @@ module Packtory
   autoload :VERSION, File.expand_path('../packtory/version', __FILE__)
   autoload :Command, File.expand_path('../packtory/command', __FILE__)
 
+  autoload :Config, File.expand_path('../packtory/config', __FILE__)
+
   autoload :PatchBundlerNoMetadataDeps, File.expand_path('../packtory/patch_bundler_no_metadata_deps', __FILE__)
-  autoload :DebPackage, File.expand_path('../packtory/deb_package', __FILE__)
-  autoload :RpmPackage, File.expand_path('../packtory/rpm_package', __FILE__)
   autoload :FpmExec, File.expand_path('../packtory/fpm_exec', __FILE__)
   autoload :Packer, File.expand_path('../packtory/packer', __FILE__)
 
+  autoload :Packages, File.expand_path('../packtory/packages', __FILE__)
+  autoload :DebPackage, File.expand_path('../packtory/deb_package', __FILE__)
+  autoload :RpmPackage, File.expand_path('../packtory/rpm_package', __FILE__)
+  autoload :TgzPackage, File.expand_path('../packtory/tgz_package', __FILE__)
+  autoload :BrewPackage, File.expand_path('../packtory/brew_package', __FILE__)
+
   # TODO: Evaluate and refactor
   autoload :RakeTask, File.expand_path('../packtory/rake_task', __FILE__)
 
+  def self.config
+    Config.config
+  end
+
+  def self.setup
+    Config.setup
+  end
+
+  def self.build_package
+    Packages.build_package
+  end
+
+  def self.after_install_script_path
+    File.expand_path('../../bin/support/after_install_script', __FILE__)
+  end
+
   def self.gem_build_extensions_path
     File.expand_path('../../bin/support/gem_build_extensions', __FILE__)
   end
@@ -20,4 +42,8 @@ module Packtory
   def self.bin_support_fpm_path
     File.expand_path('../../bin/support/fpm', __FILE__)
   end
+
+  def self.bundler_setup_path
+    File.expand_path('../packtory/bundler/setup.rb', __FILE__)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packtory
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mark John Buenconsejo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,10 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  An easy to use system packaging tool for your Ruby
-  gems. Build package for Debian, RPM, and _soon_ Homebrew, directly
-  from your gem repo.
+description: An easy to use system packaging tool for your Ruby gems. Build package
+  for Debian, RPM, and _soon_ Homebrew, directly from your gem repo.
 email: hello@gemfury.com
 executables:
 - packtory
@@ -55,13 +53,18 @@ files:
 - bin/support/fpm_vendor_ruby
 - bin/support/gem_build_extensions
 - lib/packtory.rb
+- lib/packtory/brew_package.rb
+- lib/packtory/bundler/setup.rb
 - lib/packtory/command.rb
+- lib/packtory/config.rb
 - lib/packtory/deb_package.rb
 - lib/packtory/fpm_exec.rb
+- lib/packtory/packages.rb
 - lib/packtory/packer.rb
 - lib/packtory/patch_bundler_no_metadata_deps.rb
 - lib/packtory/rake_task.rb
 - lib/packtory/rpm_package.rb
+- lib/packtory/tgz_package.rb
 - lib/packtory/version.rb
 homepage: https://gemfury.com
 licenses: