omnibus 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTkxMzRjMmQ2ZmZhZGE4YjBiYzdjOTllOTBhYzFhMDc5ODY0OThhNQ==
+    ZTI1NmVlOGQxN2VlMDU1M2VhMDU1NDA3ZjI3M2QxZmI0YzcwNTIyMQ==
   data.tar.gz: !binary |-
-    ZmIzYjRiNDdjNDkyYzVhMGY4YTk3ODNiMmVjYTg4YjVlMWE2MDE0YQ==
+    MjhhMDNhYTVmZGYyZTE2MDFiMmIyZmEwZmI2MzM1YjYwZTZlZTFmYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjljYzFjNTU4MDI2NDY5YzRhZmEwNjcyOTA4ZmRiNGE1YWVmYThmYzhmOGI3
-    NGEwMWZlNDI0YzdjZmY5OTg5YWQ1MjAwOTM4Y2I3MTgxNmJhMjQ4YWI2MDhl
-    MjU4OTVlN2E3Zjc4YTY5YjQ2MTNmMmU2MzRjOWVjZTYyOTg3ZmE=
+    NTY5N2NiNGM4MmE2MDVhZDNiNzc3Y2Y3OWM2NDllMjE4MTQyY2ViZTkxNmVj
+    ZGVkY2I0NTgxODdmMmFmNTViY2RkNDdiNmJiNjA5MWE5MjQ5ZmUyOGU4YjU1
+    ZDNiYTEwOGEyNzliZmRjMGVlYjdjNjkzYzgwOWIzMzU4MTU0MzI=
   data.tar.gz: !binary |-
-    MDEzMmM5MzRiZjM4YWQ4ZTE3NjMxYTkxNjNiYjYxM2RkYmFiNWRiYjk4YjRi
-    Zjk0ZGNmNjM1YjhmZDI3ZDU4YjZlMWZmMTc3N2Y3MzNmMGMyNWQxOGFlNWNk
-    MmY0NTljMzdjNTI2NjAwNWVkOGE3MGRmYmExODU5NjY2MTliYjQ=
+    MmU3ODFlN2YxMmViYzIzMTZiNTAxZWM2YWVjYTI2NTRhYzk1OTU3MjYwMDAx
+    NmFjZWJhZGYyNGEyZjBkY2QwNGM3ODEzOTQwZjE4YzMwMTg0OWNiNDI1MDg5
+    NWQ1ZWExOTNjNTdmNmRjNTQ1ODljM2RkNWNiMjFmYWI3OGU1YTg=

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.3 (May 2, 2013)
+
+FEATURES:
+
+* [CHEF-2576] - SmartOS health check whitelist support
+* [CHEF-4141] - FreeBSD health check whitelist support
+* [CHEF-3990] - Add support to uncompress zip file
+
+BUG FIXES:
+
+* Fix project homepage in gemspec
+* Proper Thor 0.16.0, 0.17.0 suppport - Thor 0.18.0 renamed current_task to
+  current_command
+
 ## 1.0.2 (April 23, 2013)
 
 IMPROVEMENTS:

data/bin/makeself.sh

@@ -358,8 +358,8 @@ else
 	PATH=${GUESS_MD5_PATH:-"$OLD_PATH:/bin:/usr/bin:/sbin:/usr/local/ssl/bin:/usr/local/bin:/opt/openssl/bin"}
 	MD5_ARG=""
 	MD5_PATH=`exec <&- 2>&-; which md5sum || type md5sum`
-	test -x $MD5_PATH || MD5_PATH=`exec <&- 2>&-; which md5 || type md5`
-	test -x $MD5_PATH || MD5_PATH=`exec <&- 2>&-; which digest || type digest`
+	test -x "$MD5_PATH" || MD5_PATH=`exec <&- 2>&-; which md5 || type md5`
+	test -x "$MD5_PATH" || MD5_PATH=`exec <&- 2>&-; which digest || type digest`
 	PATH=$OLD_PATH
 	if test `basename $MD5_PATH` = digest; then
 		MD5_ARG="-a md5"

data/lib/omnibus/cli/base.rb

@@ -33,8 +33,9 @@ module Omnibus
         super(args, options, config)
         $stdout.sync = true
 
-        # Don't try to initialize the Omnibus project for help commands
-        return if config[:current_command].name == "help"
+        # Don't try to initialize the Omnibus project for help commands. current_task renamed to current_command in Thor 0.18.0
+        current_command = config[:current_command] ? config[:current_command].name : config[:current_task].name
+        return if current_command == "help"
 
         if path = @options[:path]
           if (config = @options[:config]) && File.exist?(@options[:config])

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -177,6 +177,8 @@ E
         "bzip2 -dc  #{project_file} | ( cd #{source_dir} && tar -xf - )"
       elsif project_file.end_with?(".7z")
         "7z.exe x #{project_file} -o#{source_dir} -r -y"
