omnibus 3.0.0 → 3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +17 -1
- data/.travis.yml +11 -3
- data/CHANGELOG.md +39 -1
- data/Gemfile +0 -4
- data/README.md +10 -8
- data/Rakefile +18 -7
- data/bin/omnibus +3 -3
- data/docs/Building on Windows.md +98 -0
- data/features/commands/_deprecated.feature +46 -0
- data/features/commands/build.feature +9 -0
- data/features/commands/clean.feature +21 -0
- data/features/commands/list.feature +16 -0
- data/features/commands/new.feature +8 -0
- data/features/commands/version.feature +12 -0
- data/features/step_definitions/generator_steps.rb +28 -0
- data/features/support/env.rb +13 -0
- data/lib/omnibus.rb +319 -240
- data/lib/omnibus/artifact.rb +16 -0
- data/lib/omnibus/build_version.rb +39 -20
- data/lib/omnibus/build_version_dsl.rb +136 -0
- data/lib/omnibus/builder.rb +28 -23
- data/lib/omnibus/cleaner.rb +72 -0
- data/lib/omnibus/cli.rb +115 -11
- data/lib/omnibus/cli/base.rb +82 -81
- data/lib/omnibus/cli/cache.rb +80 -32
- data/lib/omnibus/cli/deprecated.rb +79 -0
- data/lib/omnibus/cli/release.rb +17 -21
- data/lib/omnibus/config.rb +38 -13
- data/lib/omnibus/exceptions.rb +70 -18
- data/lib/omnibus/fetcher.rb +18 -11
- data/lib/omnibus/fetchers/git_fetcher.rb +48 -53
- data/lib/omnibus/fetchers/net_fetcher.rb +29 -27
- data/lib/omnibus/fetchers/path_fetcher.rb +9 -12
- data/lib/omnibus/fetchers/s3_cache_fetcher.rb +5 -8
- data/lib/omnibus/generator.rb +131 -0
- data/lib/omnibus/{templates → generator_files}/.kitchen.local.yml.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/.kitchen.yml.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/Berksfile.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/Gemfile.erb +2 -2
- data/lib/omnibus/{templates → generator_files}/README.md.erb +6 -7
- data/lib/omnibus/{templates → generator_files}/Vagrantfile.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/gitignore.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/mac_dmg/background.png +0 -0
- data/lib/omnibus/{templates → generator_files}/mac_dmg/icon.png +0 -0
- data/lib/omnibus/{templates → generator_files}/mac_pkg/background.png +0 -0
- data/lib/omnibus/{templates → generator_files}/mac_pkg/license.html.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/mac_pkg/welcome.html.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/omnibus.rb.example.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/package_scripts/makeselfinst.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/package_scripts/postinst.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/package_scripts/postrm.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/package_scripts/preinst.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/package_scripts/prerm.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/project.rb.erb +0 -1
- data/lib/omnibus/{templates → generator_files}/software/c-example.rb.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/software/erlang-example.rb.erb +0 -0
- data/lib/omnibus/{templates → generator_files}/software/ruby-example.rb.erb +0 -0
- data/lib/omnibus/generator_files/windows_msi/assets/LICENSE.rtf +8 -0
- data/lib/omnibus/generator_files/windows_msi/assets/banner_background.bmp +0 -0
- data/lib/omnibus/generator_files/windows_msi/assets/dialog_background.bmp +0 -0
- data/lib/omnibus/generator_files/windows_msi/assets/project.ico +0 -0
- data/lib/omnibus/generator_files/windows_msi/assets/project_16x16.ico +0 -0
- data/lib/omnibus/generator_files/windows_msi/assets/project_32x32.ico +0 -0
- data/lib/omnibus/generator_files/windows_msi/localization-en-us.wxl.erb +20 -0
- data/lib/omnibus/generator_files/windows_msi/parameters.wxi.erb +9 -0
- data/lib/omnibus/generator_files/windows_msi/source.wxs.erb +74 -0
- data/lib/omnibus/health_check.rb +80 -40
- data/lib/omnibus/install_path_cache.rb +11 -12
- data/lib/omnibus/library.rb +30 -3
- data/lib/omnibus/logger.rb +47 -0
- data/lib/omnibus/logging.rb +60 -0
- data/lib/omnibus/null_builder.rb +23 -0
- data/lib/omnibus/ohai.rb +70 -0
- data/lib/omnibus/overrides.rb +69 -48
- data/lib/omnibus/package_release.rb +7 -14
- data/lib/omnibus/packagers/base.rb +66 -13
- data/lib/omnibus/packagers/mac_dmg.rb +23 -3
- data/lib/omnibus/packagers/mac_pkg.rb +20 -10
- data/lib/omnibus/packagers/windows_msi.rb +109 -0
- data/lib/omnibus/project.rb +136 -79
- data/lib/omnibus/reports.rb +1 -2
- data/lib/omnibus/{s3_cacher.rb → s3_cache.rb} +15 -37
- data/lib/omnibus/software.rb +77 -27
- data/lib/omnibus/software_s3_urls.rb +50 -0
- data/lib/omnibus/sugar.rb +1 -3
- data/lib/omnibus/util.rb +45 -18
- data/lib/omnibus/version.rb +2 -3
- data/omnibus.gemspec +5 -3
- data/spec/data/complicated/config/patches/bzip2/makefile_take_env_vars.patch +15 -0
- data/spec/data/complicated/config/patches/couchdb/patch_for_couchjs_stack.patch +19 -0
- data/spec/data/complicated/config/patches/gd/gd-2.0.33-configure-libpng.patch +100 -0
- data/spec/data/complicated/config/patches/keepalived/keepalived-1.2.9_opscode_centos_5.patch +15 -0
- data/spec/data/complicated/config/patches/libedit/freebsd-vi-fix.patch +24 -0
- data/spec/data/complicated/config/patches/libiconv/libiconv-1.14_srclib_stdio.in.h-remove-gets-declarations.patch +29 -0
- data/spec/data/complicated/config/patches/libwrap/tcp_wrappers-7.6-makefile-dest-fix.patch +35 -0
- data/spec/data/complicated/config/patches/libwrap/tcp_wrappers-7.6-malloc-fix.patch +13 -0
- data/spec/data/complicated/config/patches/libwrap/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch +1035 -0
- data/spec/data/complicated/config/patches/logrotate/logrotate_basedir_override.patch +12 -0
- data/spec/data/complicated/config/patches/ncurses/ncurses-5.9-solaris-xopen_source_extended-detection.patch +11 -0
- data/spec/data/complicated/config/patches/ncurses/ncurses-clang.patch +42 -0
- data/spec/data/complicated/config/patches/ncurses/patch-aa +23 -0
- data/spec/data/complicated/config/patches/ncurses/patch-ab +44 -0
- data/spec/data/complicated/config/patches/ncurses/patch-ac +40 -0
- data/spec/data/complicated/config/patches/ncurses/patch-ad +12 -0
- data/spec/data/complicated/config/patches/ncurses/patch-aix-configure +23 -0
- data/spec/data/complicated/config/patches/ncurses/patch-cxx_cursesf.h +22 -0
- data/spec/data/complicated/config/patches/ncurses/patch-cxx_cursesm.h +22 -0
- data/spec/data/complicated/config/patches/nrpe/fix_for_runit.patch +64 -0
- data/spec/data/complicated/config/patches/openssl/openssl-1.0.1f-do-not-build-docs.patch +101 -0
- data/spec/data/complicated/config/patches/postgresql/postgresql-9.1.2-configure-ncurses-fix.patch +12 -0
- data/spec/data/complicated/config/patches/ruby/patch-configure +103 -0
- data/spec/data/complicated/config/patches/ruby/ruby-aix-configure.patch +10 -0
- data/spec/data/complicated/config/patches/ruby/ruby-openssl-1.0.1c.patch +42 -0
- data/spec/data/complicated/config/patches/ruby/ruby_aix_1_9_3_448_ssl_EAGAIN.patch +57 -0
- data/spec/data/complicated/config/patches/ruby/rvm-cflags.patch +27 -0
- data/spec/data/complicated/config/projects/angrychef.rb +32 -0
- data/spec/data/complicated/config/projects/chef-windows.rb +32 -0
- data/spec/data/complicated/config/projects/chef.rb +32 -0
- data/spec/data/complicated/config/projects/chefdk-windows.rb +41 -0
- data/spec/data/complicated/config/projects/chefdk.rb +44 -0
- data/spec/data/complicated/config/software/appbundler.rb +25 -0
- data/spec/data/complicated/config/software/autoconf.rb +35 -0
- data/spec/data/complicated/config/software/automake.rb +39 -0
- data/spec/data/complicated/config/software/berkshelf.rb +44 -0
- data/{lib/omnibus/fetchers.rb → spec/data/complicated/config/software/bundler.rb} +8 -5
- data/spec/data/complicated/config/software/bzip2.rb +46 -0
- data/spec/data/complicated/config/software/cacerts.rb +44 -0
- data/spec/data/complicated/config/software/chef-client-msi.rb +88 -0
- data/spec/data/complicated/config/software/chef-gem.rb +26 -0
- data/spec/data/complicated/config/software/chef-vault.rb +43 -0
- data/spec/data/complicated/config/software/chef-windows.rb +158 -0
- data/spec/data/complicated/config/software/chef.rb +170 -0
- data/spec/data/complicated/config/software/chefdk.rb +103 -0
- data/spec/data/complicated/config/software/couchdb.rb +53 -0
- data/spec/data/complicated/config/software/curl.rb +48 -0
- data/spec/data/complicated/config/software/erlang.rb +65 -0
- data/spec/data/complicated/config/software/expat.rb +21 -0
- data/spec/data/complicated/config/software/fcgi.rb +56 -0
- data/spec/data/complicated/config/software/fcgiwrap.rb +41 -0
- data/spec/data/complicated/config/software/gd.rb +56 -0
- data/spec/data/complicated/config/software/gdbm.rb +40 -0
- data/spec/data/complicated/config/software/gecode.rb +48 -0
- data/spec/data/complicated/config/software/git.rb +40 -0
- data/spec/data/complicated/config/software/help2man.rb +30 -0
- data/spec/data/complicated/config/software/icu.rb +40 -0
- data/spec/data/complicated/config/software/jre.rb +48 -0
- data/spec/data/complicated/config/software/keepalived.rb +43 -0
- data/spec/data/complicated/config/software/libarchive.rb +50 -0
- data/spec/data/complicated/config/software/libedit.rb +69 -0
- data/spec/data/complicated/config/software/libffi.rb +71 -0
- data/spec/data/complicated/config/software/libgcc.rb +39 -0
- data/spec/data/complicated/config/software/libiconv.rb +66 -0
- data/spec/data/complicated/config/software/libjpeg.rb +39 -0
- data/spec/data/complicated/config/software/libpng.rb +38 -0
- data/spec/data/complicated/config/software/libtool.rb +52 -0
- data/spec/data/complicated/config/software/libwrap.rb +50 -0
- data/spec/data/complicated/config/software/libxml2.rb +51 -0
- data/spec/data/complicated/config/software/libxslt.rb +52 -0
- data/spec/data/complicated/config/software/libyaml-windows.rb +43 -0
- data/spec/data/complicated/config/software/libyaml.rb +62 -0
- data/spec/data/complicated/config/software/logrotate.rb +41 -0
- data/spec/data/complicated/config/software/makedepend.rb +73 -0
- data/spec/data/complicated/config/software/mysql2.rb +42 -0
- data/spec/data/complicated/config/software/nagios-plugins.rb +53 -0
- data/spec/data/complicated/config/software/nagios.rb +66 -0
- data/spec/data/complicated/config/software/ncurses.rb +149 -0
- data/spec/data/complicated/config/software/nginx.rb +40 -0
- data/spec/data/complicated/config/software/nodejs.rb +44 -0
- data/spec/data/complicated/config/software/nokogiri.rb +55 -0
- data/spec/data/complicated/config/software/nrpe.rb +61 -0
- data/spec/data/complicated/config/software/ohai.rb +64 -0
- data/spec/data/complicated/config/software/omnibus-ctl.rb +34 -0
- data/spec/data/complicated/config/software/openresty.rb +67 -0
- data/spec/data/complicated/config/software/openssl.rb +158 -0
- data/spec/data/complicated/config/software/pcre.rb +42 -0
- data/spec/data/complicated/config/software/perl-extutils-embed.rb +15 -0
- data/spec/data/complicated/config/software/perl-extutils-makemaker.rb +15 -0
- data/spec/data/complicated/config/software/perl.rb +48 -0
- data/spec/data/complicated/config/software/perl_pg_driver.rb +12 -0
- data/spec/data/complicated/config/software/php.rb +41 -0
- data/spec/data/complicated/config/software/pip.rb +30 -0
- data/spec/data/complicated/config/software/pkg-config.rb +66 -0
- data/spec/data/complicated/config/software/popt.rb +47 -0
- data/spec/data/complicated/config/software/postgresql.rb +51 -0
- data/spec/data/complicated/config/software/preparation.rb +30 -0
- data/spec/data/complicated/config/software/pygments.rb +25 -0
- data/spec/data/complicated/config/software/python.rb +49 -0
- data/spec/data/complicated/config/software/rabbitmq.rb +36 -0
- data/spec/data/complicated/config/software/rebar.rb +36 -0
- data/spec/data/complicated/config/software/redis.rb +33 -0
- data/spec/data/complicated/config/software/rsync.rb +48 -0
- data/spec/data/complicated/config/software/ruby-windows-devkit.rb +30 -0
- data/spec/data/complicated/config/software/ruby-windows.rb +30 -0
- data/spec/data/complicated/config/software/ruby.rb +162 -0
- data/spec/data/complicated/config/software/rubygems-customization.rb +57 -0
- data/spec/data/complicated/config/software/rubygems.rb +37 -0
- data/spec/data/complicated/config/software/runit.rb +118 -0
- data/spec/data/complicated/config/software/server-jre.rb +46 -0
- data/spec/data/complicated/config/software/setuptools.rb +30 -0
- data/spec/data/complicated/config/software/spawn-fcgi.rb +40 -0
- data/spec/data/complicated/config/software/sphinx.rb +26 -0
- data/spec/data/complicated/config/software/spidermonkey.rb +60 -0
- data/spec/data/complicated/config/software/sqitch.rb +24 -0
- data/spec/data/complicated/config/software/test-kitchen.rb +39 -0
- data/spec/data/complicated/config/software/unicorn.rb +27 -0
- data/spec/data/complicated/config/software/util-macros.rb +46 -0
- data/spec/data/complicated/config/software/version-manifest.rb +32 -0
- data/spec/data/complicated/config/software/xproto.rb +46 -0
- data/spec/data/complicated/config/software/yajl.rb +30 -0
- data/spec/data/complicated/config/software/zlib.rb +67 -0
- data/spec/data/projects/chefdk.rb +4 -4
- data/spec/data/projects/sample.rb +3 -0
- data/spec/data/software/erchef.rb +1 -1
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/LICENSE.rtf +8 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/banner_background.bmp +0 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/dialog_background.bmp +0 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/project.ico +0 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/project_16x16.ico +0 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/assets/project_32x32.ico +0 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/localization-en-us.wxl +20 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/parameters.wxi.erb +9 -0
- data/spec/fixtures/sample/files/windows_msi/Resources/source.wxs +74 -0
- data/spec/functional/packagers/mac_spec.rb +3 -20
- data/spec/functional/packagers/windows_spec.rb +69 -0
- data/spec/spec_helper.rb +79 -1
- data/spec/unit/artifact_spec.rb +0 -18
- data/spec/unit/build_version_dsl_spec.rb +136 -0
- data/spec/unit/build_version_spec.rb +185 -198
- data/spec/unit/config_spec.rb +18 -1
- data/spec/unit/fetchers/git_fetcher_spec.rb +55 -80
- data/spec/unit/fetchers/net_fetcher_spec.rb +11 -21
- data/spec/unit/install_path_cache_spec.rb +164 -136
- data/spec/unit/library_spec.rb +125 -5
- data/spec/unit/omnibus_spec.rb +25 -9
- data/spec/unit/overrides_spec.rb +2 -14
- data/spec/unit/package_release_spec.rb +0 -18
- data/spec/unit/packagers/base_spec.rb +84 -21
- data/spec/unit/packagers/mac_pkg_spec.rb +34 -24
- data/spec/unit/project_spec.rb +100 -102
- data/spec/unit/s3_cacher_spec.rb +0 -18
- data/spec/unit/software_spec.rb +152 -6
- data/spec/{sugar_spec.rb → unit/sugar_spec.rb} +0 -3
- metadata +365 -38
- data/lib/omnibus/cli/application.rb +0 -147
- data/lib/omnibus/cli/build.rb +0 -64
data/spec/unit/project_spec.rb
CHANGED
@@ -1,138 +1,136 @@
|
|
1
|
-
#
|
2
|
-
# Copyright:: Copyright (c) 2014 Noah Kantrowitz
|
3
|
-
# License:: Apache License, Version 2.0
|
4
|
-
#
|
5
|
-
# Licensed under the Apache License, Version 2.0 (the 'License');
|
6
|
-
# you may not use this file except in compliance with the License.
|
7
|
-
# You may obtain a copy of the License at
|
8
|
-
#
|
9
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
-
#
|
11
|
-
# Unless required by applicable law or agreed to in writing, software
|
12
|
-
# distributed under the License is distributed on an 'AS IS' BASIS,
|
13
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
-
# See the License for the specific language governing permissions and
|
15
|
-
# limitations under the License.
|
16
|
-
#
|
17
|
-
|
18
1
|
require 'spec_helper'
|
2
|
+
require 'ohai'
|
19
3
|
|
20
|
-
|
4
|
+
module Omnibus
|
5
|
+
describe Project do
|
6
|
+
let(:project) do
|
7
|
+
Omnibus::Project.load(project_path('sample'))
|
8
|
+
end
|
21
9
|
|
22
|
-
|
23
|
-
let(:project) do
|
24
|
-
Omnibus::Project.load(project_path('sample'))
|
25
|
-
end
|
10
|
+
subject { project }
|
26
11
|
|
27
|
-
|
12
|
+
describe 'basics' do
|
13
|
+
it 'should return a name' do
|
14
|
+
expect(project.name).to eq('sample')
|
15
|
+
end
|
28
16
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
end
|
17
|
+
it 'should return an install path' do
|
18
|
+
expect(project.install_path).to eq('/sample')
|
19
|
+
end
|
33
20
|
|
34
|
-
|
35
|
-
|
36
|
-
|
21
|
+
it 'should return a maintainer' do
|
22
|
+
expect(project.maintainer).to eq('Sample Devs')
|
23
|
+
end
|
37
24
|
|
38
|
-
|
39
|
-
|
40
|
-
|
25
|
+
it 'should return a homepage' do
|
26
|
+
expect(project.homepage).to eq('http://example.com/')
|
27
|
+
end
|
41
28
|
|
42
|
-
|
43
|
-
|
44
|
-
|
29
|
+
it 'should return a build version' do
|
30
|
+
expect(project.build_version).to eq('1.0')
|
31
|
+
end
|
45
32
|
|
46
|
-
|
47
|
-
|
48
|
-
|
33
|
+
it 'should return a build iteration' do
|
34
|
+
expect(project.build_iteration).to eq('1')
|
35
|
+
end
|
49
36
|
|
50
|
-
|
51
|
-
|
52
|
-
|
37
|
+
it 'should return an array of files and dirs' do
|
38
|
+
expect(project.extra_package_files).to eq(['/path/to/sample_dir', '/path/to/file.conf'])
|
39
|
+
end
|
53
40
|
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
end
|
41
|
+
it 'should return friendly_name' do
|
42
|
+
expect(project.friendly_name).to eq('Sample Project')
|
43
|
+
end
|
58
44
|
|
59
|
-
|
60
|
-
|
61
|
-
around(:each) do |example|
|
62
|
-
data = OHAI.data
|
63
|
-
begin
|
64
|
-
OHAI.data = Mash.new(Fauxhai.mock(fauxhai_options).data)
|
65
|
-
example.run
|
66
|
-
ensure
|
67
|
-
OHAI.data = data
|
45
|
+
it 'should return friendly_name' do
|
46
|
+
expect(project.resources_path).to eq('sample/project/resources')
|
68
47
|
end
|
69
48
|
end
|
70
49
|
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
50
|
+
describe '#<=>' do
|
51
|
+
it 'compares projects by name' do
|
52
|
+
list = [
|
53
|
+
project,
|
54
|
+
Omnibus::Project.load(project_path('chefdk')),
|
55
|
+
]
|
56
|
+
expect(list.sort.map(&:name)).to eq(%w(chefdk sample))
|
75
57
|
end
|
76
58
|
end
|
77
59
|
|
78
|
-
|
79
|
-
let(:fauxhai_options) {
|
80
|
-
|
81
|
-
|
60
|
+
describe '#iteration' do
|
61
|
+
let(:fauxhai_options) { Hash.new }
|
62
|
+
|
63
|
+
before do
|
64
|
+
stub_ohai(Fauxhai.mock(fauxhai_options).data)
|
82
65
|
end
|
83
|
-
end
|
84
66
|
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
67
|
+
context 'when on RHEL' do
|
68
|
+
let(:fauxhai_options) { { platform: 'redhat', version: '6.4' } }
|
69
|
+
it 'should return a RHEL iteration' do
|
70
|
+
expect(project.iteration).to eq('1.el6')
|
71
|
+
end
|
89
72
|
end
|
90
|
-
end
|
91
73
|
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
74
|
+
context 'when on Debian' do
|
75
|
+
let(:fauxhai_options) { { platform: 'debian', version: '7.2' } }
|
76
|
+
it 'should return a Debian iteration' do
|
77
|
+
expect(project.iteration).to eq('1')
|
78
|
+
end
|
96
79
|
end
|
97
|
-
end
|
98
80
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
81
|
+
context 'when on FreeBSD' do
|
82
|
+
let(:fauxhai_options) { { platform: 'freebsd', version: '9.1' } }
|
83
|
+
it 'should return a FreeBSD iteration' do
|
84
|
+
expect(project.iteration).to eq('1.freebsd.9.amd64')
|
85
|
+
end
|
103
86
|
end
|
104
|
-
end
|
105
|
-
end
|
106
87
|
|
107
|
-
|
108
|
-
|
88
|
+
context 'when on Windows' do
|
89
|
+
let(:fauxhai_options) { { platform: 'windows', version: '2008R2' } }
|
90
|
+
before { stub_const('File::ALT_SEPARATOR', '\\') }
|
91
|
+
it 'should return a Windows iteration' do
|
92
|
+
expect(project.iteration).to eq('1.windows')
|
93
|
+
end
|
94
|
+
end
|
109
95
|
|
110
|
-
|
111
|
-
|
96
|
+
context 'when on OS X' do
|
97
|
+
let(:fauxhai_options) { { platform: 'mac_os_x', version: '10.8.2' } }
|
98
|
+
it 'should return a generic iteration' do
|
99
|
+
expect(project.iteration).to eq('1')
|
100
|
+
end
|
101
|
+
end
|
112
102
|
end
|
113
103
|
|
114
|
-
|
115
|
-
|
116
|
-
end
|
104
|
+
describe '#overrides' do
|
105
|
+
let(:project) { Omnibus::Project.load(project_path('chefdk')) }
|
117
106
|
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
end
|
107
|
+
it 'should set an override for the zlib version' do
|
108
|
+
expect(project.overrides[:zlib][:version]).to eq('1.2.8')
|
109
|
+
end
|
122
110
|
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
end
|
111
|
+
it 'should access the zlib version through the #override method as well' do
|
112
|
+
expect(project.override(:zlib)[:version]).to eq('1.2.8')
|
113
|
+
end
|
127
114
|
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
115
|
+
it 'should set all the things through #overrides' do
|
116
|
+
project.overrides(thing: { version: '6.6.6' })
|
117
|
+
expect(project.override(:zlib)).to be_nil
|
118
|
+
end
|
132
119
|
|
133
|
-
|
134
|
-
|
135
|
-
|
120
|
+
it 'should retrieve the things set through #overrides' do
|
121
|
+
project.overrides(thing: { version: '6.6.6' })
|
122
|
+
expect(project.override(:thing)[:version]).to eq('6.6.6')
|
123
|
+
end
|
124
|
+
|
125
|
+
it 'should not set other things through setting a single #override' do
|
126
|
+
project.override(:thing, version: '6.6.6')
|
127
|
+
expect(project.override(:zlib)[:version]).to eq('1.2.8')
|
128
|
+
end
|
129
|
+
|
130
|
+
it 'should retrieve the things set through #overrides' do
|
131
|
+
project.override(:thing, version: '6.6.6')
|
132
|
+
expect(project.override(:thing)[:version]).to eq('6.6.6')
|
133
|
+
end
|
136
134
|
end
|
137
135
|
end
|
138
136
|
end
|
data/spec/unit/s3_cacher_spec.rb
CHANGED
@@ -1,22 +1,4 @@
|
|
1
|
-
#
|
2
|
-
# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
|
3
|
-
# License:: Apache License, Version 2.0
|
4
|
-
#
|
5
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
6
|
-
# you may not use this file except in compliance with the License.
|
7
|
-
# You may obtain a copy of the License at
|
8
|
-
#
|
9
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
-
#
|
11
|
-
# Unless required by applicable law or agreed to in writing, software
|
12
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
13
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
-
# See the License for the specific language governing permissions and
|
15
|
-
# limitations under the License.
|
16
|
-
#
|
17
|
-
|
18
1
|
require 'spec_helper'
|
19
|
-
require 'omnibus/s3_cacher'
|
20
2
|
|
21
3
|
describe Omnibus::S3Cache do
|
22
4
|
|
data/spec/unit/software_spec.rb
CHANGED
@@ -1,11 +1,8 @@
|
|
1
|
-
require 'omnibus/software'
|
2
|
-
|
3
1
|
require 'spec_helper'
|
4
2
|
|
5
3
|
describe Omnibus::Software do
|
6
|
-
|
7
4
|
let(:project) do
|
8
|
-
double(Omnibus::Project, install_path: 'monkeys', overrides: {})
|
5
|
+
double(Omnibus::Project, install_path: '/monkeys', overrides: {})
|
9
6
|
end
|
10
7
|
|
11
8
|
let(:software_name) { 'erchef' }
|
@@ -17,6 +14,65 @@ describe Omnibus::Software do
|
|
17
14
|
|
18
15
|
before do
|
19
16
|
allow_any_instance_of(Omnibus::Software).to receive(:render_tasks)
|
17
|
+
stub_ohai(platform: 'linux')
|
18
|
+
end
|
19
|
+
|
20
|
+
describe "path helpers" do
|
21
|
+
before do
|
22
|
+
stub_const("File::PATH_SEPARATOR", separator)
|
23
|
+
ENV.stub(:[]).and_call_original
|
24
|
+
ENV.stub(:[]).with("PATH").and_return(path)
|
25
|
+
end
|
26
|
+
|
27
|
+
context "on *NIX" do
|
28
|
+
let(:separator) { ":" }
|
29
|
+
let(:path) { "/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin" }
|
30
|
+
|
31
|
+
it "prepends a path to PATH" do
|
32
|
+
expect(software.prepend_path("/foo/bar")).to eq("/foo/bar:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin")
|
33
|
+
end
|
34
|
+
|
35
|
+
it "prepends the embedded bin to PATH" do
|
36
|
+
expect(software.path_with_embedded).to eq("/monkeys/bin:/monkeys/embedded/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin")
|
37
|
+
end
|
38
|
+
|
39
|
+
it "prepends multiple paths to PATH" do
|
40
|
+
expect(software.prepend_path("/foo/bar", "/foo/baz"))
|
41
|
+
.to eq("/foo/bar:/foo/baz:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin")
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
context "on Windows" do
|
46
|
+
before do
|
47
|
+
project.stub(:install_path).and_return("c:/monkeys")
|
48
|
+
end
|
49
|
+
|
50
|
+
let(:separator) { ";" }
|
51
|
+
let(:path) { "c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem" }
|
52
|
+
|
53
|
+
it "prepends a path to PATH" do
|
54
|
+
expect(software.prepend_path("c:/foo/bar")).to eq("c:/foo/bar;c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem")
|
55
|
+
end
|
56
|
+
|
57
|
+
it "prepends the embedded bin to PATH" do
|
58
|
+
expect(software.path_with_embedded).to eq("c:/monkeys/bin;c:/monkeys/embedded/bin;c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem")
|
59
|
+
end
|
60
|
+
|
61
|
+
it "prepends multiple paths to PATH" do
|
62
|
+
expect(software.prepend_path("c:/foo/bar", "c:/foo/baz"))
|
63
|
+
.to eq("c:/foo/bar;c:/foo/baz;c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem")
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
describe '#<=>' do
|
69
|
+
it 'compares projects by name' do
|
70
|
+
list = [
|
71
|
+
Omnibus::Software.load(software_path('zlib'), project),
|
72
|
+
Omnibus::Software.load(software_path('erchef'), project),
|
73
|
+
]
|
74
|
+
expect(list.sort.map(&:name)).to eq(%w(erchef zlib))
|
75
|
+
end
|
20
76
|
end
|
21
77
|
|
22
78
|
describe '#whitelist_file' do
|
@@ -33,6 +89,42 @@ describe Omnibus::Software do
|
|
33
89
|
end
|
34
90
|
end
|
35
91
|
|
92
|
+
describe '#override_version' do
|
93
|
+
it 'returns the override version' do
|
94
|
+
software.stub(:overrides).and_return(version: '1.2.3')
|
95
|
+
expect(software.override_version).to eq('1.2.3')
|
96
|
+
end
|
97
|
+
|
98
|
+
it 'outputs a deprecation message' do
|
99
|
+
output = capture_logging { software.override_version }
|
100
|
+
expect(output).to include('DEPRECATED')
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
describe '#given_version' do
|
105
|
+
it 'returns the version' do
|
106
|
+
software.stub(:default_version).and_return('4.5.6')
|
107
|
+
expect(software.given_version).to eq('4.5.6')
|
108
|
+
end
|
109
|
+
|
110
|
+
it 'outputs a deprecation message' do
|
111
|
+
output = capture_logging { software.given_version }
|
112
|
+
expect(output).to include('DEPRECATED')
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
describe '#version' do
|
117
|
+
it 'sets the given version' do
|
118
|
+
software.version('1.2.3')
|
119
|
+
expect(software.given_version).to eq('1.2.3')
|
120
|
+
end
|
121
|
+
|
122
|
+
it 'outputs a deprecation message' do
|
123
|
+
output = capture_logging { software.version('1.2.3') }
|
124
|
+
expect(output).to include('DEPRECATED')
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
36
128
|
context 'testing repo-level version overrides' do
|
37
129
|
let(:software_name) { 'zlib' }
|
38
130
|
let(:default_version) { '1.2.6' }
|
@@ -58,13 +150,21 @@ describe Omnibus::Software do
|
|
58
150
|
expect(software.override_version).to eq(expected_override_version)
|
59
151
|
end
|
60
152
|
|
61
|
-
it 'should have the
|
153
|
+
it 'should have the right source md5' do
|
62
154
|
expect(software.source[:md5]).to eq(expected_md5)
|
63
155
|
end
|
64
156
|
|
65
|
-
it 'should have the
|
157
|
+
it 'should have the right source url' do
|
66
158
|
expect(software.source[:url]).to eq(expected_url)
|
67
159
|
end
|
160
|
+
|
161
|
+
it 'should have the right checksum' do
|
162
|
+
expect(software.checksum).to eq(expected_md5)
|
163
|
+
end
|
164
|
+
|
165
|
+
it 'should have the right source_uri' do
|
166
|
+
expect(software.source_uri).to eq(URI.parse(expected_url))
|
167
|
+
end
|
68
168
|
end
|
69
169
|
|
70
170
|
context 'without overrides' do
|
@@ -99,7 +199,53 @@ describe Omnibus::Software do
|
|
99
199
|
let(:expected_url) { 'http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz' }
|
100
200
|
|
101
201
|
it_behaves_like 'a software definition'
|
202
|
+
|
203
|
+
context 'with the source overridden' do
|
204
|
+
let(:expected_md5) { '1234567890' }
|
205
|
+
let(:expected_url) { 'http://foo.bar/zlib-1.2.8.tar.gz' }
|
206
|
+
let(:project) do
|
207
|
+
double(Omnibus::Project, install_path: 'monkeys', overrides: { zlib: { version: '1.2.8', source: { url: expected_url, md5: expected_md5 } } })
|
208
|
+
end
|
209
|
+
|
210
|
+
it_behaves_like 'a software definition'
|
211
|
+
end
|
212
|
+
end
|
213
|
+
end
|
214
|
+
|
215
|
+
context 'while getting version_for_cache' do
|
216
|
+
let(:fetcher) { nil }
|
217
|
+
let(:software_name) { 'zlib' }
|
218
|
+
let(:default_version) { '1.2.6' }
|
219
|
+
|
220
|
+
def get_version_for_cache(expected_version)
|
221
|
+
software.stub(:fetcher).and_return(fetcher)
|
222
|
+
expect(software.version_for_cache).to eq(expected_version)
|
223
|
+
end
|
224
|
+
|
225
|
+
context 'without a fetcher' do
|
226
|
+
it 'should return the default version' do
|
227
|
+
get_version_for_cache('1.2.6')
|
228
|
+
end
|
102
229
|
end
|
103
230
|
|
231
|
+
context 'with a NetFetcher' do
|
232
|
+
let(:fetcher) { Omnibus::NetFetcher.new(software) }
|
233
|
+
|
234
|
+
it 'should return the default version' do
|
235
|
+
get_version_for_cache('1.2.6')
|
236
|
+
end
|
237
|
+
end
|
238
|
+
|
239
|
+
context 'with a GitFetcher' do
|
240
|
+
let(:fetcher) do
|
241
|
+
a = Omnibus::GitFetcher.new(software)
|
242
|
+
a.stub(:target_revision).and_return('4b19a96d57bff9bbf4764d7323b92a0944009b9e')
|
243
|
+
a
|
244
|
+
end
|
245
|
+
|
246
|
+
it 'should return the git sha' do
|
247
|
+
get_version_for_cache('4b19a96d57bff9bbf4764d7323b92a0944009b9e')
|
248
|
+
end
|
249
|
+
end
|
104
250
|
end
|
105
251
|
end
|