omnibus 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUyOTcwNzFiYmJmNDE5YmM5Y2RhMDBkNzE2ZjVlOTEwNzMzOTFhMg==
+    ZjM0YzUxNDMyZDFmNGRhYjJkMmY5YmQ4OGNjMWRkZjg0ODYwOTcxYw==
   data.tar.gz: !binary |-
-    MDU0ZjEwNDhiZjJkYjliYzY1NzM3NzI2ZjE3YjQxNzYxMGRhZDBhZQ==
+    ZGYwZDEzMzNmYmU0ZjU2MmQzNTFmNTlkMGNkOTBiMjM5MDljYWU5ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODY2MDNhOTQ1YzAzYWJjZTI2OTQwZDBkZjIwMWYyMmRhNTZkOTFjN2Q2MmE4
-    ZjMxZDY5NGZkZmJmMjkzZWNiNjQxZDU4MGExYjRkNmI0ZmFhNjYwYjM3NDlh
-    NjJhMjVkZmU1YmU5NTA0OGNmY2NlOWMzYTg2OGM0NjNkMzkwMTQ=
+    YjRlYzQ0MDM1NzI5YmEyZWYxMWE4MDNmNmY4NTNlMmI2MDA3YTcyNWI1ZjEw
+    ZmE0OTFjODAyMWZmMWNmNDYxMWI4N2VlNDE3ODc3NWJmNDNkYTFkMDI1YTM1
+    ZjAzOWY2YzZjNGFhOTliZjk0M2RiYzkwZjVjMDhlZGI5OGQyYzk=
   data.tar.gz: !binary |-
-    ZTUxMmFiM2M0ZGNiNjMxODkwNGE2OTBlOGQ3MjYzMDE3NTA5NTIzOWExZWI3
-    MzA4NmVhZTAzNDY1MGI4MTE1MTdiMTdkOWQ1MTViNzBiZmY1YWZjZjMyMjRm
-    YWE4NzcwNTdiZTRiNWI3MTlmYjA1Yjg4ZTFiNTY0MjQ5MWEyZGI=
+    ZjRkNTY3YmJhOTE2NzE4MmIwZTFiOWRmNjgwMzViNDVlNmRjMjY5NGYwOGZk
+    MDE3NmQ1Njk1Mjk4NDQ2MmU2Nzk5N2ZjMjYxZDI0YWQ1ZGIwMjgyM2ViOWM2
+    MDYwZWRhZjNmOTQwYzEyMTQ0NzI0ZTI4NDNhMGExZDhlZmNjYmI=

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.1 (July 2, 2013)
+
+BUG FIXES:
+
+* Raise an exception if a patch file is not found.
+* Be more explicit about types in CPU computation.
+* Include pkg version, iteration, arch for solaris packages.
+* Fix assorted typos in CLI output.
+
 ## 1.1.0 (June 12, 2013)
 
 FEATURES:

data/lib/omnibus/builder.rb

@@ -16,6 +16,7 @@
 #
 
 require 'forwardable'
+require 'omnibus/exceptions'
 
 module Omnibus
   class Builder
@@ -133,6 +134,10 @@ module Omnibus
 
       source = candidate_paths.find{|path| File.exists?(path) }
 
+      unless source
+        raise MissingPatch.new(args[:source], candidate_paths)
+      end
+
       plevel = args[:plevel] || 1
       if args[:target] 
         target = File.expand_path("#{project_dir}/#{args[:target]}")

data/lib/omnibus/cli/base.rb

@@ -106,7 +106,7 @@ module Omnibus
       def load_project!(project_name)
         project = Omnibus.project(project_name)
         unless project
-          error_msg = "I don't know anythinga about project '#{project_name}'."
+          error_msg = "I don't know anything about project '#{project_name}'."
           error_msg << " Valid project names include: #{Omnibus.project_names.join(', ')}"
           raise Omnibus::CLI::Error, error_msg
         end

data/lib/omnibus/exceptions.rb

@@ -110,4 +110,19 @@ module Omnibus
       """
     end
   end
+
+  class MissingPatch < RuntimeError
+    def initialize(patch_name, search_paths)
+      @patch_name, @search_paths = patch_name, search_paths
+    end
+
+    def to_s
+      """
+      Attempting to apply the patch #{@patch_name}, but it was not
+      found at any of the following locations:
+
+      #{@search_paths.join("\n      ")}
+      """
+    end
+  end
 end

data/lib/omnibus/project.rb

@@ -467,7 +467,11 @@ module Omnibus
         pkg.version = build_version
         pkg.name = package_name
         pkg.iteration = iteration
-        pkg.to_s
+        if pkg_type == "solaris"
+          pkg.to_s("NAME.FULLVERSION.ARCH.TYPE")
+        else
+          pkg.to_s
+        end
       end
     end
 

data/lib/omnibus/software.rb

@@ -248,10 +248,10 @@ module Omnibus
     # @todo It seems like this isn't used, and if it were, it should
     # probably be part of Opscode::Builder instead
     def max_build_jobs
-      if OHAI.cpu == nil
-        2
+      if OHAI.cpu && OHAI.cpu[:total] && OHAI.cpu[:total].to_s =~ /^\d+$/
+        OHAI.cpu[:total].to_i + 1
       else
-        OHAI.cpu[:total] + 1
+        2
       end
     end
 

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout