omnibus 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 615ef0c044c0b061d63bfb1f38967c858ebdf06d
-  data.tar.gz: 68330f662a2f3e117645930ba0ac28cc2e0ea72c
+  metadata.gz: 9cb199e33038976c285414cab34ac29647f747d0
+  data.tar.gz: 1a6b1c603430011d328ff2acee1efec31cc406a5
 SHA512:
-  metadata.gz: 564d392decbcb7449a32dc8670f59ca89c8d672e731e447e9e6b0fb34580976cbe564660723722ce70c5af61e379990ae2e73b4d6062e59966a486af57a9949b
-  data.tar.gz: d3fcf09a23440d44a7f77a1e0735814a81fe7522070232d55f0660590ac112da13719ebd6e1a44bc2f912e36dab9b35e95d9dc3d3393f61c6d3f5f8e3ca84f2c
+  metadata.gz: 6f4b8cdec1c3027860afd61552649b39ff5b3b51a88f77e28696d7e5dfe76df3a5076413522aadd482ded167d07270febe3f25a7eaf3f2235a914eb53fd8be29
+  data.tar.gz: 073cad03cc5dae6e817a725ad447d360028ed2e3864859b47d8aadb0d433a04526f07b46663102df8e657ba7d9e61b32aea771de13d1015bd2343e0f48431802

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Omnibus Ruby CHANGELOG
 ======================
 
+v2.0.1 (March 18, 2014)
+-----------------------
+- Fix the name of the `pkg` artifact created on OSX
+- Fix new Rubocop warnings
+- Update generated `Gemfile` to use Omnibus 2.0
+- Switch to using Test Kitchen for generated build labs
+
 v2.0.0 (March, 12, 2014)
 ------------------------
 Major changes:

data/Rakefile

@@ -10,7 +10,7 @@ Rubocop::RakeTask.new(:style)
 
 namespace :travis do
   desc 'Run tests on Travis'
-  task ci: ['style', 'unit']
+  task ci: ['unit', 'style']
 end
 
 task default: ['travis:ci']

data/lib/omnibus/build_version.rb

@@ -230,7 +230,11 @@ module Omnibus
     # @return [Boolean]
     # @see #prerelease_tag
     def prerelease_version?
-      !!(prerelease_tag)
+      if prerelease_tag
+        true
+      else
+        false
+      end
     end
 
     private

data/lib/omnibus/builder.rb

@@ -130,7 +130,7 @@ module Omnibus
         File.expand_path("#{root}/config/patches/#{name}/#{args[:source]}")
       end
 
-      source = candidate_paths.find { |path| File.exists?(path) }
+      source = candidate_paths.find { |path| File.exist?(path) }
 
       unless source
         fail MissingPatch.new(args[:source], candidate_paths)
@@ -152,7 +152,7 @@ module Omnibus
 
       source_path = File.expand_path("#{Omnibus.project_root}/config/templates/#{name}/#{args[:source]}")
 
-      unless File.exists?(source_path)
+      unless File.exist?(source_path)
         fail MissingTemplate.new(args[:source], "#{Omnibus.project_root}/config/templates/#{name}")
       end
 
@@ -331,7 +331,7 @@ module Omnibus
       hash.reduce([]) do |kv_pair_strs, (k, v)|
         val_str = case v
                   when Hash
-                    %Q["#{to_kv_str(v, " ") }"]
+                    %Q("#{to_kv_str(v, " ") }")
                   else
                     v.to_s
                   end

data/lib/omnibus/cli/application.rb

@@ -76,12 +76,13 @@ module Omnibus
         template(File.join('software', 'erlang-example.rb.erb'), File.join(config_software, 'erlang-example.rb'), opts)
         template(File.join('software', 'ruby-example.rb.erb'), File.join(config_software, 'ruby-example.rb'), opts)
 
-        # Vagrant build lab
+        # Kitchen build environment
+        template(File.join('.kitchen.local.yml.erb'), File.join(target, '.kitchen.local.yml'), opts)
+        template(File.join('.kitchen.yml.erb'), File.join(target, '.kitchen.yml'), opts)
         template(File.join('Berksfile.erb'), File.join(target, 'Berksfile'), opts)
