Commit 6315871a authored by Seth Vargo's avatar Seth Vargo Committed by Bryan McLellan
Browse files

Normalize whitespace on all files

parent 61e98b94
......@@ -8,7 +8,7 @@ You can find the answers to additional frequently asked questions [on the wiki](
* Create an account on our [bug tracker](http://tickets.opscode.com)
* Sign our contributor agreement (CLA) [
online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L)
online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L)
(keep reading if you're contributing on behalf of your employer)
* Create a ticket for your change on the [bug tracker](http://tickets.opscode.com)
* Link to your patch as a rebased git branch or pull request from the ticket
......@@ -19,7 +19,7 @@ We regularly review contributions and will get back to you if we have any sugges
## The Apache License and the CLA/CCLA
Licensing is very important to open source projects, it helps ensure the software continues to be available under the terms that the author desired.
Chef uses the Apache 2.0 license to strike a balance between open contribution and allowing you to use the software however you would like to.
Chef uses the Apache 2.0 license to strike a balance between open contribution and allowing you to use the software however you would like to.
The license tells you what rights you have that are provided by the copyright holder. It is important that the contributor fully understands what rights
they are licensing and agrees to them. Sometimes the copyright holder isn't the contributor, most often when the contributor is doing work for a company.
......@@ -43,26 +43,26 @@ such as:
* Discussion regarding the design and merits of features
* Error output to aid in finding similar bugs
Each ticket should aim to fix one bug or add one feature.
Each ticket should aim to fix one bug or add one feature.
## Using git
You can get a quick copy of the chef repository by running `git clone git://github.com/opscode/chef.git`.
You can get a quick copy of the chef repository by running `git clone git://github.com/opscode/chef.git`.
For collaboration purposes, it is best if you create a Github account and fork the repository to your own account.
For collaboration purposes, it is best if you create a Github account and fork the repository to your own account.
Once you do this you will be able to push your changes to your Github repository for others to see and use.
### Branches and Commits
You should submit your patch as a git branch named after the ticket, such as CHEF-1337.
This is called a _topic branch_ and allows users to associate a branch of code with the ticket.
This is called a _topic branch_ and allows users to associate a branch of code with the ticket.
It is a best practice to have your commit message have a _summary line_ that includes the ticket number,
followed by an empty line and then a brief description of the commit. This also helps other contributors
understand the purpose of changes to the code.
CHEF-3435: Create deploy dirs before calling scm_provider
The SCM providers have an assertation that requires the deploy directory to
exist. The deploy provider will create missing directories, we don't converge
the actions before we call run_action against the SCM provider, so it is not
......@@ -76,7 +76,7 @@ helpful to be clear about your use case and change so they can understand it eve
All of Opscode's open source projects are available on [Github](http://www.github.com/opscode).
We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker.
We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker.
However Github has a lot of convenient features, such as being able to see a diff of changes between a
pull request and the main repository quickly without downloading the branch.
......@@ -92,14 +92,14 @@ Additional help with git is available on the [Working with Git](http://wiki.opsc
There are rspec unit tests in the 'spec' directory. If you don't have rspec already installed, you can use the 'bundler'
gem to help you get the necessary prerequisites by running `sudo gem install bundler` and then `bundle install` from
the chef respository. You can run the chef client spec tests by running `rspec spec/*` or `rake spec` from the chef
the chef respository. You can run the chef client spec tests by running `rspec spec/*` or `rake spec` from the chef
directory of the chef repository.
These tests should pass successfully on Ruby 1.8 and 1.9 on all of the platforms that Chef runs on. It is good to run the tests
These tests should pass successfully on Ruby 1.8 and 1.9 on all of the platforms that Chef runs on. It is good to run the tests
once on your system before you get started to ensure they all pass so you have a valid baseline. After you write your patch,
run the tests again to see if they all pass.
If any don't pass, investigate them before submitting your patch.
If any don't pass, investigate them before submitting your patch.
These tests don't modify your system, and sometimes tests fail because a command that would be run has changed because of your
patch. This should be a simple fix. Other times the failure can show you that an important feature no longer works because of
......@@ -136,7 +136,7 @@ The versioning for the Chef project is X.Y.Z.
Major releases and have historically been once a year. Minor releases for Chef average every two months and patch releases come as needed.
There are usually beta releases and release candidates (RC) of major and minor releases announced on
There are usually beta releases and release candidates (RC) of major and minor releases announced on
the [chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev). Once an RC is released, we wait at least three
days to allow for testing for regressions before the final release. If a blocking regression is found then another RC is made containing
the fix and the timer is reset.
......
......@@ -9,9 +9,9 @@
# 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.
......
......@@ -9,9 +9,9 @@
# 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.
......
......@@ -9,9 +9,9 @@
# 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.
......
......@@ -9,9 +9,9 @@
# 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.
......
#!/usr/bin/env ruby
#
# ./knife - Chef CLI interface
# ./knife - Chef CLI interface
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2009 Opscode, Inc.
......@@ -9,9 +9,9 @@
# 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.
......
......@@ -29,9 +29,8 @@ Gem::Specification.new do |s|
# CHEF-3027: The knife-cloud plugins require newer features from highline, core chef should not.
s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
s.add_dependency "erubis", "~> 2.7"
s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
%w(rdoc sdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
%w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.13.0" }
s.add_development_dependency "chef-zero", "~> 1.4"
......
......@@ -5,9 +5,9 @@
# 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.
......
......@@ -5,9 +5,9 @@
# 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.
......
......@@ -5,9 +5,9 @@
# 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.
......
......@@ -5,9 +5,9 @@
# 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.
......
......@@ -32,7 +32,7 @@ __knife__ __bootstrap__ _(options)_
* `--[no-]host-key-verify`:
Enable host key verification, which is the default behavior.
* `--hint HINT_NAME[=HINT_FILE]`:
Provide the name of a hint (with option JSON file) to set for use by
Provide the name of a hint (with option JSON file) to set for use by
Ohai plugins.
## DESCRIPTION
......
......@@ -35,17 +35,17 @@ the specified _directory_.
field blank to accept the default value. On most systems, the
default values are acceptable.
user@host$ knife configure -i
Please enter the chef server URL: [http://localhost:4000]
Please enter a clientname for the new client: [username]
Please enter the existing admin clientname: [chef-webui]
Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]
Please enter the validation clientname: [chef-validator]
Please enter the location of the validation key: [/etc/chef/validation.pem]
Please enter the path to a chef repository (or leave blank):
Creating initial API user...
Created (or updated) client[username]
Configuration file written to /home/username/.chef/knife.rb
user@host$ knife configure -i
Please enter the chef server URL: [http://localhost:4000]
Please enter a clientname for the new client: [username]
Please enter the existing admin clientname: [chef-webui]
Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]
Please enter the validation clientname: [chef-validator]
Please enter the location of the validation key: [/etc/chef/validation.pem]
Please enter the path to a chef repository (or leave blank):
Creating initial API user...
Created (or updated) client[username]
Configuration file written to /home/username/.chef/knife.rb
This creates a new administrator client named _username_, writes
a configuration file to _/home/username/.chef/knife.rb_, and the
......
......@@ -79,4 +79,4 @@ granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.
On Debian systems, the complete text of the Apache 2.0 License can be
found in /usr/share/common-licenses/Apache-2.0.
\ No newline at end of file
found in /usr/share/common-licenses/Apache-2.0.
......@@ -55,4 +55,4 @@ granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.
On Debian systems, the complete text of the Apache 2.0 License can be
found in /usr/share/common-licenses/Apache-2.0.
\ No newline at end of file
found in /usr/share/common-licenses/Apache-2.0.
......@@ -61,7 +61,7 @@ reload() {
killproc -p $pidfile chef-client -HUP
retval=$?
echo
return $retval
return $retval
}
run() {
......
......@@ -11,7 +11,7 @@
# Required-Stop: $local_fs $network $remote_fs chef-solr chef-expander
# Should-Start: $named $time
# Should-Stop: $named $time
# Short-Description: Startup script for chef-server
# Short-Description: Startup script for chef-server
# Description: Server component of the Chef systems integration framework.
### END INIT INFO
......@@ -50,7 +50,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
killproc -p $pidfile $prog
killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
......
......@@ -11,7 +11,7 @@
# Required-Stop: $local_fs $network $remote_fs chef-server
# Should-Start: $named $time
# Should-Stop: $named $time
# Short-Description: Startup script for chef-server-webui
# Short-Description: Startup script for chef-server-webui
# Description: Server WebUI component of the Chef systems integration framework.
### END INIT INFO
......@@ -50,7 +50,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
killproc -p $pidfile $prog
killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
......
#!/bin/bash
#
#
# chef-solr Startup script for the SOLR search engine
#
# chkconfig: - 94 06
......@@ -42,7 +42,7 @@ start() {
stop() {
echo -n $"Stopping $prog: "
killproc -p $pidfile $prog
killproc -p $pidfile $prog
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
......
......@@ -175,7 +175,7 @@ class Chef::Application
# Initializes Chef::Client instance and runs it
def run_chef_client
@chef_client = Chef::Client.new(
@chef_client_json,
@chef_client_json,
:override_runlist => config[:override_runlist]
)
@chef_client_json = nil
......
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