+      elsif project_file.end_with?(".zip")
+        "unzip #{project_file} -d #{source_dir}"
       else
         #if we don't recognize the extension, simply copy over the file
         Proc.new do

data/lib/omnibus/health_check.rb

@@ -33,7 +33,7 @@ module Omnibus
                       /libstdc\+\+\.so/,
                       /libutil\.so/,
                       /linux-vdso.+/,
-                      /linux-gate\.so/,
+                      /linux-gate\.so/
                      ]
 
     SOLARIS_WHITELIST_LIBS = [
@@ -66,7 +66,22 @@ module Omnibus
                               # solaris 9 libraries:
                               /libm\.so\.1/,
                               /libc_psr\.so\.1/,
-                              /s9_preload\.so\.1/,
+                              /s9_preload\.so\.1/
+                             ]
+
+    SMARTOS_WHITELIST_LIBS = [
+                              /libm.so/,
+                              /libpthread.so/,
+                              /librt.so/,
+                              /libsocket.so/,
+                              /libdl.so/,
+                              /libnsl.so/,
+                              /libgen.so/,
+                              /libmp.so/,
+                              /libmd.so/,
+                              /libc.so/,
+                              /libgcc_s.so/,
+                              /libcrypt.so/
                              ]
 
     MAC_WHITELIST_LIBS = [
@@ -84,11 +99,20 @@ module Omnibus
                           /libiconv/
                          ]
 
+    FREEBSD_WHITELIST_LIBS = [
+                               /libc\.so/,
+                               /libcrypt\.so/,
+                               /libm\.so/,
+                               /librt\.so/,
+                               /libthr\.so/,
+                               /libutil\.so/
+                              ]
+
     WHITELIST_FILES = [
                        /jre\/bin\/javaws/,
                        /jre\/bin\/policytool/,
                        /jre\/lib/,
-                       /jre\/plugin/,
+                       /jre\/plugin/
                       ]
 
     def self.log(msg)
@@ -182,6 +206,10 @@ module Omnibus
                          MAC_WHITELIST_LIBS
                        when 'solaris2'
                          SOLARIS_WHITELIST_LIBS
+                       when 'smartos'
+                         SMARTOS_WHITELIST_LIBS
+                       when 'freebsd'
+                         FREEBSD_WHITELIST_LIBS
                        else
                          WHITELIST_LIBS
                        end

data/lib/omnibus/project.rb

@@ -148,6 +148,10 @@ module Omnibus
         platform_version =~ /^(\d+)/
         maj = $1
         "#{build_iteration}.el#{maj}"
+      when 'freebsd'
+        platform_version =~ /^(\d+)/
+        maj = $1
+        "#{build_iteration}.#{platform}.#{maj}.#{machine}"
       when 'windows'
         "#{build_iteration}.windows"
       else
@@ -299,6 +303,10 @@ module Omnibus
       OHAI.platform_family
     end
 
+    def machine
+      OHAI['kernel']['machine']
+    end
+
     # Convenience method for accessing the global Omnibus configuration object.
     #
     # @return Omnibus::Config

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/omnibus.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email          = "info@opscode.com"
   gem.description    = "Omnibus helps you build self-installing, full-stack software builds."
   gem.summary        = gem.description
-  gem.homepage       = "https://github.com/opscode/opscode-ruby"
+  gem.homepage       = "https://github.com/opscode/omnibus-ruby"
 
   gem.required_ruby_version = ">= 1.9.1"
 

data/spec/fetchers/net_fetcher_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Omnibus::NetFetcher do
+  it "should download and uncompress zip files" do
+    software_mock = stub 'software'
+    software_mock.stub :project_file => 'file.zip',
+                       :name         => 'file',
+                       :source       => '/tmp/out',
+                       :checksum     => 'abc123',
+                       :source_uri   => 'http://example.com/file.zip',
+                       :source_dir   => '/tmp/out',
+                       :project_dir  => '/tmp/project'
+    net_fetcher = Omnibus::NetFetcher.new software_mock
+    net_fetcher.extract_cmd.should == 'unzip file.zip -d /tmp/out'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -201,10 +201,11 @@ files:
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
 - spec/data/software/erchef.rb
+- spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/opscode/opscode-ruby
+homepage: https://github.com/opscode/omnibus-ruby
 licenses:
 - Apache 2.0
 metadata: {}
@@ -234,6 +235,7 @@ test_files:
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
 - spec/data/software/erchef.rb
+- spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb