Commit 24dc69a9 authored by Seth Chisamore's avatar Seth Chisamore
Browse files

[OC-3564] move core Chef to the repo root \o/ \m/

The opscode/chef repository now only contains the core Chef library code
used by chef-client, knife and chef-solo!
parent 9348c1c9
# git config merge.ignore.name 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
chef/distro/common/html/* merge=ignore
chef/distro/common/man/man1/* merge=ignore
chef/distro/common/man/man8/* merge=ignore
chef/lib/chef/version.rb merge=ignore
chef-solr/lib/chef/solr/version.rb merge=ignore
chef-server/lib/chef-server/version.rb merge=ignore
chef-server-webui/lib/chef-server-webui/version.rb merge=ignore
chef-server-api/lib/chef-server-api/version.rb merge=ignore
chef-expander/lib/chef/expander/version.rb merge=ignore
distro/common/html/* merge=ignore
distro/common/man/man1/* merge=ignore
distro/common/man/man8/* merge=ignore
lib/chef/version.rb merge=ignore
......@@ -2,43 +2,13 @@
coverage
doc
.DS_Store
packages/chef-server/db
examples/search_index
examples/store
examples/openid-cstore
examples/openid-db
chef/pkg
chef-server/pkg
chef-server-webui/pkg
chef-server-api/pkg
chef-expander/pkg
chef/log
chef/rdoc
chef-server/log
log
couchdb.stderr
couchdb.stdout
features/data/tmp/**
*.swp
*.swo
features/data/cookbooks/**/metadata.json
features/data/solr/**
erl_crash.dump
*.rake_tasks~
.idea
features/data/repo/checksums/
*.rbc
chef-expander/conf/chef-expander.rb
chef-expander/spec/fixtures/expander.log
features/data/cookbooks/transfer_remote_files/metadata.json
features/data/cookbooks/synchronize_deps/metadata.json
features/data/cookbooks_not_uploaded_at_feature_start/*/metadata.json
pkg
*/tags
*~
# you should check in your Gemfile.lock in applications, and not in gems
Gemfile.lock
Gemfile.local
# Do not check in the .bundle directory, or any of the files inside it. Those files are specific to each particular machine, and are used to persist installation options between runs of the bundle install command.
.bundle
......
[submodule "chef-server-slice/public/javascripts/jsoneditor"]
path = chef-server-slice/public/javascripts/jsoneditor
url = git://github.com/iterationlabs/jsoneditor.git
[submodule "chef-server-slice/public/web-app-theme"]
path = chef-server-slice/public/web-app-theme
url = git://github.com/pilu/web-app-theme.git
= Chef[http://www.opscode.com/chef]
= Chef
= DESCRIPTION:
== DESCRIPTION:
Chef is a system integration framework designed to bring the benefits of configuration management to your entire infrastructure.
Chef is a configuration management tool designed to bring automation to your entire infrastructure.
The Chef Wiki is the definitive source of user documentation.
......@@ -12,114 +12,71 @@ This README focuses on developers who want to modify Chef source code. For users
* http://wiki.opscode.com/display/chef/Installing+Chef+from+HEAD
= DEVELOPMENT:
== DEVELOPMENT:
Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document.
* http://wiki.opscode.com/display/chef/How+to+Contribute
* http://wiki.opscode.com/display/opscode/Contributing
You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki.
* http://wiki.opscode.com/display/opscode/Working+with+Git
Once your repository is set up, you can start working on the code. We do use BDD/TDD with RSpec and Cucumber, so you'll need to get a development environment running.
Once your repository is set up, you can start working on the code. We do use TDD with RSpec, so you'll need to get a development environment running.
= ENVIRONMENT:
== REQUIREMENTS:
Chef has two kinds of code testing:
Ruby 1.8.7+ [1]
* Unit Tests (rspec)
* Integration Tests (cucumber)
[1] As of 2012-05-25 Ruby 1.8.6 should still work, except for CHEF-2329.
We're going to set up the local environment in two phases, one for each of these.
== ENVIRONMENT:
== Unit Tests (rspec):
In order to have a development environment where changes to the Chef code can be tested, we'll need to install a few things after setting up the Git repository.
We use Rspec to test that the code does what it is supposed to (unit tests).
=== Non-Gem Dependencies
Non-Ruby software:
Install these via your platform's preferred method; for example apt, yum, ports, emerge, etc.
* Gecode (version 3.5.0)
* Git[http://git-scm.com/]
* GCC and C Standard Libraries, header files, etc. (i.e., build-essential on debian/ubuntu)
* Ruby development package
Gecode is available on Mac OS X from homebrew, for Ubuntu/Debian from apt.opscode.com, or can be compiled from source.
=== Runtime Rubygem Dependencies
==== Chef Client and Solo
* ohai
* erubis
* highline
* json (1.4.4 - 1.4.6)
* mixlib-authentication
* mixlib-cli
* mixlib-config
* mixlib-log
* moneta
* rest-client
* uuidtools
* merb-core
* net-ssh
* fog
* http://www.gecode.org/
=== Development Rubygem Dependencies
* rake[http://rake.rubyforge.org/]
* rspec[http://rspec.info/]
Install the Chef Gems from source in this repository.
Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
rake install
== Spec testing:
Install the following RubyGems:
* rake
* rspec (2.8.0)
* dep_selector (requires Gecode to compile native extensions)
Run rake or rake spec:
We use RSpec for unit/spec tests. It is not necessary to start the development
environment to run the specs--they are completely standalone.
rake spec
....
Finished in 17.42 seconds
3823 examples, 0 failures, 3 pending
== Integration Tests (cucumber):
The integration tests require some additional software on top of what was installed for the unit tests. Most of the integration tests are for testing the Chef Server API interactions, so a Chef Server environment needs to be installed.
Non-Ruby software:
* Java
* CouchDB (0.10+)
* RabbitMQ (1.7.2+)
These are available in most common distribution packaging systems, including Debian 6.0+ and Ubuntu 10.04+. Java is installed on Mac OS X by default; CouchDB and RabbitMQ are available in homebrew.
Make sure the RubyGems for the Chef Server are installed (should be from the +rake install+ earlier):
* chef-expander (now in its own repository at https://github.com/opscode/chef-expander)
* chef-server
* chef-server-api
* chef-server-webui (now in its own repository at https://github.com/opscode/chef-server-webui)
* chef-solr (now in its own repository at https://github.com/opscode/chef-solr)
=== Starting the Environment:
Once everything is installed, run the dev:features rake task. Since the features do integration testing, root access may be required.
(sudo) rake dev:features
This rake task will do the following:
* Start CouchDB, running on port 5984
* Start and configure RabbitMQ for Chef, running on port 5672
* Install Chef SOLR data and start chef-solr, running on port 8983
* Start chef-server-api on port 4000
* Start chef-server-webui on port 4001
* Start chef-expander, the clustered search index broker
You'll want to leave this terminal running the dev environment.
== Web Interface:
With the dev environment running, you can now access the web interface via http://localhost:4000/. The default login is admin / p@ssw0rd1.
== Integration testing:
We test integration with Cucumber. Normally, you'll just run:
rake features
In a second terminal, to run all the feature tests. Other feature tests are available as well, see:
rake -T | grep Cucumber
There are over 60 different sets of features that can be tested.
= LINKS:
== LINKS:
Source:
* https://github.com/opscode/chef/
* http://github.com/opscode/chef/tree/master
Tickets/Issues:
......
Gemfile.lock
Gemfile.local
spec/support/local_gems.rb
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.
= Chef
== DESCRIPTION:
Chef is a configuration management tool designed to bring automation to your entire infrastructure.
The Chef Wiki is the definitive source of user documentation.
* http://wiki.opscode.com/display/chef/Home
This README focuses on developers who want to modify Chef source code. For users who just want to run the latest and greatest Chef development version in their environment, see:
* http://wiki.opscode.com/display/chef/Installing+Chef+from+HEAD
== DEVELOPMENT:
Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document.
* http://wiki.opscode.com/display/opscode/Contributing
You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki.
* http://wiki.opscode.com/display/opscode/Working+with+Git
Once your repository is set up, you can start working on the code. We do use TDD with RSpec, so you'll need to get a development environment running.
== REQUIREMENTS:
Ruby 1.8.7+ [1]
[1] As of 2012-05-25 Ruby 1.8.6 should still work, except for CHEF-2329.
== ENVIRONMENT:
In order to have a development environment where changes to the Chef code can be tested, we'll need to install a few things after setting up the Git repository.
=== Non-Gem Dependencies
Install these via your platform's preferred method; for example apt, yum, ports, emerge, etc.
* Git[http://git-scm.com/]
* GCC and C Standard Libraries, header files, etc. (i.e., build-essential on debian/ubuntu)
* Ruby development package
=== Runtime Rubygem Dependencies
==== Chef Client and Solo
* ohai
* erubis
* highline
* json (1.4.4 - 1.4.6)
* mixlib-authentication
* mixlib-cli
* mixlib-config
* mixlib-log
* moneta
* rest-client
* uuidtools
* merb-core
* net-ssh
* fog
=== Development Rubygem Dependencies
* rake[http://rake.rubyforge.org/]
* rspec[http://rspec.info/]
Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master.
== Spec testing:
We use RSpec for unit/spec tests. It is not necessary to start the development
environment to run the specs--they are completely standalone.
rake spec
== LINKS:
Source:
* http://github.com/opscode/chef/tree/master
Tickets/Issues:
* http://tickets.opscode.com/
Documentation:
* http://wiki.opscode.com/display/chef/Home/
= LICENSE:
Chef - A configuration management system
Author:: Adam Jacob (<adam@opscode.com>)
Copyright:: Copyright (c) 2008-2012 Opscode, Inc.
License:: Apache License, Version 2.0
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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment