diff --git a/cookbooks/build-essential/.envrc b/cookbooks/build-essential/.envrc deleted file mode 100644 index 8edeaaf..0000000 --- a/cookbooks/build-essential/.envrc +++ /dev/null @@ -1,3 +0,0 @@ - -# Force ChefDK's environment -source_env ~/.envrc_chefdk diff --git a/cookbooks/build-essential/.gitignore b/cookbooks/build-essential/.gitignore deleted file mode 100644 index 4e95ff6..0000000 --- a/cookbooks/build-essential/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.vagrant -Berksfile.lock -Gemfile.lock -*~ -*# -.#* -\#*# -.*.sw[a-z] -*.un~ -.bundle -.cache -.kitchen -.rspec -bin -.kitchen.local.yml -.coverage diff --git a/cookbooks/build-essential/.kitchen.cloud.yml b/cookbooks/build-essential/.kitchen.cloud.yml deleted file mode 100644 index e9b4dc1..0000000 --- a/cookbooks/build-essential/.kitchen.cloud.yml +++ /dev/null @@ -1,165 +0,0 @@ -#<% require 'kitchen-sync' %> ---- -driver_config: - digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %> - google_client_email: <%= ENV['GOOGLE_CLIENT_EMAIL'] %> - google_key_location: <%= ENV['GOOGLE_KEY_LOCATION'] %> - google_project: <%= ENV['GOOGLE_PROJECT'] %> - joyent_username: <%= ENV['SDC_CLI_ACCOUNT'] %> - joyent_keyfile: <%= ENV['SDC_CLI_IDENTITY'] %> - joyent_keyname: <%= ENV['SDC_CLI_KEY_ID'] %> - joyent_url: <%= ENV['SDC_CLI_URL'] %> - aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %> - aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> - aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %> - flavor_id: <%= ENV['EC2_FLAVOR_ID'] %> - availability_zone: <%= ENV['AWS_AVAILABILITY_ZONE'] %> - -provisioner: - name: chef_zero - # require_chef_omnibus: 11.16.4 - require_chef_omnibus: 12.0.3 - -platforms: -- name: centos-5.8 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: centos-5-8-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - -- name: centos-6.5 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: centos-6-5-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - -- name: centos-7.0 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: centos-7-0-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - -- name: amazon-2014.09 - driver_plugin: ec2 - driver_config: - image_id: ami-9a6ed3f2 - username: ec2-user - ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> - -# - name: redhat-6.5 -# driver_plugin: ec2 -# driver_config: -# image_id: ami-8d756fe4 -# username: ec2-user -# ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> -# run_list: -# - recipe[selinux::disabled] - -- name: redhat-7.0 - driver_plugin: ec2 - driver_config: - image_id: ami-a8d369c0 - username: ec2-user - ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> - run_list: - - recipe[selinux::disabled] - -- name: fedora-20 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: fedora-20-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - -- name: suse-11.3 - driver_plugin: ec2 - driver_config: - image_id: ami-e8084981 - username: root - ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> - -- name: debian-7.0 - driver_plugin: gce - driver_config: - image_name: debian-7-wheezy-v20131120 - zone: <%= ENV['GCE_ZONE'] %> - area: <%= ENV['GCE_AREA'] %> - network: <%= ENV['GCE_NETWORK'] %> - username: <%= ENV['GCE_USERNAME'] %> - public_key_path: <%= ENV['GCE_PUBLIC_KEY_PATH'] %> - ssh_key: <%= ENV['GCE_SSH_KEY_PATH'] %> - run_list: - - recipe[apt] - -- name: ubuntu-10.04 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: ubuntu-10-04-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - run_list: - - recipe[apt] - -- name: ubuntu-12.04 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: ubuntu-12-04-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - run_list: - - recipe[apt] - -- name: ubuntu-14.04 - driver_plugin: digital_ocean - driver_config: - size: 2gb - image: ubuntu-14-04-x64 - region: <%= ENV['DIGITAL_OCEAN_REGION'] %> - ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %> - ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %> - run_list: - - recipe[apt] - -# - name: omnios-151006 -# driver_plugin: ec2 -# driver_config: -# image_id: ami-35eb835c -# flavor_id: m3.large -# username: root -# ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %> -# run_list: -# - recipe[ips-omniti] - -# - name: smartos-14.3.0 -# driver_plugin: joyent -# driver_config: -# joyent_image_id: 62f148f8-6e84-11e4-82c5-efca60348b9f -# joyent_flavor_id: g3-standard-4-smartos -# username: root -# ssh_key: <%= ENV['SDC_CLI_IDENTITY'] %> -# busser: -# ruby_bindir: '/opt/local/bin/' -# provisioner: -# sudo: false -# chef_omnibus_url: https://raw.github.com/test-kitchen/kitchen-joyent/master/scripts/install-smartos.sh - -suites: -- name: default - run_list: - - recipe[build-essential::default] - attributes: {} diff --git a/cookbooks/build-essential/.kitchen.yml b/cookbooks/build-essential/.kitchen.yml deleted file mode 100644 index 4bae9ac..0000000 --- a/cookbooks/build-essential/.kitchen.yml +++ /dev/null @@ -1,24 +0,0 @@ -driver: - name: vagrant - -platforms: - - name: centos-5.10 - - name: centos-6.5 - - name: fedora-19 - - name: freebsd-9.2 - run_list: freebsd::portsnap - - name: freebsd-10.0 - run_list: freebsd::portsnap - - name: macosx-10.9 - - name: debian-7.4 - run_list: apt::default - - name: ubuntu-10.04 - run_list: apt::default - - name: ubuntu-12.04 - run_list: apt::default - - name: ubuntu-13.10 - run_list: apt::default - -suites: - - name: default - run_list: build-essential::default diff --git a/cookbooks/build-essential/.rubocop.yml b/cookbooks/build-essential/.rubocop.yml deleted file mode 100644 index d89e28e..0000000 --- a/cookbooks/build-essential/.rubocop.yml +++ /dev/null @@ -1,30 +0,0 @@ -AllCops: - Exclude: - - bin/**/* - - script/**/* - - vendor/**/* - -AbcSize: - Max: 50 -AlignParameters: - Enabled: false -ClassAndModuleChildren: - Enabled: false -Documentation: - Enabled: false -DoubleNegation: - Enabled: false -Encoding: - Enabled: false -GuardClause: - Enabled: false -LineLength: - Max: 120 -MethodLength: - Max: 20 -PercentLiteralDelimiters: - Enabled: false -SignalException: - Enabled: false -SingleSpaceBeforeFirstArg: - Enabled: false diff --git a/cookbooks/build-essential/.travis.yml b/cookbooks/build-essential/.travis.yml deleted file mode 100644 index 67f451d..0000000 --- a/cookbooks/build-essential/.travis.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Use Travis's cointainer based infrastructure -sudo: false -addons: - apt: - sources: - - chef-stable-precise - packages: - - chefdk - -# Don't `bundle install` -install: echo "skip bundle install" - -branches: - only: - - master - -# Ensure we make ChefDK's Ruby the default -before_script: - - eval "$(/opt/chefdk/bin/chef shell-init bash)" - # We have to install chef-sugar for ChefSpec - - /opt/chefdk/embedded/bin/chef gem install chef-sugar -script: - - /opt/chefdk/embedded/bin/chef --version - - /opt/chefdk/embedded/bin/rubocop --version - - /opt/chefdk/embedded/bin/rubocop - - /opt/chefdk/embedded/bin/foodcritic --version - - /opt/chefdk/embedded/bin/foodcritic . --exclude spec - - /opt/chefdk/embedded/bin/rspec spec - -notifications: - hipchat: - on_change: true - on_failure: true - on_success: false - on_pull_requests: false - rooms: - # Build Statuses - - secure: fk4NTplcjE097Oan2HgZc+Lxx8X9k2QDolwBKZMDNrreFImBgw6HJBwHUv6Hfay2xh7Y720iNFeTTN3Ep0/M4YgmBrwhry3jSMN8TX7SAOGPCC8zIB0ELGGAyQKxDjwwsA18KTbuDkV5yboiUzvY86G5bWT8vfWEd1ljTEnIazQ= - # Release Engineering - - secure: X35KY6kImjVyYiT9gOlRJd26MKh5KQFwxcQm3fF9Y+pnB1v7uB3w6+jzoxhvPN5O2US3xGQsaJOSAB1uhZh+FZOKfZ/ewyXVUcTXrUTC9Mjofd3n33xD68qoI22mntEQilugvC+OPhq9uWyX0OlRhnnT+J56Vq7feSI4ez9e9Og= diff --git a/cookbooks/build-essential/Berksfile b/cookbooks/build-essential/Berksfile deleted file mode 100644 index 50e57a3..0000000 --- a/cookbooks/build-essential/Berksfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://supermarket.chef.io' - -metadata - -group :integration do - cookbook 'apt' - cookbook 'freebsd' -end diff --git a/cookbooks/build-essential/CHANGELOG.md b/cookbooks/build-essential/CHANGELOG.md index c2a5a10..2c3423a 100644 --- a/cookbooks/build-essential/CHANGELOG.md +++ b/cookbooks/build-essential/CHANGELOG.md @@ -2,6 +2,17 @@ build-essential Cookbook CHANGELOG ================================== This file is used to list changes made in each version of the build-essential cookbook. +v2.2.4 (2015-10-06) +------------------- +* Add patch package on Fedora systems +* Add additional platforms to Kitchen CI +* Use Chef standard Rubocop file and resolve several issues +* Update contributing and testing docs +* Update Gemfile with the latest testing and development deps +* Add maintainers.md and maintainers.toml files +* Add chefignore file to limit the files uploaded to the Chef server +* Add source_url and issues_url metadata for Supermarket + v2.2.3 (2015-04-15) ------------------- * Don’t install omnibus-build-essential on Solaris 10 - We decided it’s easier to use the old GCC that ships with Solaris 10. diff --git a/cookbooks/build-essential/CONTRIBUTING b/cookbooks/build-essential/CONTRIBUTING deleted file mode 100644 index e781c97..0000000 --- a/cookbooks/build-essential/CONTRIBUTING +++ /dev/null @@ -1,29 +0,0 @@ -If you would like to contribute, please open a ticket in JIRA: - -* http://tickets.chef.io - -Create the ticket in the COOK project and use the cookbook name as the -component. - -For all code contributions, we ask that contributors sign a -contributor license agreement (CLA). Instructions may be found here: - -* http://wiki.chef.io/display/chef/How+to+Contribute - -When contributing changes to individual cookbooks, please do not -modify the version number in the metadata.rb. Also please do not -update the CHANGELOG.md for a new version. Not all changes to a -cookbook may be merged and released in the same versions. Chef Software will -handle the version updates during the release process. You are welcome -to correct typos or otherwise make updates to documentation in the -README. - -If a contribution adds new platforms or platform versions, indicate -such in the body of the commit message(s), and update the relevant -COOK ticket. When writing commit messages, it is helpful for others if -you indicate the COOK ticket. For example: - - git commit -m '[COOK-1041] Updated pool resource to correctly delete.' - -In the ticket itself, it is also helpful if you include log output of -a successful Chef run, but this is not absolutely required. diff --git a/cookbooks/build-essential/Gemfile b/cookbooks/build-essential/Gemfile deleted file mode 100644 index c1d9ad3..0000000 --- a/cookbooks/build-essential/Gemfile +++ /dev/null @@ -1,38 +0,0 @@ -source 'https://rubygems.org' - -group :lint do - gem 'foodcritic', '~> 3.0' - gem 'rubocop', '= 0.26.1' -end - -group :unit do - gem 'berkshelf', '~> 3.1' - gem 'chefspec', '~> 4.0' -end - -group :kitchen_common do - gem 'test-kitchen', '~> 1.2' -end - -group :kitchen_vagrant do - gem 'kitchen-vagrant', '~> 0.15' -end - -group :kitchen_cloud do - gem 'kitchen-digitalocean', '~> 0.8' - gem 'kitchen-ec2', '~> 0.8' - gem 'kitchen-joyent', '~> 0.1' - gem 'kitchen-gce', '~> 0.2' -end - -group :development do - gem 'ruby_gntp' - gem 'growl' - gem 'rb-fsevent' - gem 'guard', '~> 2.4' - gem 'guard-kitchen' - gem 'guard-foodcritic' - gem 'guard-rspec' - gem 'guard-rubocop' - gem 'rake' -end diff --git a/cookbooks/build-essential/Guardfile b/cookbooks/build-essential/Guardfile deleted file mode 100644 index b878300..0000000 --- a/cookbooks/build-essential/Guardfile +++ /dev/null @@ -1,35 +0,0 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme - -# guard 'kitchen' do -# watch(%r{test/.+}) -# watch(%r{^recipes/(.+)\.rb$}) -# watch(%r{^attributes/(.+)\.rb$}) -# watch(%r{^files/(.+)}) -# watch(%r{^templates/(.+)}) -# watch(%r{^providers/(.+)\.rb}) -# watch(%r{^resources/(.+)\.rb}) -# end - -guard 'foodcritic', cookbook_paths: '.', all_on_start: false do - watch(/attributes\/.+\.rb$/) - watch(/providers\/.+\.rb$/) - watch(/recipes\/.+\.rb$/) - watch(/resources\/.+\.rb$/) - watch('metadata.rb') -end - -guard 'rubocop', all_on_start: false do - watch(/attributes\/.+\.rb$/) - watch(/providers\/.+\.rb$/) - watch(/recipes\/.+\.rb$/) - watch(/resources\/.+\.rb$/) - watch('metadata.rb') -end - -guard :rspec, cmd: 'bundle exec rspec', all_on_start: false, notification: false do - watch(/^libraries\/(.+)\.rb$/) - watch(/^spec\/(.+)_spec\.rb$/) - watch(/^(recipes)\/(.+)\.rb$/) { |m| "spec/#{m[1]}_spec.rb" } - watch('spec/spec_helper.rb') { 'spec' } -end diff --git a/cookbooks/build-essential/LICENSE b/cookbooks/build-essential/LICENSE deleted file mode 100644 index 11069ed..0000000 --- a/cookbooks/build-essential/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. diff --git a/cookbooks/build-essential/README.md b/cookbooks/build-essential/README.md index bd94ff9..dfb153a 100644 --- a/cookbooks/build-essential/README.md +++ b/cookbooks/build-essential/README.md @@ -91,7 +91,7 @@ License & Authors - Author: Seth Chisamore () ```text -Copyright 2009-2014, Chef Software, Inc. () +Copyright 2009-2015, 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. diff --git a/cookbooks/build-essential/Rakefile b/cookbooks/build-essential/Rakefile deleted file mode 100644 index 0efd590..0000000 --- a/cookbooks/build-essential/Rakefile +++ /dev/null @@ -1,65 +0,0 @@ -require 'bundler/setup' - -# Style tests. Rubocop and Foodcritic -namespace :style do - require 'rubocop/rake_task' - desc 'Run Ruby style checks' - RuboCop::RakeTask.new(:ruby) - - require 'foodcritic' - desc 'Run Chef style checks' - FoodCritic::Rake::LintTask.new(:chef) do |t| - t.options = { - fail_tags: ['any'], - tags: ['~FC005'] - } - end -end - -desc 'Run all style checks' -task style: ['style:chef', 'style:ruby'] - -# Rspec and ChefSpec -require 'rspec/core/rake_task' -desc 'Run ChefSpec examples' -RSpec::Core::RakeTask.new(:spec) - -# Integration tests. Kitchen.ci -require 'kitchen' -namespace :integration do - desc 'Run Test Kitchen with Vagrant' - task :vagrant do - Kitchen.logger = Kitchen.default_file_logger - Kitchen::Config.new.instances.each do |instance| - instance.test(:always) - end - end - - desc 'Run Test Kitchen with cloud plugins' - task :cloud do - run_kitchen = true - if ENV['TRAVIS'] == 'true' && ENV['TRAVIS_PULL_REQUEST'] != 'false' - run_kitchen = false - end - - if run_kitchen - Kitchen.logger = Kitchen.default_file_logger - @loader = Kitchen::Loader::YAML.new(project_config: './.kitchen.cloud.yml') - config = Kitchen::Config.new(loader: @loader) - config.instances.each do |instance| - instance.test(:always) - end - end - end -end - -namespace :travis do - desc 'Run tests on Travis' - task ci: %w(style spec) -end - -# The default rake task should just run it all -task default: %w(travis:ci integration) - -# The default rake task should just run it all -task default: ['style', 'spec', 'integration:vagrant'] diff --git a/cookbooks/build-essential/libraries/timing.rb b/cookbooks/build-essential/libraries/timing.rb index e75cdbb..8e136c7 100644 --- a/cookbooks/build-essential/libraries/timing.rb +++ b/cookbooks/build-essential/libraries/timing.rb @@ -84,7 +84,7 @@ EOH Chef::Log.warn <<-EOH node['build-essential']['compiletime'] has been deprecated. Please use node['build-essential']['compile_time'] instead. I have gracefully converted the -attribute for you, but this warning and converstion will be removed in the next +attribute for you, but this warning and conversion will be removed in the next major release of the build-essential cookbook. EOH node.default['build-essential']['compile_time'] = node['build-essential']['compiletime'] @@ -107,7 +107,7 @@ EOH def method_missing(m, *args, &block) resource = @recipe.send(m, *args, &block) if resource.is_a?(Chef::Resource) - actions = Array(resource.action) + actions = Array(resource.action) resource.action(:nothing) actions.each do |action| diff --git a/cookbooks/build-essential/libraries/xcode_command_line_tools.rb b/cookbooks/build-essential/libraries/xcode_command_line_tools.rb index 1f4f049..826cb63 100644 --- a/cookbooks/build-essential/libraries/xcode_command_line_tools.rb +++ b/cookbooks/build-essential/libraries/xcode_command_line_tools.rb @@ -112,7 +112,7 @@ class Chef when 10.8 'http://devimages.apple.com/downloads/xcode/command_line_tools_for_xcode_os_x_mountain_lion_march_2014.dmg' else - raise "Unknown DMG download URL for OSX #{node['platform_version']}" + fail "Unknown DMG download URL for OSX #{node['platform_version']}" end end @@ -143,7 +143,7 @@ class Chef # @return [void] # def attach - execute %|hdiutil attach "#{dmg_cache_path}" -mountpoint "#{mount_path}"| + execute %(hdiutil attach "#{dmg_cache_path}" -mountpoint "#{mount_path}") end # @@ -161,7 +161,7 @@ class Chef # @return [void] # def detach - execute %|hdiutil detach "#{mount_path}"| + execute %(hdiutil detach "#{mount_path}") end end end @@ -176,7 +176,6 @@ class Chef # This script was graciously borrowed and modified from Tim Sutton's # osx-vm-templates at https://github.com/timsutton/osx-vm-templates/blob/b001475df54a9808d3d56d06e71b8fa3001fff42/scripts/xcode-cli-tools.sh execute 'install XCode Command Line tools' do - # rubocop:disable Metrics/LineLength command <<-EOH.gsub(/^ {14}/, '') # create the placeholder file that's checked by CLI updates' .dist code # in Apple's SUS catalog diff --git a/cookbooks/build-essential/matrix b/cookbooks/build-essential/matrix deleted file mode 100644 index c7ea413..0000000 --- a/cookbooks/build-essential/matrix +++ /dev/null @@ -1,10 +0,0 @@ - matrix: - - KITCHEN_INSTANCE='default-centos-58 - - KITCHEN_INSTANCE='default-centos-64 - - KITCHEN_INSTANCE='default-amazon-201309 - - KITCHEN_INSTANCE='default-fedora-19 - - KITCHEN_INSTANCE='default-debian-70 - - KITCHEN_INSTANCE='default-ubuntu-1004 - - KITCHEN_INSTANCE='default-ubuntu-1204 - - KITCHEN_INSTANCE='default-ubuntu-1310 - - KITCHEN_INSTANCE='default-smartos-1330 diff --git a/cookbooks/build-essential/metadata.json b/cookbooks/build-essential/metadata.json index bed677f..d3420e3 100644 --- a/cookbooks/build-essential/metadata.json +++ b/cookbooks/build-essential/metadata.json @@ -1,64 +1 @@ -{ - "name": "build-essential", - "description": "Installs C compiler / build tools", - "long_description": "", - "maintainer": "Chef Software, Inc.", - "maintainer_email": "cookbooks@chef.io", - "license": "Apache 2.0", - "platforms": { - "amazon": ">= 0.0.0", - "centos": ">= 0.0.0", - "debian": ">= 0.0.0", - "fedora": ">= 0.0.0", - "freebsd": ">= 0.0.0", - "mac_os_x": ">= 10.7.0", - "mac_os_x_server": ">= 10.7.0", - "oracle": ">= 0.0.0", - "redhat": ">= 0.0.0", - "scientific": ">= 0.0.0", - "smartos": ">= 0.0.0", - "suse": ">= 0.0.0", - "ubuntu": ">= 0.0.0" - }, - "dependencies": { - - }, - "recommendations": { - - }, - "suggestions": { - "pkgutil": ">= 0.0.0" - }, - "conflicting": { - - }, - "providing": { - - }, - "replacing": { - - }, - "attributes": { - "build-essential/compile_time": { - "display_name": "Build Essential Compile Time Execution", - "description": "Execute resources at compile time.", - "default": "false", - "recipes": [ - "build-essential::default" - ], - "choice": [ - - ], - "calculated": false, - "type": "string", - "required": "optional" - } - }, - "groupings": { - - }, - "recipes": { - "build-essential": "Installs packages required for compiling C software from source." - }, - "version": "2.2.3" -} +{"name":"build-essential","version":"2.2.4","description":"Installs C compiler / build tools","long_description":"","maintainer":"Chef Software, Inc.","maintainer_email":"cookbooks@chef.io","license":"Apache 2.0","platforms":{"amazon":">= 0.0.0","centos":">= 0.0.0","debian":">= 0.0.0","fedora":">= 0.0.0","freebsd":">= 0.0.0","mac_os_x":">= 10.7.0","mac_os_x_server":">= 10.7.0","oracle":">= 0.0.0","redhat":">= 0.0.0","scientific":">= 0.0.0","smartos":">= 0.0.0","suse":">= 0.0.0","ubuntu":">= 0.0.0"},"dependencies":{},"recommendations":{},"suggestions":{"pkgutil":">= 0.0.0"},"conflicting":{},"providing":{},"replacing":{},"attributes":{"build-essential/compile_time":{"display_name":"Build Essential Compile Time Execution","description":"Execute resources at compile time.","default":"false","recipes":["build-essential::default"]}},"groupings":{},"recipes":{"build-essential":"Installs packages required for compiling C software from source."},"source_url":"https://github.com/chef-cookbooks/build-essential","issues_url":"https://github.com/chef-cookbooks/build-essential/issues"} \ No newline at end of file diff --git a/cookbooks/build-essential/metadata.rb b/cookbooks/build-essential/metadata.rb deleted file mode 100644 index d432a50..0000000 --- a/cookbooks/build-essential/metadata.rb +++ /dev/null @@ -1,29 +0,0 @@ -name 'build-essential' -maintainer 'Chef Software, Inc.' -maintainer_email 'cookbooks@chef.io' -license 'Apache 2.0' -description 'Installs C compiler / build tools' -version '2.2.3' -recipe 'build-essential', 'Installs packages required for compiling C software from source.' - -supports 'amazon' -supports 'centos' -supports 'debian' -supports 'fedora' -supports 'freebsd' -supports 'mac_os_x', '>= 10.7.0' -supports 'mac_os_x_server', '>= 10.7.0' -supports 'oracle' -supports 'redhat' -supports 'scientific' -supports 'smartos' -supports 'suse' -supports 'ubuntu' - -suggests 'pkgutil' # Solaris 2 - -attribute 'build-essential/compile_time', - display_name: 'Build Essential Compile Time Execution', - description: 'Execute resources at compile time.', - default: 'false', - recipes: ['build-essential::default'] diff --git a/cookbooks/build-essential/recipes/_fedora.rb b/cookbooks/build-essential/recipes/_fedora.rb index 72715b7..8d52bbc 100644 --- a/cookbooks/build-essential/recipes/_fedora.rb +++ b/cookbooks/build-essential/recipes/_fedora.rb @@ -2,7 +2,7 @@ # Cookbook Name:: build-essential # Recipe:: fedora # -# Copyright 2008-2013, Chef Software, Inc. +# Copyright 2008-2015, 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. @@ -28,4 +28,5 @@ potentially_at_compile_time do package 'make' package 'm4' package 'ncurses-devel' + package 'patch' end diff --git a/cookbooks/build-essential/recipes/_solaris2.rb b/cookbooks/build-essential/recipes/_solaris2.rb index 32ed8a7..2da9800 100644 --- a/cookbooks/build-essential/recipes/_solaris2.rb +++ b/cookbooks/build-essential/recipes/_solaris2.rb @@ -44,5 +44,5 @@ when 5.11 package 'ucb' end else - raise "Sorry, we don't support Solaris version #{node['platform_version']} at this juncture." + fail "Sorry, we don't support Solaris version #{node['platform_version']} at this juncture." end