Skip to content

Commit

Permalink
opscode2chef
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean OMeara committed Feb 18, 2015
1 parent 1f7c092 commit daf4b1a
Show file tree
Hide file tree
Showing 55 changed files with 79 additions and 69 deletions.
4 changes: 2 additions & 2 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "http://api.berkshelf.com"
source "https://supermarket.chef.io"

metadata

Expand All @@ -12,4 +12,4 @@ group :integration do
end


cookbook "ark_spec", path: "spec/fixtures/cookbooks/ark_spec"
cookbook "ark_spec", path: "spec/fixtures/cookbooks/ark_spec"
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,35 +37,35 @@ v0.6.0 (2014-02-27)
v0.5.0 (2014-02-21)
-------------------
### Bug
- **[COOK-4288](https://tickets.opscode.com/browse/COOK-4288)** - Cleanup the Kitchen
- **[COOK-4288](https://tickets.chef.io/browse/COOK-4288)** - Cleanup the Kitchen

### Improvement
- **[COOK-4264](https://tickets.opscode.com/browse/COOK-4264)** - Add node['ark']['package_dependencies'] to allow tuning packages.
- **[COOK-4264](https://tickets.chef.io/browse/COOK-4264)** - Add node['ark']['package_dependencies'] to allow tuning packages.


v0.4.2
------
### Improvement
- **[COOK-3854](https://tickets.opscode.com/browse/COOK-3854)** - Capability with mac_os_x: '/bin/chown' - No such file or directory
- **[COOK-3854](https://tickets.chef.io/browse/COOK-3854)** - Capability with mac_os_x: '/bin/chown' - No such file or directory
- Cleaning up some style for rubucop
- Updating test harness


v0.4.0
------
### Improvement
- **[COOK-3539](https://tickets.opscode.com/browse/COOK-3539)** - Allow dumping of bz2 and gzip files
- **[COOK-3539](https://tickets.chef.io/browse/COOK-3539)** - Allow dumping of bz2 and gzip files

v0.3.2
------
### Bug
- **[COOK-3191](https://tickets.opscode.com/browse/COOK-3191)** - Propogate unzip failures
- **[COOK-3118](https://tickets.opscode.com/browse/COOK-3118)** - Set cookbook attribute in provider
- **[COOK-3055](https://tickets.opscode.com/browse/COOK-3055)** - Use proper scope in helper module
- **[COOK-3054](https://tickets.opscode.com/browse/COOK-3054)** - Fix notification resource updating
- **[COOK-3191](https://tickets.chef.io/browse/COOK-3191)** - Propogate unzip failures
- **[COOK-3118](https://tickets.chef.io/browse/COOK-3118)** - Set cookbook attribute in provider
- **[COOK-3055](https://tickets.chef.io/browse/COOK-3055)** - Use proper scope in helper module
- **[COOK-3054](https://tickets.chef.io/browse/COOK-3054)** - Fix notification resource updating

### Improvement
- **[COOK-3179](https://tickets.opscode.com/browse/COOK-3179)** - README updates and refactor
- **[COOK-3179](https://tickets.chef.io/browse/COOK-3179)** - README updates and refactor

v0.3.0
------
Expand Down
46 changes: 23 additions & 23 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Contributing to Opscode Cookbooks
# Contributing to Chef Software Cookbooks

We are glad you want to contribute to Opscode Cookbooks! The first
We are glad you want to contribute to Chef Software Cookbooks! The first
step is the desire to improve the project.

You can find the answers to additional frequently asked questions
[on the wiki](http://wiki.opscode.com/display/chef/How+to+Contribute).
[on the wiki](http://wiki.chef.io/display/chef/How+to+Contribute).

You can find additional information about
[contributing to cookbooks](http://wiki.opscode.com/display/chef/How+to+Contribute+to+Opscode+Cookbooks)
[contributing to cookbooks](http://wiki.chef.io/display/chef/How+to+Contribute+to+Opscode+Cookbooks)
on the wiki as well.

## Quick-contribute

* Create an account on our [bug tracker](http://tickets.opscode.com)
* Create an account on our [bug tracker](http://tickets.chef.io)
* Sign our contributor agreement (CLA)
[ 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)
[bug tracker](http://tickets.chef.io)
* Link to your patch as a rebased git branch or pull request from the
ticket
* Resolve the ticket as fixed
Expand Down Expand Up @@ -58,7 +58,7 @@ instead.

## Ticket Tracker (JIRA)

The [ticket tracker](http://tickets.opscode.com) is the most important
The [ticket tracker](http://tickets.chef.io) is the most important
documentation for the code base. It provides significant historical
information, such as:

Expand All @@ -72,7 +72,7 @@ Each ticket should aim to fix one bug or add one feature.

You can get a quick copy of the repository for this cookbook by
running `git clone
git://github.com/opscode-coobkooks/COOKBOOKNAME.git`.
git://github.com/chef-coobkooks/COOKBOOKNAME.git`.

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
Expand Down Expand Up @@ -110,7 +110,7 @@ to them.
### Github and Pull Requests

All of Opscode's open source cookbook projects are available on
[Github](http://www.github.com/opscode-cookbooks).
[Github](http://www.github.com/chef-cookbooks).

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
Expand All @@ -127,18 +127,18 @@ reply from the author for various reasons.
### More information

Additional help with git is available on the
[Working with Git](http://wiki.opscode.com/display/chef/Working+with+Git)
[Working with Git](http://wiki.chef.io/display/chef/Working+with+Git)
wiki page.

## Functional and Unit Tests

This cookbook is set up to run tests under
[Opscode's test-kitchen](https://github.com/opscode/test-kitchen). It
[Opscode's test-kitchen](https://github.com/chef/test-kitchen). It
uses minitest-chef to run integration tests after the node has been
converged to verify that the state of the node.

Test kitchen should run completely without exception using the default
[baseboxes provided by Opscode](https://github.com/opscode/bento).
[baseboxes provided by Opscode](https://github.com/chef/bento).
Because Test Kitchen creates VirtualBox machines and runs through
every configuration in the Kitchenfile, it may take some time for
these tests to complete.
Expand Down Expand Up @@ -168,7 +168,7 @@ mailing list, or the #chef-hacking IRC channel.

## Code Review

Opscode regularly reviews code contributions and provides suggestions
Chef Software regularly reviews code contributions and provides suggestions
for improvement in the code itself or the implementation.

We find contributions by searching the ticket tracker for _resolved_
Expand All @@ -183,7 +183,7 @@ or two, depending on the current release cycle.

## Release Cycle

The versioning for Opscode Cookbook projects is X.Y.Z.
The versioning for Chef Software Cookbook projects is X.Y.Z.

* X is a major release, which may not be fully compatible with prior
major releases
Expand All @@ -198,29 +198,29 @@ minor incrementing version.

Releases of Opscode's cookbooks are usually announced on the Chef user
mailing list. Releases of several cookbooks may be batched together
and announced on the [Opscode Blog](http://www.opscode.com/blog).
and announced on the [Chef Software Blog](http://www.chef.io/blog).

## Working with the community

These resources will help you learn more about Chef and connect to
other members of the Chef community:

* [chef](http://lists.opscode.com/sympa/info/chef) and
[chef-dev](http://lists.opscode.com/sympa/info/chef-dev) mailing
* [chef](http://lists.chef.io/sympa/info/chef) and
[chef-dev](http://lists.chef.io/sympa/info/chef-dev) mailing
lists
* #chef and #chef-hacking IRC channels on irc.freenode.net
* [Community Cookbook site](http://community.opscode.com)
* [Chef wiki](http://wiki.opscode.com/display/chef)
* Opscode Chef [product page](http://www.opscode.com/chef)
* [Community Cookbook site](http://community.chef.io)
* [Chef wiki](http://wiki.chef.io/display/chef)
* Chef Software Chef [product page](http://www.chef.io/chef)


## Cookbook Contribution Do's and Don't's

Please do include tests for your contribution. If you need help, ask
on the
[chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev)
[chef-dev mailing list](http://lists.chef.io/sympa/info/chef-dev)
or the
[#chef-hacking IRC channel](http://community.opscode.com/chat/chef-hacking).
[#chef-hacking IRC channel](http://community.chef.io/chat/chef-hacking).
Not all platforms that a cookbook supports may be supported by Test
Kitchen. Please provide evidence of testing your contribution if it
isn't trivial so we don't have to duplicate effort in testing. Chef
Expand Down Expand Up @@ -253,5 +253,5 @@ information above.

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.
Opscode will update the CHANGELOG.md when releasing a new version of
Chef Software will update the CHANGELOG.md when releasing a new version of
the cookbook.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Ark provides many actions to accommodate different use cases, such as
`:dump`, `:cherry_pick`, `:put`, and `:install_with_make`.

At this time ark only handles files available from URLs using the
[remote_file](http://docs.opscode.com/resource_remote_file.html) provider.
[remote_file](http://docs.chef.io/resource_remote_file.html) provider.
It does handle local files using the `file://` protocol.

Requirements
Expand All @@ -41,7 +41,7 @@ This cookbook requires Chef 11 for the provider, as it uses the
`use_inline_resources` method.

More about
[use_inline_resources](http://docs.opscode.com/lwrp_common_inline_compile.html)
[use_inline_resources](http://docs.chef.io/lwrp_common_inline_compile.html)
in the Chef documentation.

Should work on common Unix/Linux systems with typical userland
Expand Down Expand Up @@ -287,12 +287,12 @@ License and Author
- Author: Philip (flip) Kromer - Infochimps, Inc(<[email protected]>)
- Author: Bryan W. Berry (<[email protected]>)
- Author: Denis Barishev (<[email protected]>)
- Author: Sean OMeara (<someara@opscode.com>)
- Author: Sean OMeara (<someara@chef.io>)
- Author: John Bellone (<[email protected]>)
- Copyright: 2011, Philip (flip) Kromer - Infochimps, Inc
- Copyright: 2012, Bryan W. Berry
- Copyright: 2012, Denis Barishev
- Copyright: 2013, Opscode, Inc
- Copyright: 2013, Chef Software, Inc
- Copyright: 2014, Bloomberg L.P.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Integration Testing using Vagrant
---------------------------------
Integration tests can be performed on a local workstation using
Virtualbox or VMWare. Detailed instructions for setting this up can be
found at the [Bento](https://github.com/opscode/bento) project web site.
found at the [Bento](https://github.com/chef/bento) project web site.

Integration tests using Vagrant can be performed with either
```
Expand Down
Empty file.
Empty file added files/default/.!65978!foo.tbz
Empty file.
Empty file added files/default/.!65979!foo.tgz
Empty file.
Empty file added files/default/.!65980!foo.txz
Empty file.
1 change: 1 addition & 0 deletions files/default/.!65981!foo.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
1 change: 1 addition & 0 deletions files/default/.!65983!foo_sub.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
Empty file added files/default/.!66078!foo.tbz
Empty file.
Empty file added files/default/.!66079!foo.tgz
Empty file.
Empty file added files/default/.!66080!foo.txz
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66081!foo.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66083!foo_sub.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
Empty file added files/default/.!66185!foo.tbz
Empty file.
Empty file added files/default/.!66186!foo.tgz
Empty file.
Empty file added files/default/.!66187!foo.txz
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66188!foo.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66190!foo_sub.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
Empty file added files/default/.!66299!foo.tbz
Empty file.
Empty file added files/default/.!66300!foo.tgz
Empty file.
Empty file added files/default/.!66301!foo.txz
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66302!foo.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66304!foo_sub.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
Empty file added files/default/.!66420!foo.tbz
Empty file.
Empty file added files/default/.!66421!foo.tgz
Empty file.
Empty file added files/default/.!66422!foo.txz
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66423!foo.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
Empty file.
1 change: 1 addition & 0 deletions files/default/.!66425!foo_sub.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PK
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'ark'
maintainer 'Franklin Webber'
maintainer_email 'frank@getchef.com'
maintainer_email 'frank@chef.io'
license 'Apache 2.0'
description 'Installs/Configures ark'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
Expand Down
4 changes: 2 additions & 2 deletions providers/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Provider:: Ark
#
# Author:: Bryan W. Berry <[email protected]>
# Author:: Sean OMeara <someara@opscode.com
# Author:: Sean OMeara <someara@chef.io
# Author:: John Bellone <[email protected]>
# Copyright 2012, Bryan W. Berry
# Copyright 2013, Opscode, Inc.
# Copyright 2013, Chef Software, Inc.
# Copyright 2014, Bloomberg L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/cookbooks/ark_spec/recipes/cherry_pick.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ark 'test_cherry_pick' do
url 'https://github.com/opscode-cookbooks/ark/raw/master/files/default/foo.tar.gz'
url 'https://github.com/chef-cookbooks/ark/raw/master/files/default/foo.tar.gz'
checksum '5996e676f17457c823d86f1605eaa44ca8a81e70d6a0e5f8e45b51e62e0c52e8'
path '/usr/local/foo_cherry_pick'
owner 'foobarbaz'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ark 'cherry_pick_with_zip' do
url 'https://github.com/opscode-cookbooks/ark/raw/master/files/default/foo.zip'
url 'https://github.com/chef-cookbooks/ark/raw/master/files/default/foo.zip'
checksum 'deea3a324115c9ca0f3078362f807250080bf1b27516f7eca9d34aad863a11e0'
path '/usr/local/foo_cherry_pick_from_zip'
creates 'foo_sub/foo1.txt'
Expand Down
Loading

0 comments on commit daf4b1a

Please sign in to comment.