omnibus 7.0.13 → 7.0.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -6
  3. data/README.md +38 -4
  4. data/bin/omnibus +1 -1
  5. data/lib/omnibus.rb +2 -2
  6. data/lib/omnibus/build_version.rb +1 -1
  7. data/lib/omnibus/build_version_dsl.rb +5 -7
  8. data/lib/omnibus/builder.rb +4 -4
  9. data/lib/omnibus/cleaner.rb +1 -1
  10. data/lib/omnibus/cli.rb +2 -2
  11. data/lib/omnibus/cli/changelog.rb +1 -1
  12. data/lib/omnibus/compressors/base.rb +1 -1
  13. data/lib/omnibus/compressors/tgz.rb +2 -2
  14. data/lib/omnibus/config.rb +1 -1
  15. data/lib/omnibus/core_extensions/open_uri.rb +1 -1
  16. data/lib/omnibus/digestable.rb +2 -2
  17. data/lib/omnibus/download_helpers.rb +6 -2
  18. data/lib/omnibus/fetchers/file_fetcher.rb +1 -1
  19. data/lib/omnibus/fetchers/net_fetcher.rb +1 -1
  20. data/lib/omnibus/fetchers/path_fetcher.rb +1 -1
  21. data/lib/omnibus/file_syncer.rb +1 -1
  22. data/lib/omnibus/generator.rb +2 -2
  23. data/lib/omnibus/generator_files/README.md.erb +2 -1
  24. data/lib/omnibus/git_cache.rb +2 -2
  25. data/lib/omnibus/health_check.rb +2 -0
  26. data/lib/omnibus/licensing.rb +2 -2
  27. data/lib/omnibus/logger.rb +1 -1
  28. data/lib/omnibus/manifest.rb +1 -1
  29. data/lib/omnibus/metadata.rb +1 -1
  30. data/lib/omnibus/ohai.rb +1 -1
  31. data/lib/omnibus/package.rb +1 -1
  32. data/lib/omnibus/packager.rb +1 -0
  33. data/lib/omnibus/packagers/base.rb +1 -1
  34. data/lib/omnibus/packagers/msi.rb +1 -1
  35. data/lib/omnibus/packagers/solaris.rb +1 -1
  36. data/lib/omnibus/project.rb +2 -2
  37. data/lib/omnibus/publishers/artifactory_publisher.rb +2 -2
  38. data/lib/omnibus/s3_cache.rb +1 -1
  39. data/lib/omnibus/s3_helpers.rb +1 -1
  40. data/lib/omnibus/software.rb +2 -2
  41. data/lib/omnibus/templating.rb +1 -1
  42. data/lib/omnibus/thread_pool.rb +0 -2
  43. data/lib/omnibus/util.rb +1 -1
  44. data/lib/omnibus/version.rb +1 -1
  45. data/lib/omnibus/whitelist.rb +21 -0
  46. data/omnibus.gemspec +4 -5
  47. data/resources/ips/doc-transform.erb +1 -0
  48. data/resources/msi/CustomActionFastMsi.CA.dll +0 -0
  49. data/spec/support/path_helpers.rb +2 -2
  50. data/spec/unit/packagers/ips_spec.rb +1 -0
  51. metadata +7 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b8e292781fd46583f4195ce255dbec39378b8d992b3e631d252c5b910c0ddb39
4
- data.tar.gz: aea8d5eadd707ea46c044b6daba1ccbfe0e8e773a11a6fe370f5a26889e37aab
3
+ metadata.gz: c40c81af2fa93ca8c9e87d9e49a37cef3ea8145355700490d0ad5ce1a71cd169
4
+ data.tar.gz: c31ffa9da067d89db43aaff9963408ed4f56150abeb295f4e0733787f001df13
5
5
  SHA512:
6
- metadata.gz: 7216812fbdc500947bbdc3f9c8143304937e6abbcc063b4afb404b2f1971018239fe3125327fbcd6622ca082736fe729f28f2fafbaf62d4d4e706f62259fcd91
7
- data.tar.gz: f93962e1f2d9c90e67c4c549937573fb9812c19fddc5f2ad09219214892e2f0b3818d2d206d6eb5138962b2697679ff785a831a41f551f967084de9f1c9e7b81
6
+ metadata.gz: 8d309f0c4d0cb1e0ecc57dcd5aac4c21e5be7b4b71781e5a0c134a723721963e248c673b969398c5b6dd733cc0eabf18bcbb965d122f3b4f5b788634f98d522a
7
+ data.tar.gz: 5db4091ae7e877d04705089c14e8401816ca1ac8828c99e160b8161109892956c2f348dbf9cbca95f03414cd051e3240d58402867592892b2b20fcef464f20ab
data/Gemfile CHANGED
@@ -11,10 +11,5 @@ end
11
11
  group :debug do
12
12
  gem "pry"
13
13
  gem "pry-byebug"
14
- gem "pry-stack_explorer", "~> 0.4.0" # 0.4 allows us to still test Ruby 2.5
15
- end
16
-
17
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
18
- gem "ohai", "<15"
19
- gem "activesupport", "~> 5.0"
14
+ gem "pry-stack_explorer"
20
15
  end
data/README.md CHANGED
@@ -25,8 +25,7 @@ This project is managed by the CHEF Release Engineering team. For more informati
25
25
 
26
26
  Omnibus is designed to run with a minimal set of prerequisites. You will need the following:
27
27
 
28
- - Ruby 2.4+
29
- - Bundler
28
+ - Ruby 2.6+
30
29
 
31
30
  ## Get Started
32
31
 
@@ -46,10 +45,11 @@ $ omnibus new $MY_PROJECT_NAME
46
45
 
47
46
  This will generate a complete project skeleton in the directory `omnibus-$MY_PROJECT_NAME`
48
47
 
48
+ By default this will make a directory called `omnibus-$MY_PROJECT_NAME` assuming you're keeping your omnibus config separate from the repo. However, keeping it *in* your repo is a common practice, so feel to rename this directory to `omnibus` and place it in the top level of your projects source repo.
49
+
49
50
  ```bash
50
51
  $ cd omnibus-$MY_PROJECT_NAME
51
52
  $ bundle install --binstubs
52
- $ bin/omnibus build $MY_PROJECT_NAME
53
53
  ```
54
54
 
55
55
  More details can be found in the generated project's README file.
@@ -143,7 +143,7 @@ DSL Method | Description
143
143
  `package` | Invoke a packager-specific DSL
144
144
  `compress` | Invoke a compressor-specific DSL
145
145
 
146
- By default a timestamp is appended to the build_version. You can turn this behavior off by setting `append_timestamp` to `false` in your configuration file or using `--override append_timestamp:false` at the command line.
146
+ By default a timestamp is appended to the build_version. You can turn this behavior off by setting `append_timestamp` to `false` in your `omnibus.rb` or using `--override append_timestamp:false` at the command line.
147
147
 
148
148
  For more information, please see the [`Project` documentation](http://www.rubydoc.info/github/chef/omnibus/Omnibus/Project).
149
149
 
@@ -267,6 +267,40 @@ $PWD/config/software/foo.rb
267
267
 
268
268
  The first instance of `foo.rb` that is encountered will be used. Please note that **local** (vendored) softare definitions take precedence!
269
269
 
270
+ ## Building
271
+
272
+ Once you've created your package and software definitions you can build with:
273
+
274
+ ```shell
275
+ ./bin/omnibus build $MY_PACKAGE_NAME
276
+ ```
277
+
278
+ However there are several caveats to be aware of:
279
+
280
+ 1. You will almost certainly want to uncomment the `base_dir` in `omnibus.rb`,
281
+ or at the very least change `cache_dir` and `build_dir` as otherwise it'll try
282
+ to use `/var/cache/omnibus` and `/opt/$MY_PROJECT_NAME`, requiring root.
283
+ 1. The default configuration created for you references a lot of things
284
+ that are in the default config that come from the `omnibus-software` gem.
285
+ So you want to use those you'll need to either uncomment it in the `Gemfile`,
286
+ or fork it, and then reference your own
287
+ 1. If this is a ruby project and you want binstubs in `/opt/$project/bin`, you
288
+ will either need to use [appbundler](https://github.com/chef/appbundler), or
289
+ you will need to have a post install step to create those binstubs.
290
+ - Side note, appbundler requires that you include your Gemfile and gemspec
291
+ in your gem.
292
+ - Also, needs to be in your Gemfile for you to use it, as it also must
293
+ be in the resulting gem.
294
+ 1. If you specify an override of the version of the `ruby`, you will also need
295
+ to override `rubygems` and `bundler` to match the versions in that version of
296
+ `ruby` or you'll get failures around bundler version mismatches.
297
+
298
+ The build command above will of course build on your local host thus being
299
+ specific to the OS and base system you are on. But the skeleten setup by
300
+ `omnibus new` already setup kitchen for you so that it's easy to build for
301
+ a variety of OSes, See the `README.md` in your generated omnibus directory
302
+ for details.
303
+
270
304
  ## Version Manifest
271
305
 
272
306
  Git-based software definitions may specify branches as their default_version. In this case, the exact git revision to use will be determined at build-time unless a project override (see below) or external version manifest is used. To generate a version manifest use the `omnibus manifest` command:
@@ -4,7 +4,7 @@
4
4
  # https://twitter.com/mitchellh/status/283014103189053442
5
5
  Signal.trap("INT") { exit 1 }
6
6
 
7
- $:.push File.expand_path("../../lib", __FILE__)
7
+ $:.push File.expand_path("../lib", __dir__)
8
8
  $stdout.sync = true
9
9
 
10
10
  require "omnibus/cli"
@@ -17,7 +17,7 @@
17
17
  require "omnibus/core_extensions"
18
18
 
19
19
  require "cleanroom"
20
- require "pathname"
20
+ require "pathname" unless defined?(Pathname)
21
21
 
22
22
  require "omnibus/digestable"
23
23
  require "omnibus/exceptions"
@@ -208,7 +208,7 @@ module Omnibus
208
208
  # @return [Pathname]
209
209
  #
210
210
  def source_root
211
- @source_root ||= Pathname.new(File.expand_path("../..", __FILE__))
211
+ @source_root ||= Pathname.new(File.expand_path("..", __dir__))
212
212
  end
213
213
 
214
214
  #
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "time"
17
+ require "time" unless defined?(Time.zone_offset)
18
18
 
19
19
  module Omnibus
20
20
  # Provides methods for generating Omnibus project build version
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "time"
17
+ require "time" unless defined?(Time.zone_offset)
18
18
 
19
19
  module Omnibus
20
20
  class BuildVersionDSL
@@ -136,12 +136,10 @@ module Omnibus
136
136
  return false if build_info.nil?
137
137
 
138
138
  build_info.split(".").any? do |part|
139
- begin
140
- Time.strptime(part, Omnibus::BuildVersion::TIMESTAMP_FORMAT)
141
- true
142
- rescue ArgumentError
143
- false
144
- end
139
+ Time.strptime(part, Omnibus::BuildVersion::TIMESTAMP_FORMAT)
140
+ true
141
+ rescue ArgumentError
142
+ false
145
143
  end
146
144
  end
147
145
 
@@ -14,10 +14,10 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
18
- require "mixlib/shellout"
19
- require "ostruct"
20
- require "pathname"
17
+ require "fileutils" unless defined?(FileUtils)
18
+ require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
19
+ require "ostruct" unless defined?(OpenStruct)
20
+ require "pathname" unless defined?(Pathname)
21
21
  require "omnibus/whitelist"
22
22
 
23
23
  module Omnibus
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "thor"
17
+ require "thor" unless defined?(Thor)
18
18
 
19
19
  module Omnibus
20
20
  class Cleaner < Thor::Group
@@ -14,9 +14,9 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "thor"
17
+ require "thor" unless defined?(Thor)
18
18
  require "omnibus"
19
- require "ffi_yajl"
19
+ require "ffi_yajl" unless defined?(FFI_Yajl)
20
20
 
21
21
  module Omnibus
22
22
  class CLI < Command::Base
@@ -18,7 +18,7 @@ require "omnibus/changelog"
18
18
  require "omnibus/changelog_printer"
19
19
  require "omnibus/manifest_diff"
20
20
  require "omnibus/semantic_version"
21
- require "ffi_yajl"
21
+ require "ffi_yajl" unless defined?(FFI_Yajl)
22
22
 
23
23
  module Omnibus
24
24
  class Command::ChangeLog < Command::Base
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
 
19
19
  module Omnibus
20
20
  class Compressor::Base < Packager::Base
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "rubygems/package"
18
- require "zlib"
17
+ require "rubygems/package" unless defined?(Gem::Package)
18
+ require "zlib" unless defined?(Zlib)
19
19
 
20
20
  module Omnibus
21
21
  class Compressor::TGZ < Compressor::Base
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "singleton"
17
+ require "singleton" unless defined?(Singleton)
18
18
 
19
19
  module Omnibus
20
20
  class Config
@@ -1,4 +1,4 @@
1
- require "open-uri"
1
+ require "open-uri" unless defined?(OpenURI)
2
2
 
3
3
  module OpenURI
4
4
  class << self
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "openssl"
18
- require "pathname"
17
+ require "openssl" unless defined?(OpenSSL)
18
+ require "pathname" unless defined?(Pathname)
19
19
  require "omnibus/logging"
20
20
 
21
21
  module Omnibus
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "open-uri"
17
+ require "open-uri" unless defined?(OpenURI)
18
18
  require "ruby-progressbar"
19
19
 
20
20
  module Omnibus
@@ -77,7 +77,11 @@ module Omnibus
77
77
  end
78
78
  end
79
79
 
80
- file = open(from_url, options)
80
+ if RUBY_VERSION.to_f < 2.7
81
+ file = open(from_url, options)
82
+ else
83
+ file = URI.open(from_url, options)
84
+ end
81
85
  # This is a temporary file. Close and flush it before attempting to copy
82
86
  # it over.
83
87
  file.close
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
 
19
19
  module Omnibus
20
20
  class FileFetcher < Fetcher
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
  require "omnibus/download_helpers"
19
19
 
20
20
  module Omnibus
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
 
19
19
  module Omnibus
20
20
  class PathFetcher < Fetcher
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
 
19
19
  module Omnibus
20
20
  module FileSyncer
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "thor"
17
+ require "thor" unless defined?(Thor)
18
18
 
19
19
  module Omnibus
20
20
  class Generator < Thor::Group
@@ -73,7 +73,7 @@ module Omnibus
73
73
  class << self
74
74
  # Set the source root for Thor
75
75
  def source_root
76
- File.expand_path("../generator_files", __FILE__)
76
+ File.expand_path("generator_files", __dir__)
77
77
  end
78
78
  end
79
79
 
@@ -114,7 +114,8 @@ section:
114
114
  ```shell
115
115
  $ bin/kitchen login ubuntu-1804
116
116
  [vagrant@ubuntu...] $ . load-omnibus-toolchain.sh
117
- [vagrant@ubuntu...] $ cd <%= config[:name] %>
117
+ [vagrant@ubuntu...] $ [ -e .bundle ] && sudo chown -R vagrant:vagrant .bundle
118
+ [vagrant@ubuntu...] $ cd <%= config[:name] %> # or 'cd <%= config[:name] %>/omnibus' if your omnibus project is embedded in your main project
118
119
  [vagrant@ubuntu...] $ bundle install
119
120
  [vagrant@ubuntu...] $ bin/omnibus build <%= config[:name] %>
120
121
  ```
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "digest"
18
- require "fileutils"
17
+ require "digest" unless defined?(Digest)
18
+ require "fileutils" unless defined?(FileUtils)
19
19
 
20
20
  module Omnibus
21
21
  class GitCache
@@ -428,6 +428,8 @@ module Omnibus
428
428
  ARCH_WHITELIST_LIBS
429
429
  when "mac_os_x"
430
430
  MAC_WHITELIST_LIBS
431
+ when "omnios"
432
+ OMNIOS_WHITELIST_LIBS
431
433
  when "solaris2"
432
434
  SOLARIS_WHITELIST_LIBS
433
435
  when "smartos"
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "uri"
18
- require "fileutils"
17
+ require "uri" unless defined?(URI)
18
+ require "fileutils" unless defined?(FileUtils)
19
19
  require "omnibus/download_helpers"
20
20
  require "license_scout/collector"
21
21
  require "license_scout/reporter"
@@ -17,7 +17,7 @@
17
17
  module Omnibus
18
18
  class Logger
19
19
 
20
- require "time"
20
+ require "time" unless defined?(Time.zone_offset)
21
21
 
22
22
  #
23
23
  # The amount of padding on the left column.
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "ffi_yajl"
17
+ require "ffi_yajl" unless defined?(FFI_Yajl)
18
18
 
19
19
  module Omnibus
20
20
  class Manifest
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "ffi_yajl"
17
+ require "ffi_yajl" unless defined?(FFI_Yajl)
18
18
 
19
19
  module Omnibus
20
20
  class Metadata
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "ohai"
17
+ require "ohai" unless defined?(Ohai::System)
18
18
 
19
19
  module Omnibus
20
20
  class Ohai
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "ffi_yajl"
17
+ require "ffi_yajl" unless defined?(FFI_Yajl)
18
18
 
19
19
  module Omnibus
20
20
  class Package
@@ -46,6 +46,7 @@ module Omnibus
46
46
  "amazon" => RPM,
47
47
  "aix" => BFF,
48
48
  "solaris" => Solaris,
49
+ "omnios" => IPS,
49
50
  "ips" => IPS,
50
51
  "windows" => [MSI, APPX],
51
52
  "mac_os_x" => PKG,
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
 
19
19
  module Omnibus
20
20
  class Packager::Base
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "pathname"
17
+ require "pathname" unless defined?(Pathname)
18
18
  require "omnibus/packagers/windows_base"
19
19
 
20
20
  module Omnibus
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "socket"
17
+ require "socket" unless defined?(Socket)
18
18
 
19
19
  module Omnibus
20
20
  class Packager::Solaris < Packager::Base
@@ -15,8 +15,8 @@
15
15
  # limitations under the License.
16
16
  #
17
17
 
18
- require "time"
19
- require "ffi_yajl"
18
+ require "time" unless defined?(Time.zone_offset)
19
+ require "ffi_yajl" unless defined?(FFI_Yajl)
20
20
  require "omnibus/manifest"
21
21
  require "omnibus/manifest_entry"
22
22
  require "omnibus/reports"
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "uri"
18
- require "benchmark"
17
+ require "uri" unless defined?(URI)
18
+ require "benchmark" unless defined?(Benchmark)
19
19
 
20
20
  module Omnibus
21
21
  class ArtifactoryPublisher < Publisher
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
17
+ require "fileutils" unless defined?(FileUtils)
18
18
  require "omnibus/s3_helpers"
19
19
 
20
20
  module Omnibus
@@ -17,7 +17,7 @@
17
17
  require "aws-sdk-s3"
18
18
  require "aws-sdk-core/credentials"
19
19
  require "aws-sdk-core/shared_credentials"
20
- require "base64"
20
+ require "base64" unless defined?(Base64)
21
21
 
22
22
  module Omnibus
23
23
  module S3Helpers
@@ -14,8 +14,8 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "fileutils"
18
- require "uri"
17
+ require "fileutils" unless defined?(FileUtils)
18
+ require "uri" unless defined?(URI)
19
19
  require "omnibus/manifest_entry"
20
20
 
21
21
  module Omnibus
@@ -13,7 +13,7 @@
13
13
  # See the License for the specific language governing permissions and
14
14
  # limitations under the License.
15
15
  #
16
- require "erb"
16
+ require "erb" unless defined?(Erb)
17
17
 
18
18
  module Omnibus
19
19
  module Templating
@@ -15,8 +15,6 @@
15
15
  # limitations under the License.
16
16
  #
17
17
 
18
- require "thread"
19
-
20
18
  module Omnibus
21
19
  class ThreadPool
22
20
 
@@ -14,7 +14,7 @@
14
14
  # limitations under the License.
15
15
  #
16
16
 
17
- require "mixlib/shellout"
17
+ require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
18
18
 
19
19
  module Omnibus
20
20
  module Util
@@ -15,5 +15,5 @@
15
15
  #
16
16
 
17
17
  module Omnibus
18
- VERSION = "7.0.13".freeze
18
+ VERSION = "7.0.34".freeze
19
19
  end
@@ -58,6 +58,27 @@ AIX_WHITELIST_LIBS = [
58
58
  /unix$/,
59
59
  ].freeze
60
60
 
61
+ OMNIOS_WHITELIST_LIBS = [
62
+ /libc\.so\.1/,
63
+ /libcrypt\./,
64
+ /libcrypt\.so\.1/,
65
+ /libdl\.so\.1/,
66
+ /libgcc_s\.so\.1/,
67
+ /libgen\.so\.1/,
68
+ /libm\.so\.2/,
69
+ /libmd\.so\.1/,
70
+ /libmp\.so/,
71
+ /libmp\.so\.2/,
72
+ /libnsl\.so\.1/,
73
+ /libpthread\.so\.1/,
74
+ /librt\.so\.1/,
75
+ /libsocket\.so\.1/,
76
+ /libssp\.s/,
77
+ /libssp\.so./,
78
+ /libssp\.so\.0/,
79
+ /libgcc_s\.so\.1/,
80
+ ].freeze
81
+
61
82
  SOLARIS_WHITELIST_LIBS = [
62
83
  /libaio\.so/,
63
84
  /libavl\.so/,
@@ -1,5 +1,4 @@
1
- # -*- encoding: utf-8 -*-
2
- lib = File.expand_path("../lib", __FILE__)
1
+ lib = File.expand_path("lib", __dir__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require "omnibus/version"
5
4
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |gem|
13
12
  gem.description = gem.summary
14
13
  gem.homepage = "https://github.com/chef/omnibus"
15
14
 
16
- gem.required_ruby_version = ">= 2.4"
15
+ gem.required_ruby_version = ">= 2.6"
17
16
 
18
17
  gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/{*,.kitchen*}")
19
18
  gem.bindir = "bin"
@@ -26,7 +25,7 @@ Gem::Specification.new do |gem|
26
25
  gem.add_dependency "chef-cleanroom", "~> 1.0"
27
26
  gem.add_dependency "ffi-yajl", "~> 2.2"
28
27
  gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
29
- gem.add_dependency "ohai", ">= 13", "< 17"
28
+ gem.add_dependency "ohai", ">= 15"
30
29
  gem.add_dependency "ruby-progressbar", "~> 1.7"
31
30
  gem.add_dependency "thor", ">= 0.18", "< 2.0"
32
31
  gem.add_dependency "license_scout", "~> 1.0"
@@ -36,7 +35,7 @@ Gem::Specification.new do |gem|
36
35
 
37
36
  gem.add_development_dependency "artifactory", "~> 3.0"
38
37
  gem.add_development_dependency "aruba", "~> 0.5"
39
- gem.add_development_dependency "chefstyle", "= 1.1.0"
38
+ gem.add_development_dependency "chefstyle", "= 1.5.0"
40
39
  gem.add_development_dependency "fauxhai", ">= 5.2"
41
40
  gem.add_development_dependency "rspec", "~> 3.0"
42
41
  gem.add_development_dependency "rspec-json_expectations"
@@ -2,3 +2,4 @@
2
2
  <transform file depend -> edit pkg.debug.depend.file ruby env>
3
3
  <transform file depend -> edit pkg.debug.depend.file make env>
4
4
  <transform file depend -> edit pkg.debug.depend.file perl env>
5
+ <transform file depend -> edit pkg.debug.depend.path usr/local/bin usr/bin>
@@ -6,13 +6,13 @@ module Omnibus
6
6
  end
7
7
 
8
8
  def tmp_path
9
- File.expand_path("../../tmp", __FILE__)
9
+ File.expand_path("../tmp", __dir__)
10
10
  end
11
11
 
12
12
  private
13
13
 
14
14
  def fixtures_path
15
- File.expand_path("../../fixtures", __FILE__)
15
+ File.expand_path("../fixtures", __dir__)
16
16
  end
17
17
  end
18
18
  end
@@ -155,6 +155,7 @@ module Omnibus
155
155
  expect(transform_file_contents).to include("<transform file depend -> edit pkg.debug.depend.file ruby env>")
156
156
  expect(transform_file_contents).to include("<transform file depend -> edit pkg.debug.depend.file make env>")
157
157
  expect(transform_file_contents).to include("<transform file depend -> edit pkg.debug.depend.file perl env>")
158
+ expect(transform_file_contents).to include("<transform file depend -> edit pkg.debug.depend.path usr/local/bin usr/bin>")
158
159
  end
159
160
  end
160
161
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omnibus
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.13
4
+ version: 7.0.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chef Software, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-15 00:00:00.000000000 Z
11
+ date: 2020-11-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-s3
@@ -92,20 +92,14 @@ dependencies:
92
92
  requirements:
93
93
  - - ">="
94
94
  - !ruby/object:Gem::Version
95
- version: '13'
96
- - - "<"
97
- - !ruby/object:Gem::Version
98
- version: '17'
95
+ version: '15'
99
96
  type: :runtime
100
97
  prerelease: false
101
98
  version_requirements: !ruby/object:Gem::Requirement
102
99
  requirements:
103
100
  - - ">="
104
101
  - !ruby/object:Gem::Version
105
- version: '13'
106
- - - "<"
107
- - !ruby/object:Gem::Version
108
- version: '17'
102
+ version: '15'
109
103
  - !ruby/object:Gem::Dependency
110
104
  name: ruby-progressbar
111
105
  requirement: !ruby/object:Gem::Requirement
@@ -216,14 +210,14 @@ dependencies:
216
210
  requirements:
217
211
  - - '='
218
212
  - !ruby/object:Gem::Version
219
- version: 1.1.0
213
+ version: 1.5.0
220
214
  type: :development
221
215
  prerelease: false
222
216
  version_requirements: !ruby/object:Gem::Requirement
223
217
  requirements:
224
218
  - - '='
225
219
  - !ruby/object:Gem::Version
226
- version: 1.1.0
220
+ version: 1.5.0
227
221
  - !ruby/object:Gem::Dependency
228
222
  name: fauxhai
229
223
  requirement: !ruby/object:Gem::Requirement
@@ -552,7 +546,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
552
546
  requirements:
553
547
  - - ">="
554
548
  - !ruby/object:Gem::Version
555
- version: '2.4'
549
+ version: '2.6'
556
550
  required_rubygems_version: !ruby/object:Gem::Requirement
557
551
  requirements:
558
552
  - - ">="