omnibus 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d821a5f79999239bb2350a3ab13b30b3c76e002
-  data.tar.gz: b9466b1623251bf432c310d28e3136752de2c8fa
+  metadata.gz: 615ef0c044c0b061d63bfb1f38967c858ebdf06d
+  data.tar.gz: 68330f662a2f3e117645930ba0ac28cc2e0ea72c
 SHA512:
-  metadata.gz: f5702d3ac8776901b5f47bc2dfeb5b2755b7a50b296d0184a8003c8c27c662f16eb74a3b3e4c099760228f042a3449ba8630debbe93d5eeaa28cda1236c8e1a3
-  data.tar.gz: cba2accc31f58449f0eac9e4ccee20d1e82b9bf228809ddd9b47c2be21d697d64c924c0087c036a2b481c1f4aa2b5129b9bb11dfb1ed53502b128aeb7c06778d
+  metadata.gz: 564d392decbcb7449a32dc8670f59ca89c8d672e731e447e9e6b0fb34580976cbe564660723722ce70c5af61e379990ae2e73b4d6062e59966a486af57a9949b
+  data.tar.gz: d3fcf09a23440d44a7f77a1e0735814a81fe7522070232d55f0660590ac112da13719ebd6e1a44bc2f912e36dab9b35e95d9dc3d3393f61c6d3f5f8e3ca84f2c

data/CHANGELOG.md

@@ -1,13 +1,13 @@
 Omnibus Ruby CHANGELOG
 ======================
 
-v2.0.0 (Unreleased)
--------------------
+v2.0.0 (March, 12, 2014)
+------------------------
 Major changes:
 - `version` is now `default_version`
 - Added support for multiple software versions and version overrides
 - Added support for project-specific overrides
-- Added Mac DMG packaging functionality
+- Added Mac .pkg packaging functionality (DMG coming soon)
 - Require Mixlib::Config 2.0
 
 Minor changes:

data/lib/omnibus/cli/application.rb

@@ -118,7 +118,7 @@ module Omnibus
         super
       rescue => e
         error_msg = 'Something went wrong...the Omnibus just ran off the road!'
-        error_msg << "\n\nError raised was:\n\n\t#{$ERROR_INFO}"
+        error_msg << "\n\nError raised was:\n\n\t#{e}"
         error_msg << "\n\nBacktrace:\n\n\t#{e.backtrace.join("\n\t") }"
         if e.respond_to?(:original) && e.original
           error_msg << "\n\nOriginal Error:\n\n\t#{e.original}"

data/lib/omnibus/exceptions.rb

@@ -189,4 +189,7 @@ module Omnibus
 E
     end
   end
+
+  class UnresolvableGitReference < RuntimeError
+  end
 end

data/lib/omnibus/fetchers/git_fetcher.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+require 'omnibus/exceptions'
+
 module Omnibus
   # Fetcher implementation for projects in git.
   class GitFetcher < Fetcher
@@ -156,12 +158,23 @@ E
       shell.run_command
       shell.error!
       commit_ref = process_remote_list(shell.stdout, ref)
-      fail 'Could not parse SHA reference' unless commit_ref
+
+      unless commit_ref
+        fail UnresolvableGitReference.new("Could not resolve `#{ref}' to a SHA.")
+      end
       commit_ref
+    rescue UnresolvableGitReference => e # skip retries
+      ErrorReporter.new(e, self).explain(<<-E)
+Command `#{cmd}' did not find a commit for reference `#{ref}'.
+The tag or branch you're looking for doesn't exist on the remote repo.
+If your project uses version tags like v1.2.3, include the 'v' in your
+software's version.
+E
+      raise
     rescue Exception => e
       if retries >= 3
         ErrorReporter.new(e, self).explain("Failed to find any commits for the ref '#{ref}'")
-        raise
+        fail
       else
         # Deal with github failing all the time :(
         time_to_sleep = 5 * (2**retries)

data/lib/omnibus/version.rb

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

data/spec/fetchers/git_fetcher_spec.rb

@@ -76,22 +76,25 @@ describe Omnibus::GitFetcher do
 
         context 'when the ref does not exist' do
           let(:git_ls_remote_out) { '' }
+          let(:error_reporter) { double('ErrorReporter', explain: nil) }
+
+          before { Omnibus::Fetcher::ErrorReporter.stub(:new).and_return(error_reporter) }
 
           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'|)
+
             4.times do
               expect_git_clone
-              4.times do
-                expect_git_ls_remote
-              end
             end
 
-            expect_any_instance_of(Omnibus::Fetcher::ErrorReporter).to receive(:explain)
-              .with(%q|Failed to find any commits for the ref '0.0.1'|)
+            expect_git_ls_remote
+
             expect(subject).to receive(:log).with(/git ls\-remote failed/).at_least(1).times
             expect(subject).to receive(:log).with(/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/)
+            expect { subject.fetch }.to raise_error(Omnibus::UnresolvableGitReference)
           end
         end
       end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.12'
 - !ruby/object:Gem::Dependency
   name: rake
   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: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: uber-s3
   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: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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'
 description: Omnibus helps you build self-installing, full-stack software builds.
@@ -157,9 +157,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -250,17 +250,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Omnibus helps you build self-installing, full-stack software builds.