-        template(File.join('Vagrantfile.erb'), File.join(target, 'Vagrantfile'), opts)
 
         # render out stub packge scripts
-        %w{ makeselfinst preinst prerm 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/fetchers/net_fetcher.rb

@@ -56,11 +56,11 @@ E
     end
 
     def fetch_required?
-      !File.exists?(project_file) || Digest::MD5.file(project_file) != @checksum
+      !File.exist?(project_file) || Digest::MD5.file(project_file) != @checksum
     end
 
     def clean
-      if File.exists?(project_dir)
+      if File.exist?(project_dir)
         log "cleaning existing build from #{project_dir}"
         FileUtils.rm_rf(project_dir)
       end
@@ -155,7 +155,7 @@ E
           fail UnsupportedURIScheme, "Don't know how to download from #{source_uri}"
         end
       rescue Exception
-        tries = tries - 1
+        tries -= 1
         if tries != 0
           log 'retrying failed download...'
           retry

data/lib/omnibus/packagers/mac_pkg.rb

@@ -46,6 +46,10 @@ module Omnibus
       #   @return (see Project#build_version)
       def_delegator :@project, :build_version, :version
 
+      # !@method iteration
+      #   @return (see Project#iteration)
+      def_delegator :@project, :iteration, :iteration
+
       # !@method identifier
       #   @return (see Project#mac_pkg_identifier)
       def_delegator :@project, :mac_pkg_identifier, :identifier
@@ -125,7 +129,7 @@ module Omnibus
       # to customize the installer UI.
       # @return [Array<String>] argv for the pkgbuild command.
       def pkgbuild_command
-        %W[
+        %W(
           pkgbuild
           --identifier #{identifier}
           --version #{version}
@@ -133,7 +137,7 @@ module Omnibus
           --root #{pkg_root}
           --install-location #{install_location}
           #{component_pkg_name}
-        ]
+        )
       end
 
       # The argv for a productbuild command that will build the product package.
@@ -141,12 +145,12 @@ module Omnibus
       # users.
       # @return [Array<String>] argv for the productbuild command
       def productbuild_command
-        %W[
+        %W(
           productbuild
           --distribution #{distribution_staging_path}
           --resources #{mac_pkg_files_path}
           #{product_pkg_path}
-        ]
+        )
       end
 
       # Writes the Distribution file to the staging area.
@@ -171,7 +175,7 @@ module Omnibus
       #
       # @return [String] the basename of the package file
       def package_name
-        "#{name}.pkg"
+        "#{name}-#{version}-#{iteration}.pkg"
       end
 
       def identifier

data/lib/omnibus/project.rb

@@ -689,13 +689,13 @@ module Omnibus
       end
 
       if @pkg_user
-        %w[ deb rpm solaris ].each do |type|
+        %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|
+        %w(deb rpm solaris).each do |type|
           command_and_opts << " --#{type}-group #{@pkg_group}"
         end
       end
@@ -719,7 +719,7 @@ module Omnibus
         output_package('makeself'),
         "'The full stack of #{@name}'",
       ]
-      command_and_opts << './makeselfinst' if File.exists?("#{package_scripts_path}/makeselfinst")
+      command_and_opts << './makeselfinst' if File.exist?("#{package_scripts_path}/makeselfinst")
       command_and_opts
     end
 
@@ -729,7 +729,7 @@ module Omnibus
     def run_makeself
       package_commands = []
       # copy the makeself installer into package
-      if File.exists?("#{package_scripts_path}/makeselfinst")
+      if File.exist?("#{package_scripts_path}/makeselfinst")
         package_commands << "cp #{package_scripts_path}/makeselfinst #{install_path}/"
       end
 

data/lib/omnibus/software.rb

@@ -479,7 +479,7 @@ module Omnibus
           directory project_dir
           namespace @name do
             task fetch: [build_dir, source_dir, cache_dir, project_dir] do
