kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Use ruby-build for Mastodon, update cookbooks

Browse Source 
This uses the ruby_build provider for Mastodon, installing Ruby 2.4.1
currently. It also updates some other cookbooks and the runlists.
This commit is contained in:
Basti
2017-04-17 11:40:31 +02:00
parent 4530190df6
commit 54332db8de
96 changed files with 2830 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cookbooks/homebrew/libraries/homebrew_mixin.rb
View File

@@ -1,10 +1,10 @@
#
# Author:: Joshua Timberman (<jtimberman@chef.io>)
# Author:: Graeme Mathieson (<mathie@woss.name>)
# Cookbook Name:: homebrew
# Cookbook:: homebrew
# Libraries:: homebrew_mixin
#
# Copyright 2011-2013, Chef Software, Inc.
# Copyright:: 2011-2016, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,26 +18,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Include the mixin from Chef 12 if its defined, when we get to the
# #homebrew_owner method below...
class Chef12HomebrewUser
include Chef::Mixin::HomebrewUser if defined?(Chef::Mixin::HomebrewUser)
include Chef::Mixin::HomebrewUser
end
module Homebrew
# Homebrew
module Mixin
def homebrew_owner
if defined?(Chef::Mixin::HomebrewUser)
begin
require 'etc'
@homebrew_owner ||= ::Etc.getpwuid(Chef12HomebrewUser.new.find_homebrew_uid).name
rescue Chef::Exceptions::CannotDetermineHomebrewOwner
@homebrew_owner ||= calculate_owner
end
else
@homebrew_owner ||= calculate_owner
end
require 'etc'
@homebrew_owner ||= ::Etc.getpwuid(Chef12HomebrewUser.new.find_homebrew_uid).name
rescue Chef::Exceptions::CannotDetermineHomebrewOwner
@homebrew_owner ||= calculate_owner
end
private
@@ -45,7 +38,7 @@ module Homebrew
def calculate_owner
owner = homebrew_owner_attr || sudo_user || current_user
if owner == 'root'
fail Chef::Exceptions::User,
raise Chef::Exceptions::User,
"Homebrew owner is 'root' which is not supported. " \
"To set an explicit owner, please set node['homebrew']['owner']."
end
@@ -65,3 +58,6 @@ module Homebrew
end
end
end
Chef::Resource.send(:include, Homebrew::Mixin)
Chef::Recipe.send(:include, Homebrew::Mixin)

102
cookbooks/homebrew/libraries/homebrew_package.rb
View File

@@ -1,102 +0,0 @@
#
# Author:: Joshua Timberman (<jtimberman@chef.io>)
# Author:: Graeme Mathieson (<mathie@woss.name>)
# Cookbook Name:: homebrew
# Libraries:: homebrew_package
#
# Copyright 2011-2013, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# cookbook libraries are unconditionally included if the cookbook is
# present on a node. This approach should avoid creating this class if
# the node already has Chef::Provider::Package::Homebrew, such as with
# Chef 12.
# https://github.com/chef/chef-rfc/blob/master/rfc016-homebrew-osx-package-provider.md
unless defined?(Chef::Provider::Package::Homebrew) && Chef::Platform.find('mac_os_x', nil)[:package] == Chef::Provider::Package::Homebrew
require 'chef/provider/package'
require 'chef/resource/package'
require 'chef/platform'
require 'chef/mixin/shell_out'
class Chef
class Provider
class Package
# Package
class Homebrew < Package
# Homebrew packagex
include Chef::Mixin::ShellOut
include ::Homebrew::Mixin
def load_current_resource
@current_resource = Chef::Resource::Package.new(@new_resource.name)
@current_resource.package_name(@new_resource.package_name)
@current_resource.version(current_installed_version)
@current_resource
end
def install_package(name, _version)
brew('install', @new_resource.options, name)
end
def upgrade_package(name, _version)
brew('upgrade', name)
end
def remove_package(name, _version)
brew('uninstall', @new_resource.options, name)
end
# Homebrew doesn't really have a notion of purging, so just remove.
def purge_package(name, version)
@new_resource.options = ((@new_resource.options || '') << ' --force').strip
remove_package(name, version)
end
protected
def brew(*args)
get_response_from_command("brew #{args.join(' ')}")
end
def current_installed_version
versions = package_info['installed'].map { |v| v['version'] }
versions.join(' ') unless versions.empty?
end
def candidate_version
package_info['versions']['stable'] ? package_info['versions']['stable'].to_s : package_info['versions'].find { |_k, v| v if v.is_a?(String) }
end
def package_info
require 'json'
JSON.parse(brew('info', @new_resource.package_name, '--json=v1'))[0]
end
def get_response_from_command(command)
require 'etc'
home_dir = Etc.getpwnam(homebrew_owner).dir
Chef::Log.debug "Executing '#{command}' as #{homebrew_owner}"
output = shell_out!(command, user: homebrew_owner, environment: { 'USER' => homebrew_owner, 'HOME' => home_dir, 'RUBYOPT' => nil })
output.stdout
end
end
end
end
end
Chef::Platform.set platform: :mac_os_x_server, resource: :package, provider: Chef::Provider::Package::Homebrew
Chef::Platform.set platform: :mac_os_x, resource: :package, provider: Chef::Provider::Package::Homebrew
end

17
cookbooks/homebrew/libraries/matchers.rb
View File

@@ -1,20 +1,5 @@
if defined?(ChefSpec)
def install_homebrew_package(pkg)
ChefSpec::Matchers::ResourceMatcher.new(:homebrew_package, :install, pkg)
end
def upgrade_homebrew_package(pkg)
ChefSpec::Matchers::ResourceMatcher.new(:homebrew_package, :upgrade, pkg)
end
def remove_homebrew_package(pkg)
ChefSpec::Matchers::ResourceMatcher.new(:homebrew_package, :remove, pkg)
end
def purge_homebrew_package(pkg)
ChefSpec::Matchers::ResourceMatcher.new(:homebrew_package, :purge, pkg)
end
ChefSpec.define_matcher :homebrew_package
def tap_homebrew_tap(tap)
ChefSpec::Matchers::ResourceMatcher.new(:homebrew_tap, :tap, tap)