Skip to content

Commit

Permalink
Merge 583f761 into d75bd42
Browse files Browse the repository at this point in the history
  • Loading branch information
hartmantis committed Dec 3, 2014
2 parents d75bd42 + 583f761 commit c67b661
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,7 @@ Omnijack Gem CHANGELOG

v?.?.? (????-??-??)
-------------------
- Replace every instance of `getchef.com` with `chef.io`

v1.0.0 (2014-10-24)
-------------------
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
@@ -1,5 +1,5 @@
Omnijack NOTICE
===============

Omnijack incorporates code from Chef (http://www.getchef.com), which is
Omnijack incorporates code from Chef (http://www.chef.io), which is
Copyright (c) 2008-2014 Opscode/Chef.
2 changes: 1 addition & 1 deletion lib/omnijack/config.rb
Expand Up @@ -21,7 +21,7 @@ class Omnijack
#
# @author Jonathan Hartman <j@p4nt5.com>
module Config
DEFAULT_BASE_URL ||= 'https://www.getchef.com/chef'
DEFAULT_BASE_URL ||= 'https://www.chef.io/chef'
OMNITRUCK_PROJECTS ||= {
angry_chef: {
endpoints: {
Expand Down
4 changes: 2 additions & 2 deletions spec/omnijack/config_spec.rb
Expand Up @@ -22,7 +22,7 @@
describe Omnijack::Config do
describe 'DEFAULT_BASE_URL' do
it 'uses the official Chef API' do
expected = 'https://www.getchef.com/chef'
expected = 'https://www.chef.io/chef'
expect(described_class::DEFAULT_BASE_URL).to eq(expected)
end
end
Expand All @@ -36,7 +36,7 @@
described_class::OMNITRUCK_PROJECTS.each do |project, attrs|
attrs[:endpoints].each do |name, endpoint|
it "uses a valid #{project}::#{name} endpoint" do
url = "http://www.getchef.com/chef#{endpoint}"
url = "http://www.chef.io/chef#{endpoint}"
url << '?v=latest&p=ubuntu&pv=12.04&m=x86_64' if name == :metadata

# Some endpoints aren't available on Chef's public Omnitruck API
Expand Down
2 changes: 1 addition & 1 deletion spec/omnijack/endpoint/metadata_spec.rb
Expand Up @@ -391,7 +391,7 @@
end

it 'returns the appropriate metadata endpoint' do
expected = URI.parse('https://www.getchef.com/chef/metadata-chefdk?' \
expected = URI.parse('https://www.chef.io/chef/metadata-chefdk?' \
'v=1.2.3&p=ubuntu&pv=12.04')
expect(obj.send(:api_url)).to eq(expected)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/omnijack/endpoint_spec.rb
Expand Up @@ -134,7 +134,7 @@
context 'no argument provided' do
it 'uses the default' do
res = obj
expected = 'https://www.getchef.com/chef'
expected = 'https://www.chef.io/chef'
expect(res.base_url).to eq(expected)
expect(res.instance_variable_get(:@base_url)).to eq(expected)
end
Expand Down
20 changes: 10 additions & 10 deletions spec/support/real_test_data.json
Expand Up @@ -5,12 +5,12 @@
"prerelease": false,
"nightlies": false,
"expected": {
"url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.4-1_amd64.deb",
"filename": "chefdk_0.3.4-1_amd64.deb",
"version": "0.3.4",
"url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.5-1_amd64.deb",
"filename": "chefdk_0.3.5-1_amd64.deb",
"version": "0.3.5",
"build": "1",
"md5": "08904844927a593ae449d93e3600c6e0",
"sha256": "fe9ee6a07de91b3af86504f96a64642e9d22d6fa8a207b67df3fefb50dce07d4"
"md5": "cda10f30efd6a80166937668db4a67f7",
"sha256": "a81c3dfad698fbb19a6c8e3dd65f04a15fd58a811d99db9c47e5a93e368f341d"
}
},
{
Expand Down Expand Up @@ -40,12 +40,12 @@
"prerelease": false,
"nightlies": true,
"expected": {
"url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.4%2B20141112204320-1_amd64.deb",
"filename": "chefdk_0.3.4+20141112204320-1_amd64.deb",
"version": "0.3.4+20141112204320",
"url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.5%2B20141117085014-1_amd64.deb",
"filename": "chefdk_0.3.5+20141117085014-1_amd64.deb",
"version": "0.3.5+20141117085014",
"build": "1",
"md5": "e8e7b2937df4751d5664abc0a91eca48",
"sha256": "97b533de6a611b688150dd4a12b186442343bd70078609b943e88149c1db015e"
"md5": "36452d69fe2751a103b0efe45593ee1e",
"sha256": "210596c1f5c301fa0a50714b8183e28efcfb2dfee19f7a47bf1e204848022af3"
}
},
{
Expand Down

0 comments on commit c67b661

Please sign in to comment.