-              if !File.exists?(fetch_file) || fetcher.fetch_required?
+              if !File.exist?(fetch_file) || fetcher.fetch_required?
                 # force build to run if we need to do an updated fetch
                 fetcher.fetch
                 touch fetch_file

data/lib/omnibus/templates/.kitchen.local.yml.erb

@@ -0,0 +1,10 @@
+#
+# The .kitchen.local.yml takes preference and is compiled into the top-level
+# .kitchen.yml. Uncomment the following section to use VMWare Fusion instead of
+# the default Vagrant driver of VirtualBox.
+#
+
+# driver:
+#   provider: vmware_fusion
+#   customize:
+#     memsize: 4096

data/lib/omnibus/templates/.kitchen.yml.erb

@@ -0,0 +1,26 @@
+driver:
+  name: vagrant
+  customize:
+    cpus: 2
+    memory: 2048
+  synced_folders:
+    - ['.', '/home/vagrant/<%= config[:name] %>']
+
+provisioner:
+  require_chef_omnibus: 11.8.0
+
+platforms:
+  - name: ubuntu-12.04
+  - name: ubuntu-11.04
+  - name: ubuntu-10.04
+  - name: centos-5.10
+  - name: centos-6.5
+
+suites:
+  - name: default
+    run_list: omnibus::default
+    attributes:
+      omnibus:
+        build_user:  vagrant
+        build_dir:   /home/vagrant/<%= config[:name] %>
+        install_dir: /opt/<%= config[:name] %>

data/lib/omnibus/templates/Berksfile.erb

@@ -1,3 +1,6 @@
-site :opscode
+source 'https://api.berkshelf.com'
 
-cookbook "omnibus"
+cookbook 'omnibus'
+
+# Uncomment to use the latest version of the Omnibus cookbook from GitHub
+# cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'

data/lib/omnibus/templates/Gemfile.erb

@@ -1,4 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'omnibus', '~> 1.3.0'
-gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
+# Use Berkshelf for resolving cookbook dependencies
+gem 'berkshelf', '~> 3.0.0.beta'
+
+# Install omnibus software
+gem 'omnibus', '~> 2.0'
+gem 'omnibus-software', github: 'opscode/omnibus-software'
+
+# Use Test Kitchen with Vagrant for convering the build environment
+gem 'test-kitchen',    '~> 1.2'
+gem 'kitchen-vagrant', '~> 0.14'

data/lib/omnibus/templates/README.md.erb

@@ -1,19 +1,19 @@
-# <%= config[:name] %> Omnibus project
-
+<%= config[:name] %> Omnibus project
+<%= '='*(config[:name].length + 16) %>
 This project creates full-stack platform-specific packages for
 `<%= config[:name] %>`!
 
-## Installation
-
-We'll assume you have Ruby 1.9+ and Bundler installed. First ensure all
-required gems are installed and ready to use:
+Installation
+------------
+You must have a sane Ruby 1.9+ environment with Bundler installed. Ensure all
+the required gems are installed:
 
 ```shell
 $ bundle install --binstubs
 ```
 
-## Usage
-
+Usage
+-----
 ### Build
 
 You create a platform-specific package using the `build project` command:
@@ -23,9 +23,9 @@ $ bin/omnibus build project <%= config[:name] %>
 ```
 
 The platform/architecture type of the package created will match the platform
-where the `build project` command is invoked. So running this command on say a
-MacBook Pro will generate a Mac OS X specific package. After the build
-completes packages will be available in `pkg/`.
+where the `build project` command is invoked. For example, running this command
+on a MacBook Pro will generate a Mac OS X package. After the build completes
+packages will be available in the `pkg/` folder.
 
 ### Clean
 
@@ -53,50 +53,42 @@ Full help for the Omnibus command line interface can be accessed with the
 $ bin/omnibus help
 ```
 
-## Vagrant-based Virtualized Build Lab
-
+Kitchen-based Build Environment
+-------------------------------
 Every Omnibus project ships will a project-specific
 [Berksfile](http://berkshelf.com/) and [Vagrantfile](http://www.vagrantup.com/)
-that will allow you to build your projects on the following platforms:
-
-* CentOS 5 64-bit
-* CentOS 6 64-bit
-* Ubuntu 10.04 64-bit
-* Ubuntu 11.04 64-bit
-* Ubuntu 12.04 64-bit
+that will allow you to build your omnibus projects on all of the projects listed
+in the `.kitchen.yml`. You can add/remove additional platforms as needed by
+changing the list found in the `.kitchen.yml` `platforms` YAML stanza.
 
-Please note this build-lab is only meant to get you up and running quickly;
-there's nothing inherent in Omnibus that restricts you to just building CentOS
-or Ubuntu packages. See the Vagrantfile to add new platforms to your build lab.
+This build environment is designed to get you up-and-running quickly. However,
+there is nothing that restricts you to building on other platforms. Simply use
+the [omnibus cookbook](https://github.com/opscode-cookbooks/omnibus) to setup
+your desired platform and execute the build steps listed above.
 
-The only requirements for standing up this virtualized build lab are:
-
-* VirtualBox - native packages exist for most platforms and can be downloaded
-from the [VirtualBox downloads page](https://www.virtualbox.org/wiki/Downloads).
-* Vagrant 1.2.1+ - native packages exist for most platforms and can be downloaded
-from the [Vagrant downloads page](http://downloads.vagrantup.com/).
-
-The [vagrant-berkshelf](https://github.com/RiotGames/vagrant-berkshelf) and
-[vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) Vagrant plugins
-are also required and can be installed easily with the following commands:
-
-```shell
-$ vagrant plugin install vagrant-berkshelf
-$ vagrant plugin install vagrant-omnibus
-```
+The default build environment requires Test Kitchen and VirtualBox for local
+development. Test Kitchen also exposes the ability to provision instances using
+various cloud providers like AWS, DigitalOcean, or OpenStack. For more
+information, please see the [Test Kitchen documentation](http://kitchen.ci).
 
-Once the pre-requisites are installed you can build your package across all
-platforms with the following command:
+Once you have tweaked your `.kitchen.yml` (or `.kitchen.local.yml`) to your
+liking, you can bring up an individual build environment using the `kitchen`
+command.
 
 ```shell
-$ vagrant up
+$ bundle exec kitchen converge ubuntu-12.04
 ```
 
-If you would like to build a package for a single platform the command looks like this:
+Then login to the instance and build the project as described in the Usage
+section:
 
 ```shell
-$ vagrant up PLATFORM
+$ bundle exec kitchen login ubuntu-12.04
+[vagrant@ubuntu...] $ cd <%= config[:name] %>
+[vagrant@ubuntu...] $ bundle install
+[vagrant@ubuntu...] $ ...
+[vagrant@ubuntu...] $ ./bin/omnibus build project <%= config[:name] %>
 ```
 
-The complete list of valid platform names can be viewed with the
-`vagrant status` command.
+For a complete list of all commands and platforms, run `kitchen list` or
+`kitchen help`.

data/lib/omnibus/templates/gitignore.erb

@@ -1,5 +1,7 @@
 *.gem
 .bundle
+.kitchen/
+.kitchen.local.yml
 vendor/bundle
 pkg/*
 .vagrant

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

@@ -1,6 +1,6 @@
-# s3_access_key "something"
-# s3_secret_key "something"
-# s3_bucket "some-bucket"
+# s3_access_key 'something'
+# s3_secret_key 'something'
+# s3_bucket 'some-bucket'
 # use_s3_caching true
-# solaris_compiler "gcc"
+# solaris_compiler 'gcc'
 # build_retries 3

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

@@ -1,21 +1,21 @@
 
-name "<%= config[:name] %>"
-maintainer "CHANGE ME"
-homepage "CHANGEME.com"
+name '<%= config[:name] %>'
+maintainer 'CHANGE ME'
+homepage 'CHANGEME.com'
 
-replaces        "<%= config[:name] %>"
-install_path    "<%= config[:install_path] %>"
+replaces        '<%= config[:name] %>'
+install_path    '<%= config[:install_path] %>'
 build_version   Omnibus::BuildVersion.new.semver
 build_iteration 1
 
 # creates required build directories
-dependency "preparation"
+dependency 'preparation'
 
 # <%= config[:name] %> dependencies/components
-# dependency "somedep"
+# dependency 'somedep'
 
 # version manifest file
-dependency "version-manifest"
+dependency 'version-manifest'
 
-exclude "\.git*"
-exclude "bundler\/git"
+exclude '\.git*'
+exclude 'bundler\/git'

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/fetchers/git_fetcher_spec.rb

@@ -82,7 +82,7 @@ describe Omnibus::GitFetcher do
 
           it 'should clone the Git repository and then fail while retrying 3 times' do
             expect(error_reporter).to receive(:explain)
-              .with(%|Failed to fetch git repository 'git@example.com:test/project.git'|)
+              .with(%(Failed to fetch git repository 'git@example.com:test/project.git'))
 
             4.times do
               expect_git_clone

data/spec/packagers/mac_pkg_spec.rb

@@ -64,16 +64,16 @@ EOH
   let(:expected_distribution_path) { '/var/cache/omnibus/pkg-tmp/mac-pkg/Distribution' }
 
   let(:productbuild_argv) do
-    %W[
+    %W(
       productbuild
       --distribution #{expected_distribution_path}
       --resources /omnibus/project/root/files/mac_pkg/Resources
-      /home/someuser/omnibus-myproject/pkg/myproject.pkg
-    ]
+      /home/someuser/omnibus-myproject/pkg/myproject-23.4.2-4.pkg
+    )
   end
 
   let(:pkgbuild_argv) do
-    %w[
+    %w(
       pkgbuild
       --identifier com.mycorp.myproject
       --version 23.4.2
@@ -81,7 +81,7 @@ EOH
       --root /opt/myproject
       --install-location /opt/myproject
       myproject-core.pkg
-    ]
+    )
   end
 
   let(:shellout_opts) do
@@ -95,6 +95,7 @@ EOH
     double Omnibus::Project,
            name: project_name,
            build_version: '23.4.2',
+           iteration: 4,
            maintainer: "Joe's Software",
            install_path: '/opt/myproject',
            package_scripts_path: scripts_path,
@@ -135,8 +136,8 @@ EOH
   it 'names the product package PROJECT_NAME.pkg' do
     # NOTE: #package_name is used by Project, so it's part of the **PUBLIC**
     # API.
-    expect(packager.package_name).to eq('myproject.pkg')
-    expect(packager.product_pkg_name).to eq('myproject.pkg')
+    expect(packager.package_name).to eq('myproject-23.4.2-4.pkg')
+    expect(packager.product_pkg_name).to eq('myproject-23.4.2-4.pkg')
   end
 
   it "use's the project's package_scripts_path" do
@@ -145,7 +146,7 @@ EOH
 
   it "makes a list of required files to generate the 'product' pkg file" do
     project_file_path = '/omnibus/project/root/files/mac_pkg/Resources'
-    required_files = %w[background.png welcome.html license.html].map do |basename|
+    required_files = %w(background.png welcome.html license.html).map do |basename|
       File.join(project_file_path, basename)
     end
 
@@ -246,7 +247,7 @@ E
 
     before do
       project_file_path = '/omnibus/project/root/files/mac_pkg/Resources'
-      %w[background.png welcome.html license.html].each do |basename|
+      %w(background.png welcome.html license.html).each do |basename|
         path = File.join(project_file_path, basename)
         File.stub(:exist?).with(path).and_return(true)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -202,6 +202,8 @@ files:
 - lib/omnibus/reports.rb
 - lib/omnibus/s3_cacher.rb
 - lib/omnibus/software.rb
+- lib/omnibus/templates/.kitchen.local.yml.erb
+- lib/omnibus/templates/.kitchen.yml.erb
 - lib/omnibus/templates/Berksfile.erb
 - lib/omnibus/templates/Gemfile.erb
 - lib/omnibus/templates/README.md.erb