omnibus 3.2.0.rc.2 → 3.2.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 713b0a1bd3b7ac7ea05f5d7b40eb80824c24477e
-  data.tar.gz: b0d7e0927ed88cd196966be1891268e62a0ce5f7
+  metadata.gz: f4a2b6643628a27e2deb75bce09e814bc8123f37
+  data.tar.gz: 85427f574979495b58b8877bd3cce27934faab20
 SHA512:
-  metadata.gz: 8289bda18635035acc08431683e4444c24bf2759bdcbe15aa3c69537458c4c1d0718562e45faa789832b0710a5b96e75eb55be4910b4f17ecb3108287ed9ce9c
-  data.tar.gz: f524d6d38c6f328a408b2531c6eabd9853462c3b020a5e10de9b84bf3c5e3bb8d50318c04763bfcf8e69056e66ff768e7882a06c3896439f17e4dbd7560fdeff
+  metadata.gz: 70a83fbaaf120dfb4d1fffa18e915a1a53d56866836f43878a2726d2f01e664a66995a0b42ab298e878f76d543d50d717eb5c823c0ddf4492d374549cdf784e4
+  data.tar.gz: c7c17973cb801f25c2870522f723431aa875510798810384c1cdb9783fd4b25c6169ada1b0dbb7b428b281089456e541fff1164f855ec9fce1472fb3eaafa60f

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 Omnibus Ruby CHANGELOG
 ======================
 
-v3.2.0.rc.2 (July 17, 2014)
+v3.2.0.rc.3 (July 21, 2014)
 ---------------------------
 - Make build commands output during `log.info` instead of `log.debug`
 - Refactor Chef Sugar into an includable module, permitting DSL methods in both Software and Project definitions
@@ -70,6 +70,7 @@ v3.2.0.rc.2 (July 17, 2014)
 - Require `net/http`, `net/https`, and `net/ftp` in the base fetcher module
 - Use -R, not -W1 on FreeBSD's compile flags
 - Expand all paths relative to the project_root
+- Various documentation fixes and updates
 
 ### Potentially breaking changes
 - Merged `Package` and `Artifact` into the same class and updated API - this was considered an **internal** API so it is not a violation of semver

data/lib/omnibus/builder.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-require 'bundler'
 require 'fileutils'
 require 'ostruct'
 require 'mixlib/shellout'
@@ -592,7 +591,7 @@ module Omnibus
     # Execute the given command object. This method also wraps the following
     # operations:
     #
-    #   - Reset bundler's environment using +Bundler.with_clean_env+
+    #   - Reset bundler's environment using {with_clean_env}
     #   - Instrument (time/measure) the individual command's execution
     #   - Retry failed commands in accordance with {Config#build_retries}
     #
@@ -600,7 +599,7 @@ module Omnibus
     #   the command object to build
     #
     def execute(command)
-      Bundler.with_clean_env do
+      with_clean_env do
         measure(command.description) do
           with_retries do
             command.run(self)
@@ -647,6 +646,35 @@ module Omnibus
       end
     end
 
+    #
+    # Execute the given command, removing any Ruby-specific environment
+    # variables. This is an "enhanced" version of +Bundler.with_clean_env+,
+    # which only removes Bundler-specific values. We need to remove all
+    # values, specifically:
+    #
+    # - GEM_PATH
+    # - GEM_HOME
+    # - GEM_ROOT
+    # - BUNDLE_GEMFILE
+    # - RUBYOPT
+    #
+    # The original environment restored at the end of this call.
+    #
+    # @param [Proc] block
+    #   the block to execute with the cleaned environment
+    #
+    def with_clean_env(&block)
+      original = ENV.to_hash
+
+      ENV.delete('RUBYOPT')
+      ENV.delete_if { |k,_| k.start_with?('BUNDLE_') }
+      ENV.delete_if { |k,_| k.start_with?('GEM_') }
+
+      block.call
+    ensure
+      ENV.replace(original.to_hash)
+    end
+
     #
     # Find a file amonst all local files, "remote" local files, and
     # {Config#software_gems}.

data/lib/omnibus/cli/base.rb

@@ -94,7 +94,7 @@ module Omnibus
       aliases: '-l',
       type: :string,
       enum: %w(fatal error warn info debug),
-      lazy_default: 'warn'
+      lazy_default: 'info'
     class_option :override,
       desc: 'Override one or more Omnibus config options',
       aliases: '-o',

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

@@ -85,14 +85,14 @@ liking, you can bring up an individual build environment using the `kitchen`
 command.
 
 ```shell
-$ bin/kitchen converge ubuntu-12.04
+$ bin/kitchen converge ubuntu-1204
 ```
 
 Then login to the instance and build the project as described in the Usage
 section:
 
 ```shell
-$ bundle exec kitchen login ubuntu-12.04
+$ bundle exec kitchen login ubuntu-1204
 [vagrant@ubuntu...] $ cd <%= config[:name] %>
 [vagrant@ubuntu...] $ bundle install
 [vagrant@ubuntu...] $ ...

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '3.2.0.rc.2'
+  VERSION = '3.2.0.rc.3'
 end

data/omnibus.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'bundler'
   gem.add_dependency 'chef-sugar',      '~> 1.2'
   gem.add_dependency 'mixlib-shellout', '~> 1.4'
   gem.add_dependency 'ohai',            '~> 7.2.0.rc'
@@ -29,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'uber-s3'
   gem.add_dependency 'thor',            '~> 0.18'
 
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'artifactory', '~> 1.2'
   gem.add_development_dependency 'aruba',       '~> 0.5'
   gem.add_development_dependency 'fauxhai',     '~> 2.1'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.2
+  version: 3.2.0.rc.3
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement