omnibus 1.2.0 → 1.3.0

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 1.3.0 (December 6, 2013)
+
+FEATURES:
+
+* Add `build_retries` global config value (still 3 by default). ([@fujin][], [#63][])
+* Add support for pre-install scripts. ([@christophermaier][])
+* Add support for `*.tar.xz` files. ([@jf647][], [#71][])
+* Add `erb` builder command. ([@ohlol][], [#79][])
+* Add `package_user`, `package_group` to project definitions for setting 
+  user and group ownership for of deb/rpm/solaris packages. ([@ohlol][], [#80][])
+* Add `config_file` to project definitions for passing `--config-files` 
+  options to the `fpm` builder commands. ([@christophergeers][], [#85][])
+
+IMPROVEMENTS:
+
+* Bump default cpus to get better throughput when Ohai is wrong. ([@lamont-granquist][])
+* Whitelist `libnsl` on Arch Linux. ([@sl4mmy][], [#67][])
+* Switch to using pkgmk for Solaris. ([@lamont-granquist][], [#72][])
+* Remove make install from c-example. ([@johntdyer][], [#73][])
+* Update Vagrantfile template to use provisionerless base boxes. ([@schisamo][], [#74][])
+* Allow access to `Omnibus.project_root` in builder blocks. ([@ohlol][], [#78][])
+* Refactor how we handle loading dirs for software files. ([@benjaminws][], [#82][])
+* Update depdencies: ([@schisamo][], [#86][])
+  * fpm 1.0.0
+  * mixlib-config 2.1.0
+  * mixlib-shellout 1.3.0
+
+BUG FIXES:
+
+* Properly handle `HTTP_PROXY_USER` and `HTTP_PROXY_PASS`. ([@databus23][], [#77][])
+* Fix the incorrect error message logged when the Git fetcher failed to 
+  resolve refs to commits. ([@mumoshu][], [#81][])
+* Removin unsupported `config.ssh.max_tries` and `config.ssh.timeout` 
+  from Vagrantfile template. ([@totally][], [#83][])
+* Mention the required Vagrant plugins. ([@jacobvosmaer][], [#70][])
+
 ## 1.2.0 (July 12, 2013)
 
 FEATURES:
@@ -94,3 +130,35 @@ BUG FIXES:
 ## 1.0.0 (April 21, 2013)
 
 * The initial release.
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#63]: https://github.com/opscode/omnibus-ruby/issues/63
+[#67]: https://github.com/opscode/omnibus-ruby/issues/67
+[#70]: https://github.com/opscode/omnibus-ruby/issues/70
+[#71]: https://github.com/opscode/omnibus-ruby/issues/71
+[#72]: https://github.com/opscode/omnibus-ruby/issues/72
+[#73]: https://github.com/opscode/omnibus-ruby/issues/73
+[#74]: https://github.com/opscode/omnibus-ruby/issues/74
+[#77]: https://github.com/opscode/omnibus-ruby/issues/77
+[#78]: https://github.com/opscode/omnibus-ruby/issues/78
+[#79]: https://github.com/opscode/omnibus-ruby/issues/79
+[#80]: https://github.com/opscode/omnibus-ruby/issues/80
+[#81]: https://github.com/opscode/omnibus-ruby/issues/81
+[#82]: https://github.com/opscode/omnibus-ruby/issues/82
+[#83]: https://github.com/opscode/omnibus-ruby/issues/83
+[#85]: https://github.com/opscode/omnibus-ruby/issues/85
+[#86]: https://github.com/opscode/omnibus-ruby/issues/86
+[@benjaminws]: https://github.com/benjaminws
+[@christophergeers]: https://github.com/christophergeers
+[@christophermaier]: https://github.com/christophermaier
+[@databus23]: https://github.com/databus23
+[@fujin]: https://github.com/fujin
+[@jacobvosmaer]: https://github.com/jacobvosmaer
+[@jf647]: https://github.com/jf647
+[@johntdyer]: https://github.com/johntdyer
+[@lamont-granquist]: https://github.com/lamont-granquist
+[@mumoshu]: https://github.com/mumoshu
+[@ohlol]: https://github.com/ohlol
+[@schisamo]: https://github.com/schisamo
+[@sl4mmy]: https://github.com/sl4mmy
+[@totally]: https://github.com/totally

data/README.md

@@ -23,6 +23,8 @@ need the following:
 Though not *strictly* necessary, Vagrant makes using Omnibus easier,
 and is highly recommended.
 - Vagrant 1.2.1 or later (http://www.vagrantup.com)
+- the vagrant-berkshelf plugin (https://github.com/RiotGames/vagrant-berkshelf)
+- the vagrant-omnibus plugin (https://github.com/schisamo/vagrant-omnibus)
 
 ## Get Started
 

data/lib/omnibus.rb

@@ -154,6 +154,17 @@ module Omnibus
     ruby_files(File.join(project_root, Config.software_dir))
   end
 
+  # Return directories to search for {Omnibus::Software} DSL files.
+  #
+  # @return [Array<String>]
+  def self.software_dirs
+    @software_dirs ||= begin
+      software_dirs = [File.join(project_root, Config.software_dir)]
+      software_dirs << File.join(omnibus_software_root, 'config', 'software') if omnibus_software_root
+      software_dirs
+    end
+  end
+
   # Backward compat alias
   #
   # @todo print a deprecation message
@@ -288,9 +299,7 @@ module Omnibus
     dep_file = software_map[dependency_name]
 
     unless dep_file
-      raise MissingProjectDependency.new(dependency_name,
-                                         [File.join(project_root, Config.software_dir),
-                                          File.join(omnibus_software_root, 'config', 'software')])
+      raise MissingProjectDependency.new(dependency_name, software_dirs)
     end
 
     dep_software = Omnibus::Software.load(dep_file, project, overrides)

data/lib/omnibus/builder.rb

@@ -17,6 +17,7 @@
 
 require 'forwardable'
 require 'omnibus/exceptions'
+require 'ostruct'
 
 module Omnibus
   class Builder
@@ -31,6 +32,7 @@ module Omnibus
       # @todo def_delegators :@builder, :patch, :command, :ruby, ...
 
       def_delegator :@builder, :patch
+      def_delegator :@builder, :erb
       def_delegator :@builder, :command
       def_delegator :@builder, :ruby
       def_delegator :@builder, :gem
@@ -38,6 +40,7 @@ module Omnibus
       def_delegator :@builder, :rake
       def_delegator :@builder, :block
       def_delegator :@builder, :name
+      def_delegator :@builder, :project_root
 
       def initialize(builder, software)
         @builder, @software = builder, software
@@ -149,6 +152,25 @@ module Omnibus
       end
     end
 
+    def erb(*args)
+      args = args.dup.pop
+
+      source_path = File.expand_path("#{Omnibus.project_root}/config/templates/#{name}/#{args[:source]}")
+
+      unless File.exists?(source_path)
+        raise MissingTemplate.new(args[:source], "#{Omnibus.project_root}/config/templates/#{name}")
+      end
+
+      block do
+        template = ERB.new(File.new(source_path).read, nil, "%")
+        File.open(args[:dest], "w") do |file|
+          file.write(template.result(OpenStruct.new(args[:vars]).instance_eval { binding }))
+        end
+
+        File.chmod(args[:mode], args[:dest])
+      end
+    end
+
     # @todo all these ruby commands (ruby, gem, bundle, rake) could
     #   all be collapsed into a single underlying implementation, since
     #   they all just differ on the executable being called
@@ -172,6 +194,10 @@ module Omnibus
       @build_commands << rb_block
     end
 
+    def project_root
+      Omnibus.project_root
+    end
+
     def project_dir
       @software.project_dir
     end
@@ -213,6 +239,10 @@ module Omnibus
       raise
     end
 
+    def build_retries
+      Omnibus.config[:build_retries]
+    end
+
     def execute_sh(cmd)
       retries ||= 0
       shell = nil
@@ -243,10 +273,11 @@ module Omnibus
         shell.error!
       end
     rescue Exception => e
+      raise if build_retries.nil? || build_retries == 0
       # Getting lots of errors from github, particularly with erlang/rebar
       # projects fetching tons of deps via git all the time. This isn't a
       # particularly elegant way to solve that problem. But it should work.
-      if retries >= 3
+      if retries >= build_retries
         ErrorReporter.new(e, self).explain("Failed to build #{name} while running `#{cmd_string}` with #{cmd_opts_for_display}")
         raise
       else

data/lib/omnibus/cli/application.rb

@@ -85,7 +85,7 @@ module Omnibus
         template(File.join("Vagrantfile.erb"), File.join(target, "Vagrantfile"), opts)
 
         # render out stub packge scripts
-        %w{ makeselfinst postinst postrm }.each do |package_script|
+        %w{ makeselfinst preinst prerm postinst postrm }.each do |package_script|
           script_path = File.join(target, "package-scripts", name, package_script)
           template_path = File.join("package_scripts", "#{package_script}.erb")
           # render the package script

data/lib/omnibus/config.rb

@@ -197,6 +197,13 @@ module Omnibus
 
     # # @!endgroup
 
+    # @!group Build Control Parameters
+
+    # @! attribute [rw] build_retries
+    #
+    #   @return [Integer, nil]
+    build_retries 3
+
     # @!group Validation Methods
 
     # Asserts that the Config object is in a valid state.  If invalid

data/lib/omnibus/exceptions.rb

@@ -126,6 +126,21 @@ module Omnibus
     end
   end
 
+  class MissingTemplate < RuntimeError
+    def initialize(template_name, search_paths)
+      @template_name, @search_paths = template_name, search_paths
+    end
+
+    def to_s
+      """
+      Attempting to evaluate the template #{@template_name}, but it was not
+      found at any of the following locations:
+
+      #{@search_paths.join("\n      ")}
+      """
+    end
+  end
+
   class MissingProjectDependency < RuntimeError
     def initialize(dep_name, search_paths)
       @dep_name, @search_paths = dep_name, search_paths

data/lib/omnibus/fetchers/git_fetcher.rb

@@ -164,7 +164,7 @@ E
       commit_ref
     rescue Exception => e
       if retries >= 3
-        ErrorReporter.new(e, self).explain("Failed to fetch git repository '#{@source[:git]}'")
+        ErrorReporter.new(e, self).explain("Failed to find any commits for the ref '#{ref}'")
         raise
       else
         # Deal with github failing all the time :(

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -88,7 +88,12 @@ E
       end
 
       req = Net::HTTP::Get.new(url.request_uri, headers)
-      http_client = Net::HTTP.new(url.host, url.port)
+
+      http_client = if http_proxy && !excluded_from_proxy?(url.host)
+        Net::HTTP::Proxy(http_proxy.host, http_proxy.port, http_proxy.user, http_proxy.password).new(url.host, url.port)
+      else
+        Net::HTTP.new(url.host, url.port)
+      end
       http_client.use_ssl = (url.scheme == "https")
 
       response = http_client.start { |http| http.request(req) }
@@ -104,6 +109,31 @@ E
       end
     end
 
+    # search environment variable as given, all lowercase and all upper case
+    def get_env(name)
+      ENV[name] || ENV[name.downcase] || ENV[name.upcase] || nil
+    end
+
+    # constructs a http_proxy uri from HTTP_PROXY* env vars
+    def http_proxy
+      @http_proxy ||= begin
+        proxy = get_env('HTTP_PROXY') or return
+        proxy = "http://#{proxy}" unless proxy =~ /^https?:/
+        uri = URI.parse(proxy)
+        uri.user ||= get_env('HTTP_PROXY_USER')
+        uri.password ||= get_env('HTTP_PROXY_PASS')
+        uri
+      end
+    end
+
+    # return true if the host is excluded from proxying via the no_proxy directive.
+    # the 'no_proxy' variable contains a list of host suffixes separated by comma
+    # example: example.com,www.examle.org,localhost
+    def excluded_from_proxy?(host)
+      no_proxy = get_env('no_proxy') || ""
+      no_proxy.split(/\s*,\s*/).any? { |pattern| host.end_with? pattern }
+    end
+
     def download
       tries = 5
       begin
@@ -179,6 +209,8 @@ E
         "7z.exe x #{project_file} -o#{source_dir} -r -y"
       elsif project_file.end_with?(".zip")
         "unzip #{project_file} -d #{source_dir}"
+      elsif project_file.end_with?(".xz") || project_file.end_with?(".txz")
+        "xz -dc #{project_file} | ( cd #{source_dir} && tar -xf - )"
       else
         #if we don't recognize the extension, simply copy over the file
         Proc.new do

data/lib/omnibus/health_check.rb

@@ -44,6 +44,7 @@ module Omnibus
                            /libffi\.so/,
                            /libgdbm\.so/,
                            /libm\.so/,
+                           /libnsl\.so/,
                            /libpthread\.so/,
                            /librt\.so/,
                            /libutil\.so/
@@ -188,7 +189,7 @@ module Omnibus
           log "      PROVIDED BY: #{location}"
           log "      FAILED BECAUSE: #{reason}"
         end
-	raise "Health Check Failed"
+        raise "Health Check Failed"
       end
     end
 

data/lib/omnibus/project.rb

@@ -18,6 +18,7 @@ require 'omnibus/artifact'
 require 'omnibus/exceptions'
 require 'omnibus/library'
 require 'omnibus/util'
+require 'time'
 
 module Omnibus
 
@@ -65,6 +66,7 @@ module Omnibus
 
       @exclusions = Array.new
       @conflicts = Array.new
+      @config_files = Array.new
       @dependencies = Array.new
       @runtime_dependencies = Array.new
       instance_eval(io)
@@ -240,6 +242,24 @@ module Omnibus
       @build_iteration || 1
     end
 
+    # Set or retrieve the {deb/rpm/solaris}-user fpm argument.
+    #
+    # @param val [String]
+    # @return [String]
+    def package_user(val=NULL_ARG)
+      @pkg_user = val unless val.equal?(NULL_ARG)
+      @pkg_user
+    end
+
+    # Set or retrieve the {deb/rpm/solaris}-group fpm argument.
+    #
+    # @param val [String]
+    # @return [String]
+    def package_group(val=NULL_ARG)
+      @pkg_group = val unless val.equal?(NULL_ARG)
+      @pkg_group
+    end
+
     # Add an Omnibus software dependency.
     #
     # Note that this is a *build time* dependency.  If you need to
@@ -295,6 +315,14 @@ module Omnibus
       @exclusions << pattern
     end
 
+    # Add a config file.
+    #
+    # @param val [String] the name of a config file of your software
+    # @return [void]
+    def config_file(val)
+      @config_files << val
+    end
+
     # Returns the platform version of the machine on which Omnibus is
     # running, as determined by Ohai.
     #
@@ -381,7 +409,7 @@ module Omnibus
       when 'aix'
         [ "bff" ]
       when 'solaris2'
-        [ "solaris" ]
+        [ "pkgmk" ]
       when 'windows'
         [ "msi" ]
       else
@@ -461,6 +489,8 @@ module Omnibus
         "#{package_name}-#{build_version}-#{iteration}.msi"
       when "bff"
         "#{package_name}.#{bff_version}.bff"
+      when "pkgmk"
+        "#{package_name}-#{build_version}-#{iteration}.solaris"
       else # fpm
         require "fpm/package/#{pkg_type}"
         pkg = FPM::Package.types[pkg_type].new
@@ -503,10 +533,11 @@ module Omnibus
     end
 
     def bff_command
-      bff_command = ["mkinstallp -d / -T /tmp/bff/gen.template"]
+      bff_command = ["sudo /usr/sbin/mkinstallp -d / -T /tmp/bff/gen.template"]
       [bff_command.join(" "), {:returns => [0]}]
     end
 
+
     # The {https://github.com/jordansissel/fpm fpm} command to
     # generate a package for RedHat, Ubuntu, Solaris, etc. platforms.
     #
@@ -532,21 +563,29 @@ module Omnibus
                           "-m '#{maintainer}'",
                           "--description '#{description}'",
                           "--url #{homepage}"]
+      if File.exist?(File.join(package_scripts_path, "preinst"))
+        command_and_opts << "--before-install '#{File.join(package_scripts_path, "preinst")}'"
+      end
+
       if File.exist?("#{package_scripts_path}/postinst")
-        command_and_opts << "--post-install '#{package_scripts_path}/postinst'"
+        command_and_opts << "--after-install '#{File.join(package_scripts_path, "postinst")}'"
       end
       # solaris packages don't support --pre-uninstall
-      if File.exist?("#{package_scripts_path}/prerm") && pkg_type != "solaris"
-        command_and_opts << "--pre-uninstall '#{package_scripts_path}/prerm'"
+      if File.exist?("#{package_scripts_path}/prerm")
+        command_and_opts << "--before-remove '#{File.join(package_scripts_path, "prerm")}'"
       end
       # solaris packages don't support --post-uninstall
-      if File.exist?("#{package_scripts_path}/postrm") && pkg_type != "solaris"
-        command_and_opts << "--post-uninstall '#{package_scripts_path}/postrm'"
+      if File.exist?("#{package_scripts_path}/postrm")
+        command_and_opts << "--after-remove '#{File.join(package_scripts_path, "postrm")}'"
       end
 
       @exclusions.each do |pattern|
         command_and_opts << "--exclude '#{pattern}'"
       end
+      
+      @config_files.each do |config_file|
+        command_and_opts << "--config-files '#{config_file}'"
+      end
 
       @runtime_dependencies.each do |runtime_dep|
         command_and_opts << "--depends '#{runtime_dep}'"
@@ -556,6 +595,18 @@ module Omnibus
         command_and_opts << "--conflicts '#{conflict}'"
       end
 
+      if @pkg_user
+        %w[ deb rpm solaris ].each do |type|
+          command_and_opts << " --#{type}-user #{@pkg_user}"
+        end
+      end
+
+      if @pkg_group
+        %w[ deb rpm solaris ].each do |type|
+          command_and_opts << " --#{type}-group #{@pkg_group}"
+        end
+      end
+
       command_and_opts << " --replaces #{@replaces}" if @replaces
       command_and_opts << install_path
       command_and_opts
@@ -602,7 +653,7 @@ module Omnibus
     end
 
     def run_bff
-      FileUtils.rm_rf "/.info"
+      FileUtils.rm_rf "/.info/*"
       FileUtils.rm_rf "/tmp/bff"
       FileUtils.mkdir "/tmp/bff"
 
@@ -621,6 +672,65 @@ module Omnibus
       FileUtils.cp "/tmp/chef.#{bff_version}.bff", "/var/cache/omnibus/pkg/chef.#{bff_version}.bff"
     end
 
+    def pkgmk_version
+      "#{build_version}-#{iteration}"
+    end
+
+    def run_pkgmk
+      install_dirname = File.dirname(install_path)
+      install_basename = File.basename(install_path)
+
+      system "sudo rm -rf /tmp/pkgmk"
+      FileUtils.mkdir "/tmp/pkgmk"
+
+      system "cd #{install_dirname} && find #{install_basename} -print > /tmp/pkgmk/files"
+
+      prototype_content = <<-EOF
+i pkginfo
+i postinstall
+i postremove
+      EOF
+
+      File.open "/tmp/pkgmk/Prototype", "w+" do |f|
+        f.write prototype_content
+      end
+
+      # generate the prototype's file list
+      system "cd #{install_dirname} && pkgproto < /tmp/pkgmk/files > /tmp/pkgmk/Prototype.files"
+
+      # fix up the user and group in the file list to root
+      system "awk '{ $5 = \"root\"; $6 = \"root\"; print }' < /tmp/pkgmk/Prototype.files >> /tmp/pkgmk/Prototype"
+
+      pkginfo_content = <<-EOF
+CLASSES=none
+TZ=PST
+PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
+BASEDIR=#{install_dirname}
+PKG=#{package_name}
+NAME=#{package_name}
+ARCH=#{`uname -p`.chomp}
+VERSION=#{pkgmk_version}
+CATEGORY=application
+DESC=#{description}
+VENDOR=#{maintainer}
+EMAIL=#{maintainer}
+PSTAMP=#{`hostname`.chomp + Time.now.utc.iso8601}
+      EOF
+
+      File.open "/tmp/pkgmk/pkginfo", "w+" do |f|
+        f.write pkginfo_content
+      end
+
+      FileUtils.cp "#{package_scripts_path}/postinst", "/tmp/pkgmk/postinstall"
+      FileUtils.cp "#{package_scripts_path}/postrm", "/tmp/pkgmk/postremove"
+
+      shellout!("pkgmk -o -r #{install_dirname} -d /tmp/pkgmk -f /tmp/pkgmk/Prototype", :timeout => 3600)
+
+      system "pkgchk -vd /tmp/pkgmk chef"
+
+      system "pkgtrans /tmp/pkgmk /var/cache/omnibus/pkg/#{output_package("pkgmk")} chef"
+    end
+
     # Runs the necessary command to make a package with fpm. As a side-effect,
     # sets `output_package`
     # @return void
@@ -672,6 +782,8 @@ module Omnibus
                 run_msi
               elsif pkg_type == "bff"
                 run_bff
+              elsif pkg_type == "pkgmk"
+                run_pkgmk
               else # pkg_type == "fpm"
                 run_fpm(pkg_type)
               end

data/lib/omnibus/software.rb

@@ -262,7 +262,7 @@ module Omnibus
       if OHAI.cpu && OHAI.cpu[:total] && OHAI.cpu[:total].to_s =~ /^\d+$/
         OHAI.cpu[:total].to_i + 1
       else
-        2
+        3
       end
     end
 

data/lib/omnibus/templates/Gemfile.erb

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'omnibus', '~> 1.2.0'
+gem 'omnibus', '~> 1.3.0'
 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'

data/lib/omnibus/templates/Vagrantfile.erb

@@ -1,72 +1,52 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require "vagrant"
+require 'vagrant'
 
-if Vagrant::VERSION < "1.2.1"
-  raise "The Omnibus Build Lab is only compatible with Vagrant 1.2.1+"
+if Vagrant::VERSION < '1.2.1'
+  raise 'The Omnibus Build Lab is only compatible with Vagrant 1.2.1+'
 end
 
-host_project_path = File.expand_path("..", __FILE__)
+host_project_path = File.expand_path('..', __FILE__)
 guest_project_path = "/home/vagrant/#{File.basename(host_project_path)}"
-project_name = "<%= config[:name] %>"
+project_name = '<%= config[:name] %>'
 
-Vagrant.configure("2") do |config|
+Vagrant.configure('2') do |config|
 
   config.vm.hostname = "#{project_name}-omnibus-build-lab"
 
-  config.vm.define 'ubuntu-10.04' do |c|
-    c.berkshelf.berksfile_path = "./Berksfile"
-    c.vm.box = "opscode-ubuntu-10.04"
-    c.vm.box_url = "http://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box"
-  end
-
-  config.vm.define 'ubuntu-11.04' do |c|
-    c.berkshelf.berksfile_path = "./Berksfile"
-    c.vm.box = "opscode-ubuntu-11.04"
-    c.vm.box_url = "http://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-11.04.box"
-  end
+  %w{
+    ubuntu-10.04
+    ubuntu-11.04
+    ubuntu-12.04
+    centos-5.10
+    centos-6.5
+  }.each do |platform|
 
-  config.vm.define 'ubuntu-12.04' do |c|
-    c.berkshelf.berksfile_path = "./Berksfile"
-    c.vm.box = "canonical-ubuntu-12.04"
-    c.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
-  end
+    config.vm.define platform do |c|
+      c.vm.box = "opscode-#{platform}"
+      c.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_#{platform}_chef-provisionerless.box"
+    end
 
-  config.vm.define 'centos-5' do |c|
-    c.berkshelf.berksfile_path = "./Berksfile"
-    c.vm.box = "opscode-centos-5.8"
-    c.vm.box_url = "http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box"
-  end
-
-  config.vm.define 'centos-6' do |c|
-    c.berkshelf.berksfile_path = "./Berksfile"
-    c.vm.box = "opscode-centos-6.3"
-    c.vm.box_url = "http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box"
   end
 
   config.vm.provider :virtualbox do |vb|
     # Give enough horsepower to build without taking all day.
     vb.customize [
-      "modifyvm", :id,
-      "--memory", "1536",
-      "--cpus", "2"
+      'modifyvm', :id,
+      '--memory', '1536',
+      '--cpus', '2'
     ]
   end
 
   # Ensure a recent version of the Chef Omnibus packages are installed
-  config.omnibus.chef_version = :latest
+  config.omnibus.chef_version = '11.6.2'
 
   # Enable the berkshelf-vagrant plugin
   config.berkshelf.enabled = true
-  # The path to the Berksfile to use with Vagrant Berkshelf
-  config.berkshelf.berksfile_path = "./Berksfile"
-
-  config.ssh.max_tries = 40
-  config.ssh.timeout   = 120
   config.ssh.forward_agent = true
 
-  host_project_path = File.expand_path("..", __FILE__)
+  host_project_path = File.expand_path('..', __FILE__)
   guest_project_path = "/home/vagrant/#{File.basename(host_project_path)}"
 
   config.vm.synced_folder host_project_path, guest_project_path
@@ -74,15 +54,15 @@ Vagrant.configure("2") do |config|
   # prepare VM to be an Omnibus builder
   config.vm.provision :chef_solo do |chef|
     chef.json = {
-      "omnibus" => {
-        "build_user" => "vagrant",
-        "build_dir" => guest_project_path,
-        "install_dir" => "/opt/#{project_name}"
+      'omnibus' => {
+        'build_user' => 'vagrant',
+        'build_dir' => guest_project_path,
+        'install_dir' => "/opt/#{project_name}"
       }
     }
 
     chef.run_list = [
-      "recipe[omnibus::default]"
+      'recipe[omnibus::default]'
     ]
   end
 

data/lib/omnibus/templates/omnibus.rb.example.erb

@@ -3,3 +3,4 @@
 # s3_bucket "some-bucket"
 # use_s3_caching true
 # solaris_compiler "gcc"
+# build_retries 3

data/lib/omnibus/templates/package_scripts/preinst.erb

@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Perform necessary <%= config[:name] %> setup steps
+# before package is installed.
+#
+
+echo "You're about to install <%= config[:name] %>!"

data/lib/omnibus/templates/package_scripts/prerm.erb

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Perform necessary <%= config[:name] %> setup steps
+# prior to installing package.
+#
+
+PROGNAME=$(basename $0)
+
+function error_exit
+{
+  echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2
+  exit 1
+}
+
+exit 0

data/lib/omnibus/templates/software/c-example.rb.erb

@@ -38,5 +38,5 @@ build do
            "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env
 
   command "make -j #{max_build_jobs}", :env => env
-  command "make install"
+
 end

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/omnibus.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "mixlib-shellout", "~> 1.0"
-  gem.add_dependency "mixlib-config", "~> 1.1.2"
+  gem.add_dependency "mixlib-shellout", "~> 1.3.0"
+  gem.add_dependency "mixlib-config", "~> 2.1.0"
   gem.add_dependency "ohai", ">= 0.6.12"
   gem.add_dependency "rake", ">= 0.9"
-  gem.add_dependency "fpm", "~> 0.4.33"
+  gem.add_dependency "fpm", "~> 1.0.0"
   gem.add_dependency "uber-s3"
   gem.add_dependency "thor", ">= 0.16.0"
 

data/spec/build_version_spec.rb

@@ -30,9 +30,9 @@ describe Omnibus::BuildVersion do
     ENV['BUILD_ID'] = nil
     ENV['OMNIBUS_APPEND_TIMESTAMP'] = nil
     Omnibus::BuildVersion.any_instance.stub(:shellout)
-                         .and_return(mock("ouput",
-                                          :stdout => git_describe,
-                                          :exitstatus => 0))
+                         .and_return(double("ouput",
+                                            :stdout => git_describe,
+                                            :exitstatus => 0))
   end
 
   describe "git describe parsing" do
@@ -239,9 +239,9 @@ fatal: No tags can describe '809ea1afcce67e1148c1bf0822d40a7ef12c380e'.
 Try --always, or create some tags.
       STDERR
       build_version.stub(:shellout)
-                   .and_return(mock("ouput",
-                                    :stderr => stderr,
-                                    :exitstatus => 128))
+                   .and_return(double("ouput",
+                                      :stderr => stderr,
+                                      :exitstatus => 128))
     end
     it "sets the version to 0.0.0" do
       build_version.git_describe.should eq("0.0.0")
@@ -257,9 +257,9 @@ Try --always, or create some tags.
                    .with("git describe",
                          {:live_stream => nil,
                          :cwd => path})
-                    .and_return(mock("ouput",
-                                :stdout => git_describe,
-                                :exitstatus => 0))
+                    .and_return(double("ouput",
+                                       :stdout => git_describe,
+                                       :exitstatus => 0))
       build_version.git_describe
     end
   end

data/spec/fetchers/git_fetcher_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe Omnibus::GitFetcher do
+  let(:shell_out) {
+    shell_out = double('Mixlib::ShellOut')
+    stub_const('Mixlib::ShellOut', shell_out)
+    shell_out
+  }
+  let(:software) {
+    double('software').tap { |s|
+      s.stub :name => 'project',
+             :source => { :git => 'git@example.com:test/project.git' },
+             :version => '0.0.1',
+             :project_dir => '/tmp/project'
+    }
+  }
+  def expect_git_clone_and_ls_remote
+    expect_git_clone
+    expect_git_ls_remote
+  end
+  def expect_git_clone
+    double('git_clone').tap do |g|
+      shell_out.should_receive(:new)
+        .with('git clone git@example.com:test/project.git /tmp/project', :live_stream => STDOUT)
+        .ordered
+        .and_return(g)
+      g.should_receive(:run_command).ordered
+      g.should_receive(:error!).ordered
+    end
+  end
+  def expect_git_ls_remote
+    double('git_ls_remote').tap do |g|
+      shell_out.should_receive(:new)
+        .with('git ls-remote origin 0.0.1*', :live_stream => STDOUT, :cwd => '/tmp/project')
+        .ordered
+        .and_return(g)
+      g.should_receive(:run_command).ordered
+      g.should_receive(:error!).ordered
+      g.stub(:stdout => git_ls_remote_out)
+    end
+  end
+  describe "#fetch" do
+    context "when the project is not cloned yet" do
+      before {
+        File.stub(:exist?).with('/tmp/project/.git').and_return(false)
+      }
+      context "when the source repository is accessible" do
+        subject {
+          Omnibus::GitFetcher.new software
+        }
+        context "when the ref exists" do
+          let(:git_ls_remote_out) {
+            'a2ed66c01f42514bcab77fd628149eccb4ecee28	refs/tags/0.0.1'
+          }
+          it 'should clone the Git repository and then check out the commit' do
+            1.times { expect_git_clone_and_ls_remote }
+            double('git_checkout').tap do |g|
+              shell_out.should_receive(:new)
+                .with('git checkout a2ed66c01f42514bcab77fd628149eccb4ecee28', :live_stream => STDOUT, :cwd => '/tmp/project')
+                .ordered
+                .and_return(g)
+              g.should_receive(:run_command).ordered
+              g.should_receive(:error!).ordered
+            end
+
+            expect { subject.fetch }.to_not raise_error
+          end
+        end
+        context "when the ref does not exist" do
+          let(:git_ls_remote_out) {
+            ''
+          }
+          it 'should clone the Git repository and then fail while retrying 3 times' do
+             4.times {
+               expect_git_clone
+               4.times {
+                 expect_git_ls_remote
+               }
+             }
+            Omnibus::Fetcher::ErrorReporter.any_instance
+              .should_receive(:explain).with(%q|Failed to find any commits for the ref '0.0.1'|)
+            subject.should_receive(:log).with(%r|git ls-remote failed|).at_least(1).times
+            subject.should_receive(:log).with(%r|git clone/fetch failed|).at_least(1).times
+            # Prevent sleeping to run the spec fast
+            subject.stub(:sleep)
+            expect { subject.fetch }.to raise_error(/Could not parse SHA reference/)
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/fetchers/net_fetcher_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Omnibus::NetFetcher do
   it "should download and uncompress zip files" do
-    software_mock = stub 'software'
+    software_mock = double('software')
     software_mock.stub :project_file => 'file.zip',
                        :name         => 'file',
                        :source       => '/tmp/out',
@@ -13,4 +13,113 @@ describe Omnibus::NetFetcher do
     net_fetcher = Omnibus::NetFetcher.new software_mock
     net_fetcher.extract_cmd.should == 'unzip file.zip -d /tmp/out'
   end
+  it "should download and uncompress .tar.xz files" do
+    software_mock = double('software')
+    software_mock.stub :project_file => 'file.tar.xz',
+                       :name         => 'file',
+                       :source       => '/tmp/out',
+                       :checksum     => 'abc123',
+                       :source_uri   => 'http://example.com/file.tar.xz',
+                       :source_dir   => '/tmp/out',
+                       :project_dir  => '/tmp/project'
+    net_fetcher = Omnibus::NetFetcher.new software_mock
+    net_fetcher.extract_cmd.should == 'xz -dc file.tar.xz | ( cd /tmp/out && tar -xf - )'
+  end
+  it "should download and uncompress .txz files" do
+    software_mock = double('software')
+    software_mock.stub :project_file => 'file.txz',
+                       :name         => 'file',
+                       :source       => '/tmp/out',
+                       :checksum     => 'abc123',
+                       :source_uri   => 'http://example.com/file.txz',
+                       :source_dir   => '/tmp/out',
+                       :project_dir  => '/tmp/project'
+    net_fetcher = Omnibus::NetFetcher.new software_mock
+    net_fetcher.extract_cmd.should == 'xz -dc file.txz | ( cd /tmp/out && tar -xf - )'
+  end
+
+  describe "http_proxy helper" do
+    before(:each) do
+      software_mock = double('software')
+      software_mock.stub(:project_file => 'file.txz',
+                         :name         => 'file',
+                         :source       => '/tmp/out',
+                         :checksum     => 'abc123',
+                         :source_uri   => 'http://example.com/file.txz',
+                         :source_dir   => '/tmp/out',
+                         :project_dir  => '/tmp/project')
+      @net_fetcher = Omnibus::NetFetcher.new(software_mock)
+      env_vars = ['HTTP_PROXY',
+                  'HTTP_PROXY_USER',
+                  'HTTP_PROXY_PASS',
+                  'http_proxy',
+                  'http_proxy_user',
+                  'http_proxy_pass']
+      @orig_env = env_vars.inject({}) do |h, var|
+        h[var] = ENV.delete(var)
+        h
+      end
+    end
+
+    after(:each) do
+      # restore ENV hash
+      @orig_env.each { |var, val| ENV[var] = val }
+    end
+
+    describe "get_env handles upper and lower case env vars" do
+      it "lower via upper" do
+        ENV['lower'] = "abc"
+        @net_fetcher.get_env('LOWER').should == "abc"
+        @net_fetcher.get_env('lower').should == "abc"
+      end
+
+      it "upper via lower" do
+        ENV['UPPER'] = "abc"
+        @net_fetcher.get_env('upper').should == "abc"
+        @net_fetcher.get_env('UPPER').should == "abc"
+      end
+    end
+
+    it "should return nil when no proxy is set in env" do
+      @net_fetcher.http_proxy.should be_nil
+    end
+
+    it "should return a URI object when HTTP_PROXY is set" do
+      ENV['HTTP_PROXY'] = "http://my.proxy"
+      @net_fetcher.http_proxy.should == URI.parse("http://my.proxy")
+    end
+
+    it "sets user and pass from env when set" do
+      ENV['HTTP_PROXY'] = "my.proxy"
+      ENV['HTTP_PROXY_USER'] = "alex"
+      ENV['HTTP_PROXY_PASS'] = "sesame"
+      @net_fetcher.http_proxy.should == URI.parse("http://alex:sesame@my.proxy")
+    end
+
+    it "uses user and pass in URL before those in env" do
+      ENV['HTTP_PROXY'] = "sally:peanut@my.proxy"
+      ENV['HTTP_PROXY_USER'] = "alex"
+      ENV['HTTP_PROXY_PASS'] = "sesame"
+      @net_fetcher.http_proxy.should == URI.parse("http://sally:peanut@my.proxy")
+    end
+
+    it "proxies if host doesn't match exclude list" do
+      ENV['NO_PROXY'] = "google.com,www.buz.org"
+      a_url = URI.parse("http://should.proxy.com/123")
+      @net_fetcher.excluded_from_proxy?(a_url.host).should be_false
+
+      b_url = URI.parse("http://buz.org/123")
+      @net_fetcher.excluded_from_proxy?(b_url.host).should be_false
+    end
+
+    it "does not proxy if host matches exclude list" do
+      ENV['NO_PROXY'] = "google.com,www.buz.org"
+      a_url = URI.parse("http://google.com/hello")
+      @net_fetcher.excluded_from_proxy?(a_url.host).should be_true
+
+      b_url = URI.parse("http://www.buz.org/123")
+      @net_fetcher.excluded_from_proxy?(b_url.host).should be_true
+    end
+  end
 end
+

data/spec/package_release_spec.rb

@@ -47,7 +47,7 @@ describe Omnibus::PackageRelease do
   describe "validating configuration" do
 
     before do
-      Omnibus.stub!(:config).and_return(config)
+      Omnibus.stub(:config).and_return(config)
     end
 
     it "validates that the s3 key is set" do
@@ -104,7 +104,7 @@ describe Omnibus::PackageRelease do
     end
 
     before do
-      package_release.stub!(:config).and_return(config)
+      package_release.stub(:config).and_return(config)
       File.stub(:exist?).with(pkg_metadata_path).and_return(true)
       File.stub(:exist?).with(pkg_path).and_return(true)
       IO.stub(:read).with(pkg_metadata_path).and_return(metadata_json)

data/spec/s3_cacher_spec.rb

@@ -23,17 +23,17 @@ describe Omnibus::S3Cache do
   describe '#tarball_software' do
     subject(:tarball_software) { described_class.new.tarball_software }
 
-    let(:source_a) { stub(source: { url: 'a' }) }
-    let(:source_b) { stub(source: { url: 'b' }) }
-    let(:source_c) { stub(source: {}) }
+    let(:source_a) { double(source: { url: 'a' }) }
+    let(:source_b) { double(source: { url: 'b' }) }
+    let(:source_c) { double(source: {}) }
     let(:projects) { [
-      stub({ library: [source_a, source_c] }),
-      stub({ library: [source_c, source_b] })
+      double({ library: [source_a, source_c] }),
+      double({ library: [source_c, source_b] })
     ] }
     let(:software_with_urls) { [source_a, source_b] }
 
     before do
-      Omnibus.stub(config: stub({
+      Omnibus.stub(config: double({
         s3_bucket: 'test', s3_access_key: 'test', s3_secret_key: 'test'
       }))
 

data/spec/software_dirs_spec.rb

@@ -0,0 +1,34 @@
+require 'omnibus'
+require 'spec_helper'
+
+describe Omnibus do
+
+  describe '#software_dirs' do
+
+    before :each do
+      # This is probably really silly, but it works
+      Omnibus.class_eval { @software_dirs = nil }
+    end
+
+    context 'omnibus_software_root not nil' do
+      before :each do
+        Omnibus.stub(:omnibus_software_root) { './data' }
+      end
+
+      it 'will include list of software from omnibus-software gem' do
+        Omnibus.software_dirs.length.should eq 2
+      end
+    end
+
+    context 'omnibus_software_root nil' do
+      before :each do
+        Omnibus.stub(:omnibus_software_root) { nil }
+      end
+
+      it 'will not include list of software from omnibus-software gem' do
+        Omnibus.software_dirs.length.should eq 1
+      end
+    end
+  end
+
+end

data/spec/software_spec.rb

@@ -6,8 +6,8 @@ require 'spec_helper'
 describe Omnibus::Software do
 
   let(:project) do
-    p = mock(Omnibus::Project)
-    p.should_receive(:install_path).any_number_of_times.and_return("monkeys")
+    p = double(Omnibus::Project)
+    p.stub(:install_path).and_return("monkeys")
     p
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.33
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.33
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,8 @@ files:
 - lib/omnibus/templates/package_scripts/makeselfinst.erb
 - lib/omnibus/templates/package_scripts/postinst.erb
 - lib/omnibus/templates/package_scripts/postrm.erb
+- lib/omnibus/templates/package_scripts/preinst.erb
+- lib/omnibus/templates/package_scripts/prerm.erb
 - lib/omnibus/templates/project.rb.erb
 - lib/omnibus/templates/software/c-example.rb.erb
 - lib/omnibus/templates/software/erlang-example.rb.erb
@@ -224,10 +226,12 @@ files:
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
 - spec/data/software/erchef.rb
+- spec/fetchers/git_fetcher_spec.rb
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
 - spec/s3_cacher_spec.rb
+- spec/software_dirs_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opscode/omnibus-ruby
@@ -251,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2339140264674066912
+      hash: -488059737138888426
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -265,10 +269,12 @@ test_files:
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
 - spec/data/software/erchef.rb
+- spec/fetchers/git_fetcher_spec.rb
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
 - spec/s3_cacher_spec.rb
+- spec/software_dirs_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 has_rdoc: