diff options
Diffstat (limited to 'omnibus')
-rw-r--r-- | omnibus/Berksfile | 10 | ||||
-rw-r--r-- | omnibus/Gemfile | 14 | ||||
-rw-r--r-- | omnibus/config/projects/angrychef.rb | 2 | ||||
-rw-r--r-- | omnibus/config/projects/chef-fips.rb | 2 | ||||
-rw-r--r-- | omnibus/config/projects/chef.rb | 10 | ||||
-rw-r--r-- | omnibus/omnibus.rb | 10 |
6 files changed, 24 insertions, 24 deletions
diff --git a/omnibus/Berksfile b/omnibus/Berksfile index 72dcf108fe..614c6da643 100644 --- a/omnibus/Berksfile +++ b/omnibus/Berksfile @@ -1,12 +1,12 @@ -source 'https://supermarket.chef.io' +source "https://supermarket.chef.io" -cookbook 'omnibus' +cookbook "omnibus" # Uncomment to use the latest version of the Omnibus cookbook from GitHub # cookbook 'omnibus', github: 'opscode-cookbooks/omnibus' group :integration do - cookbook 'apt', '~> 2.3' - cookbook 'freebsd', '~> 0.1' - cookbook 'yum-epel', '~> 0.3' + cookbook "apt", "~> 2.3" + cookbook "freebsd", "~> 0.1" + cookbook "yum-epel", "~> 0.3" end diff --git a/omnibus/Gemfile b/omnibus/Gemfile index ad415d576a..12001d1c17 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'omnibus', github: 'chef/omnibus' -gem 'omnibus-software', github: 'chef/omnibus-software' +gem "omnibus", github: "chef/omnibus" +gem "omnibus-software", github: "chef/omnibus-software" # This development group is installed by default when you run `bundle install`, # but if you are using Omnibus in a CI-based infrastructure, you do not need @@ -9,10 +9,10 @@ gem 'omnibus-software', github: 'chef/omnibus-software' # by running `bundle install --without development` to speed up build times. group :development do # Use Berkshelf for resolving cookbook dependencies - gem 'berkshelf', '~> 3.0' + gem "berkshelf", "~> 3.0" # Use Test Kitchen with Vagrant for converging the build environment - gem 'test-kitchen', '~> 1.4.0' - gem 'kitchen-vagrant', '~> 0.19.0' - gem 'winrm-transport', '~> 1.0' + gem "test-kitchen", "~> 1.4.0" + gem "kitchen-vagrant", "~> 0.19.0" + gem "winrm-transport", "~> 1.0" end diff --git a/omnibus/config/projects/angrychef.rb b/omnibus/config/projects/angrychef.rb index c585c73040..e89dd80fab 100644 --- a/omnibus/config/projects/angrychef.rb +++ b/omnibus/config/projects/angrychef.rb @@ -19,7 +19,7 @@ # test machines. As such this project definition is just a thin wrapper around # `config/project/chef.rb`. # -chef_project_contents = IO.read(File.expand_path('../chef.rb', __FILE__)) +chef_project_contents = IO.read(File.expand_path("../chef.rb", __FILE__)) self.instance_eval chef_project_contents name "angrychef" diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb index 32bbbc9c48..fbb28fa5cc 100644 --- a/omnibus/config/projects/chef-fips.rb +++ b/omnibus/config/projects/chef-fips.rb @@ -18,7 +18,7 @@ # This is the chef client build with FIPS mode enabled. # It's a stub for now and produces identical results # -chef_project_contents = IO.read(File.expand_path('../chef.rb', __FILE__)) +chef_project_contents = IO.read(File.expand_path("../chef.rb", __FILE__)) self.instance_eval chef_project_contents name "chef-fips" diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index b8b121e0d2..a615069c9d 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -20,7 +20,7 @@ maintainer "Chef Software, Inc. <maintainers@chef.io>" homepage "https://www.chef.io" build_iteration 1 -build_version '12.6.0' +build_version "12.6.0" if windows? # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files" @@ -53,8 +53,8 @@ else end # Chef Release version pinning -override :chef, version: 'local_source' -override :ohai, version: 'master' +override :chef, version: "local_source" +override :ohai, version: "master" dependency "preparation" @@ -64,7 +64,7 @@ dependency "version-manifest" dependency "openssl-customization" package :rpm do - signing_passphrase ENV['OMNIBUS_RPM_SIGNING_PASSPHRASE'] + signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"] end proj_to_work_around_cleanroom = self @@ -79,7 +79,7 @@ project_location_dir = name package :msi do fast_msi true upgrade_code msi_upgrade_code - wix_candle_extension 'WixUtilExtension' + wix_candle_extension "WixUtilExtension" signing_identity "F74E1A68005E8A9C465C3D2FF7B41F3988F0EA09", machine_store: true parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-mingw32/ext/win32-eventlog/chef-log.dll")), ProjectLocationDir: project_location_dir diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index 3afa2ad84e..663235d340 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -26,8 +26,8 @@ # Windows architecture defaults - set to x86 unless otherwise specified. # ------------------------------ -windows_arch %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase) ? - ENV['OMNIBUS_WINDOWS_ARCH'].downcase.to_sym : :x86 +windows_arch %w{x86 x64}.include?((ENV["OMNIBUS_WINDOWS_ARCH"] || "").downcase) ? + ENV["OMNIBUS_WINDOWS_ARCH"].downcase.to_sym : :x86 # Disable git caching # ------------------------------ @@ -36,9 +36,9 @@ windows_arch %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase # Enable S3 asset caching # ------------------------------ use_s3_caching true -s3_access_key ENV['AWS_ACCESS_KEY_ID'] -s3_secret_key ENV['AWS_SECRET_ACCESS_KEY'] -s3_bucket 'opscode-omnibus-cache' +s3_access_key ENV["AWS_ACCESS_KEY_ID"] +s3_secret_key ENV["AWS_SECRET_ACCESS_KEY"] +s3_bucket "opscode-omnibus-cache" build_retries 3 fetcher_retries 3 |