diff options
171 files changed, 379 insertions, 339 deletions
@@ -5,7 +5,7 @@ Developed at HJK Solutions (http://www.hjksolutions.com). Contributors and Copyright holders: - * Copyright 2008, Adam Jacob <adam@hjksolutions.com> + * Copyright 2008, Adam Jacob <adam@opscode.com> * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com> * Copyright 2008, Bryan McLellan <btm@loftninjas.org> * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com> diff --git a/README.txt b/README.txt index 2e2e0e3845..7406e4dc33 100644 --- a/README.txt +++ b/README.txt @@ -67,8 +67,8 @@ Install all of the above. To fire up a develpment environment, do the following Chef - A configuration management system -Author:: Adam Jacob (<adam@hjksolutions.com>) -Copyright:: Copyright (c) 2008 HJK Solutions, LLC +Author:: Adam Jacob (<adam@opscode.com>) +Copyright:: Copyright (c) 2008 OpsCode, Inc. License:: Apache License, Version 2.0 Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/NOTICE b/chef-server/NOTICE index 856fdc82b0..02f03a496d 100644 --- a/chef-server/NOTICE +++ b/chef-server/NOTICE @@ -5,6 +5,6 @@ Developed at HJK Solutions (http://www.hjksolutions.com). Contributors and Copyright holders: - * Copyright 2008, Adam Jacob <adam@hjksolutions.com> + * Copyright 2008, Adam Jacob <adam@opscode.com> * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com> * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com> diff --git a/chef-server/README.txt b/chef-server/README.txt index 08a0d31bf2..4f7519df96 100644 --- a/chef-server/README.txt +++ b/chef-server/README.txt @@ -59,8 +59,8 @@ Install all of the above. To fire up a develpment environment, do the following Chef - A configuration management system -Author:: Adam Jacob (<adam@hjksolutions.com>) -Copyright:: Copyright (c) 2008 HJK Solutions, LLC +Author:: Adam Jacob (<adam@opscode.com>) +Copyright:: Copyright (c) 2008 OpsCode, Inc. License:: Apache License, Version 2.0 Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/Rakefile b/chef-server/Rakefile index 7dfdab5137..10dd6295de 100644 --- a/chef-server/Rakefile +++ b/chef-server/Rakefile @@ -5,7 +5,7 @@ require 'rake/gempackagetask' GEM = "chef-server" VERSION = "0.0.1" AUTHOR = "Adam Jacob" -EMAIL = "adam@hjksolutions.com" +EMAIL = "adam@opscode.com" HOMEPAGE = "http://hjksolutions.com" SUMMARY = "A configuration management system server." diff --git a/chef-server/bin/chef-indexer b/chef-server/bin/chef-indexer index 8d013657bb..0126ca8aac 100755 --- a/chef-server/bin/chef-indexer +++ b/chef-server/bin/chef-indexer @@ -2,8 +2,8 @@ # # ./chef-indexer - Build indexes from Chef Queues! # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server index 75c7730844..6fff1d3db7 100755 --- a/chef-server/bin/chef-server +++ b/chef-server/bin/chef-server @@ -2,8 +2,8 @@ # # ./chef-server - Serving up piping hot infrastructure! # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/application.rb b/chef-server/lib/controllers/application.rb index 815c284144..be78d43c70 100644 --- a/chef-server/lib/controllers/application.rb +++ b/chef-server/lib/controllers/application.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_attributes.rb b/chef-server/lib/controllers/cookbook_attributes.rb index 803421b6f5..7394ff456c 100644 --- a/chef-server/lib/controllers/cookbook_attributes.rb +++ b/chef-server/lib/controllers/cookbook_attributes.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_definitions.rb b/chef-server/lib/controllers/cookbook_definitions.rb index dbfeeca4d7..401bb4f47c 100644 --- a/chef-server/lib/controllers/cookbook_definitions.rb +++ b/chef-server/lib/controllers/cookbook_definitions.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_files.rb b/chef-server/lib/controllers/cookbook_files.rb index df332d5972..450d4ef7da 100644 --- a/chef-server/lib/controllers/cookbook_files.rb +++ b/chef-server/lib/controllers/cookbook_files.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_libraries.rb b/chef-server/lib/controllers/cookbook_libraries.rb index ae6b474261..599b7b921d 100644 --- a/chef-server/lib/controllers/cookbook_libraries.rb +++ b/chef-server/lib/controllers/cookbook_libraries.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_recipes.rb b/chef-server/lib/controllers/cookbook_recipes.rb index 5081ddced1..258ca5cfb0 100644 --- a/chef-server/lib/controllers/cookbook_recipes.rb +++ b/chef-server/lib/controllers/cookbook_recipes.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/cookbook_templates.rb b/chef-server/lib/controllers/cookbook_templates.rb index 4cb5e4622c..edff906ed7 100644 --- a/chef-server/lib/controllers/cookbook_templates.rb +++ b/chef-server/lib/controllers/cookbook_templates.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,6 +20,8 @@ class CookbookTemplates < Application provides :html, :json + include Chef::Mixin::Checksum + def load_cookbook_templates() @cl = Chef::CookbookLoader.new @cookbook = @cl[params[:cookbook_id]] @@ -71,7 +73,13 @@ class CookbookTemplates < Application break if to_send end raise NotFound, "Cannot find a suitable template!" unless to_send - send_file(to_send) + current_checksum = checksum(to_send) + Chef::Log.debug("old sum: #{params[:checksum]}, new sum: #{current_checksum}") + if current_checksum == params[:checksum] + display "Template #{to_send} has not changed", :status => 304 + else + send_file(to_send) + end end end diff --git a/chef-server/lib/controllers/cookbooks.rb b/chef-server/lib/controllers/cookbooks.rb index 81a39e4edf..ff17d2d6f3 100644 --- a/chef-server/lib/controllers/cookbooks.rb +++ b/chef-server/lib/controllers/cookbooks.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/exceptions.rb b/chef-server/lib/controllers/exceptions.rb index d8f7307637..2fc885d397 100644 --- a/chef-server/lib/controllers/exceptions.rb +++ b/chef-server/lib/controllers/exceptions.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/nodes.rb b/chef-server/lib/controllers/nodes.rb index 65cb3007ee..60bd24b625 100644 --- a/chef-server/lib/controllers/nodes.rb +++ b/chef-server/lib/controllers/nodes.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/openid_consumer.rb b/chef-server/lib/controllers/openid_consumer.rb index 4e3980ce3d..4fcd714ebd 100644 --- a/chef-server/lib/controllers/openid_consumer.rb +++ b/chef-server/lib/controllers/openid_consumer.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/openid_register.rb b/chef-server/lib/controllers/openid_register.rb index 43f4bc003d..d71991496a 100644 --- a/chef-server/lib/controllers/openid_register.rb +++ b/chef-server/lib/controllers/openid_register.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/openid_server.rb b/chef-server/lib/controllers/openid_server.rb index 7461f6769c..0ad3da55e2 100644 --- a/chef-server/lib/controllers/openid_server.rb +++ b/chef-server/lib/controllers/openid_server.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/search.rb b/chef-server/lib/controllers/search.rb index 0abbf352b8..1400728174 100644 --- a/chef-server/lib/controllers/search.rb +++ b/chef-server/lib/controllers/search.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/controllers/search_entries.rb b/chef-server/lib/controllers/search_entries.rb index c93add3dc5..6fb2a11fc4 100644 --- a/chef-server/lib/controllers/search_entries.rb +++ b/chef-server/lib/controllers/search_entries.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/helpers/cookbooks_helper.rb b/chef-server/lib/helpers/cookbooks_helper.rb index 995f2eb601..98fa081440 100644 --- a/chef-server/lib/helpers/cookbooks_helper.rb +++ b/chef-server/lib/helpers/cookbooks_helper.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/helpers/global_helpers.rb b/chef-server/lib/helpers/global_helpers.rb index f3b15129a8..f5e3e335de 100644 --- a/chef-server/lib/helpers/global_helpers.rb +++ b/chef-server/lib/helpers/global_helpers.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/helpers/nodes_helper.rb b/chef-server/lib/helpers/nodes_helper.rb index 44a190a7c6..91bd27f4cc 100644 --- a/chef-server/lib/helpers/nodes_helper.rb +++ b/chef-server/lib/helpers/nodes_helper.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/helpers/openid_server_helpers.rb b/chef-server/lib/helpers/openid_server_helpers.rb index dc56d2742f..7eda1917ba 100644 --- a/chef-server/lib/helpers/openid_server_helpers.rb +++ b/chef-server/lib/helpers/openid_server_helpers.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/init.rb b/chef-server/lib/init.rb index 0377d4c5c0..83e983b9ff 100644 --- a/chef-server/lib/init.rb +++ b/chef-server/lib/init.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/public/javascript/chef.js b/chef-server/lib/public/javascript/chef.js index 22d4c90ae5..a4379ae840 100644 --- a/chef-server/lib/public/javascript/chef.js +++ b/chef-server/lib/public/javascript/chef.js @@ -1,6 +1,6 @@ // -// Author:: Adam Jacob (<adam@hjksolutions.com>) -// Copyright:: Copyright (c) 2008 HJK Solutions, LLC +// Author:: Adam Jacob (<adam@opscode.com>) +// Copyright:: Copyright (c) 2008 OpsCode, Inc. // License:: Apache License, Version 2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef-server/lib/views/search/show.html.haml b/chef-server/lib/views/search/show.html.haml index 8620326a51..f423ab6cf5 100644 --- a/chef-server/lib/views/search/show.html.haml +++ b/chef-server/lib/views/search/show.html.haml @@ -7,7 +7,7 @@ .search_result %h3= "#{h result[:index_name]} (#{h result[:id]})" %table - - result.sort { |a,b| a[0] <=> b[0] }.each do |k, v| + - result.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |k, v| %tr.attr_group %td.attr_name= k - %td.attr_value= v.kind_of?(Array) ? v.join(",") : v
\ No newline at end of file + %td.attr_value= v.kind_of?(Array) ? v.join(",") : v diff --git a/chef/NOTICE b/chef/NOTICE index e2385f99a2..9c4af6e82d 100644 --- a/chef/NOTICE +++ b/chef/NOTICE @@ -5,7 +5,7 @@ Developed at HJK Solutions (http://www.hjksolutions.com). Contributors and Copyright holders: - * Copyright 2008, Adam Jacob <adam@hjksolutions.com> + * Copyright 2008, Adam Jacob <adam@opscode.com> * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com> * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
\ No newline at end of file diff --git a/chef/README.txt b/chef/README.txt index 70758161ae..944703988a 100644 --- a/chef/README.txt +++ b/chef/README.txt @@ -60,8 +60,8 @@ Install all of the above. To fire up a develpment environment, do the following Chef - A configuration management system -Author:: Adam Jacob (<adam@hjksolutions.com>) -Copyright:: Copyright (c) 2008 HJK Solutions, LLC +Author:: Adam Jacob (<adam@opscode.com>) +Copyright:: Copyright (c) 2008 OpsCode, Inc. License:: Apache License, Version 2.0 Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/Rakefile b/chef/Rakefile index 6b9f818a75..f0c95a2ea4 100644 --- a/chef/Rakefile +++ b/chef/Rakefile @@ -7,7 +7,7 @@ require './tasks/rspec.rb' GEM = "chef" VERSION = "0.0.1" AUTHOR = "Adam Jacob" -EMAIL = "adam@hjksolutions.com" +EMAIL = "adam@opscode.com" HOMEPAGE = "http://hjksolutions.com" SUMMARY = "A configuration management system." diff --git a/chef/bin/chef-client b/chef/bin/chef-client index 210309de7a..0e67771a0d 100755 --- a/chef/bin/chef-client +++ b/chef/bin/chef-client @@ -2,8 +2,8 @@ # # ./chef-client - Build a meal with chef # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/bin/chef-solo b/chef/bin/chef-solo index 3e08045a30..b5cc181eb9 100755 --- a/chef/bin/chef-solo +++ b/chef/bin/chef-solo @@ -2,8 +2,8 @@ # # ./chef-client - Build a meal with chef # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef.rb b/chef/lib/chef.rb index ac7f43adef..f796fbc048 100644 --- a/chef/lib/chef.rb +++ b/chef/lib/chef.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/client.rb b/chef/lib/chef/client.rb index 4f962ed4c2..f8029b4b16 100644 --- a/chef/lib/chef/client.rb +++ b/chef/lib/chef/client.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/compile.rb b/chef/lib/chef/compile.rb index 06a7e5cdd9..a60a741efd 100644 --- a/chef/lib/chef/compile.rb +++ b/chef/lib/chef/compile.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/config.rb b/chef/lib/chef/config.rb index aca25e524a..23f7d2a22e 100644 --- a/chef/lib/chef/config.rb +++ b/chef/lib/chef/config.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/cookbook.rb b/chef/lib/chef/cookbook.rb index b691a1e213..447d5bd1fa 100644 --- a/chef/lib/chef/cookbook.rb +++ b/chef/lib/chef/cookbook.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/cookbook_loader.rb b/chef/lib/chef/cookbook_loader.rb index 9b7649e75e..7295654f2f 100644 --- a/chef/lib/chef/cookbook_loader.rb +++ b/chef/lib/chef/cookbook_loader.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/couchdb.rb b/chef/lib/chef/couchdb.rb index 8f73839d13..eb78d82183 100644 --- a/chef/lib/chef/couchdb.rb +++ b/chef/lib/chef/couchdb.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/exceptions.rb b/chef/lib/chef/exceptions.rb index fa037a7f6c..dd59debf89 100644 --- a/chef/lib/chef/exceptions.rb +++ b/chef/lib/chef/exceptions.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/file_cache.rb b/chef/lib/chef/file_cache.rb index ea9e17fbb7..e3f5219361 100644 --- a/chef/lib/chef/file_cache.rb +++ b/chef/lib/chef/file_cache.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/file_store.rb b/chef/lib/chef/file_store.rb index 6fe13e5ad6..7e8f89f946 100644 --- a/chef/lib/chef/file_store.rb +++ b/chef/lib/chef/file_store.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/log.rb b/chef/lib/chef/log.rb index 1f8ba2d8bf..65d7ba412b 100644 --- a/chef/lib/chef/log.rb +++ b/chef/lib/chef/log.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/log/formatter.rb b/chef/lib/chef/log/formatter.rb index 9f758178f5..a52d372fce 100644 --- a/chef/lib/chef/log/formatter.rb +++ b/chef/lib/chef/log/formatter.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/check_helper.rb b/chef/lib/chef/mixin/check_helper.rb index 959b57cbb7..6cad1996c7 100644 --- a/chef/lib/chef/mixin/check_helper.rb +++ b/chef/lib/chef/mixin/check_helper.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/checksum.rb b/chef/lib/chef/mixin/checksum.rb index 5a7eed4165..a74b2d6209 100644 --- a/chef/lib/chef/mixin/checksum.rb +++ b/chef/lib/chef/mixin/checksum.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/command.rb b/chef/lib/chef/mixin/command.rb index f42dbd35a5..26be99a3f8 100644 --- a/chef/lib/chef/mixin/command.rb +++ b/chef/lib/chef/mixin/command.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/create_path.rb b/chef/lib/chef/mixin/create_path.rb index dc9200eaf5..18a9141e53 100644 --- a/chef/lib/chef/mixin/create_path.rb +++ b/chef/lib/chef/mixin/create_path.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/from_file.rb b/chef/lib/chef/mixin/from_file.rb index 05f7fe8e8b..27d2915551 100644 --- a/chef/lib/chef/mixin/from_file.rb +++ b/chef/lib/chef/mixin/from_file.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/generate_url.rb b/chef/lib/chef/mixin/generate_url.rb index 3eb8c4f70d..24eb991567 100644 --- a/chef/lib/chef/mixin/generate_url.rb +++ b/chef/lib/chef/mixin/generate_url.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/params_validate.rb b/chef/lib/chef/mixin/params_validate.rb index 4d8ddb74c3..d0a3e23771 100644 --- a/chef/lib/chef/mixin/params_validate.rb +++ b/chef/lib/chef/mixin/params_validate.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/mixin/template.rb b/chef/lib/chef/mixin/template.rb index f3980922a1..c738d135d8 100644 --- a/chef/lib/chef/mixin/template.rb +++ b/chef/lib/chef/mixin/template.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/node.rb b/chef/lib/chef/node.rb index 5b502fe141..3c62f801b5 100644 --- a/chef/lib/chef/node.rb +++ b/chef/lib/chef/node.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/openid_registration.rb b/chef/lib/chef/openid_registration.rb index 748c865097..ca3ce9eefc 100644 --- a/chef/lib/chef/openid_registration.rb +++ b/chef/lib/chef/openid_registration.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/platform.rb b/chef/lib/chef/platform.rb index 708cc7f4cd..339ba57b22 100644 --- a/chef/lib/chef/platform.rb +++ b/chef/lib/chef/platform.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider.rb b/chef/lib/chef/provider.rb index 3251693cb3..82ce2b7fb3 100644 --- a/chef/lib/chef/provider.rb +++ b/chef/lib/chef/provider.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/directory.rb b/chef/lib/chef/provider/directory.rb index 87d25d7790..1395edf494 100644 --- a/chef/lib/chef/provider/directory.rb +++ b/chef/lib/chef/provider/directory.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/execute.rb b/chef/lib/chef/provider/execute.rb index 630de89e3e..24719cec32 100644 --- a/chef/lib/chef/provider/execute.rb +++ b/chef/lib/chef/provider/execute.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/file.rb b/chef/lib/chef/provider/file.rb index bec2a2a307..06ad35bb2d 100644 --- a/chef/lib/chef/provider/file.rb +++ b/chef/lib/chef/provider/file.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/link.rb b/chef/lib/chef/provider/link.rb index 843a4ad009..941202f3ed 100644 --- a/chef/lib/chef/provider/link.rb +++ b/chef/lib/chef/provider/link.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/package.rb b/chef/lib/chef/provider/package.rb index 6bd447c470..85e324c0eb 100644 --- a/chef/lib/chef/provider/package.rb +++ b/chef/lib/chef/provider/package.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/package/apt.rb b/chef/lib/chef/provider/package/apt.rb index a2e9bd68a2..10cac140f3 100644 --- a/chef/lib/chef/provider/package/apt.rb +++ b/chef/lib/chef/provider/package/apt.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/package/portage.rb b/chef/lib/chef/provider/package/portage.rb index 8981a386bc..f12e338407 100644 --- a/chef/lib/chef/provider/package/portage.rb +++ b/chef/lib/chef/provider/package/portage.rb @@ -1,6 +1,6 @@ # # Author:: Ezra Zygmuntowicz (<ezra@engineyard.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/package/rubygems.rb b/chef/lib/chef/provider/package/rubygems.rb index 69459ffef4..ad56d0b8d4 100644 --- a/chef/lib/chef/provider/package/rubygems.rb +++ b/chef/lib/chef/provider/package/rubygems.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/remote_directory.rb b/chef/lib/chef/provider/remote_directory.rb index f83e8e8a16..c49b0b9344 100644 --- a/chef/lib/chef/provider/remote_directory.rb +++ b/chef/lib/chef/provider/remote_directory.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/remote_file.rb b/chef/lib/chef/provider/remote_file.rb index 0e27bc5b7a..bf0c015b2c 100644 --- a/chef/lib/chef/provider/remote_file.rb +++ b/chef/lib/chef/provider/remote_file.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/script.rb b/chef/lib/chef/provider/script.rb index 4669361142..4c18472197 100644 --- a/chef/lib/chef/provider/script.rb +++ b/chef/lib/chef/provider/script.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/service.rb b/chef/lib/chef/provider/service.rb index a1162e4267..b1c1609c6c 100644 --- a/chef/lib/chef/provider/service.rb +++ b/chef/lib/chef/provider/service.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/service/debian.rb b/chef/lib/chef/provider/service/debian.rb index 21f166ba6a..dbb50e8276 100644 --- a/chef/lib/chef/provider/service/debian.rb +++ b/chef/lib/chef/provider/service/debian.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/service/init.rb b/chef/lib/chef/provider/service/init.rb index 399d540d31..c6f36b54a5 100644 --- a/chef/lib/chef/provider/service/init.rb +++ b/chef/lib/chef/provider/service/init.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/template.rb b/chef/lib/chef/provider/template.rb index 7da947a69f..a6937cb969 100644 --- a/chef/lib/chef/provider/template.rb +++ b/chef/lib/chef/provider/template.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,17 +25,49 @@ class Chef class Provider class Template < Chef::Provider::File + include Chef::Mixin::Checksum include Chef::Mixin::Template def action_create r = Chef::REST.new(Chef::Config[:template_url]) + + cache_file_name = "cookbooks/#{@new_resource.cookbook_name}/templates/#{@new_resource.source}" + current_checksum = nil + + if Chef::FileCache.has_key?(cache_file_name) + current_checksum = self.checksum(Chef::FileCache.load(cache_file_name, false)) + else + Chef::Log.debug("Template #{@new_resource} is not in the template cache") + end - template_url = generate_url(@new_resource.source, "templates") - raw_template_file = r.get_rest(template_url, true) + template_url = generate_url( + @new_resource.source, + "templates", + { + :checksum => current_checksum + } + ) + + template_updated = true + begin + raw_template_file = r.get_rest(template_url, true) + rescue Net::HTTPRetriableError => e + if e.response.kind_of?(Net::HTTPNotModified) + template_updated = false + Chef::Log.debug("Cached template for #{@new_resource} is unchanged") + else + raise e + end + end + + if template_updated + Chef::Log.debug("Updating template for #{@new_resource} in the cache") + Chef::FileCache.move_to(raw_template_file.path, cache_file_name) + end context = @new_resource.variables context[:node] = @node - template_file = render_template(::File.read(raw_template_file.path), context) + template_file = render_template(Chef::FileCache.load(cache_file_name), context) update = false @@ -66,7 +98,7 @@ class Chef def action_create_if_missing if ::File.exists?(@new_resource.path) - Chef::Log.debug("File #{@new_resource.path} exists, taking no action.") + Chef::Log.debug("Template #{@new_resource} exists, taking no action.") else action_create end diff --git a/chef/lib/chef/provider/user.rb b/chef/lib/chef/provider/user.rb index af9c69486d..a85f910669 100644 --- a/chef/lib/chef/provider/user.rb +++ b/chef/lib/chef/provider/user.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/provider/user/useradd.rb b/chef/lib/chef/provider/user/useradd.rb index 1eeb4d3284..239dd8c927 100644 --- a/chef/lib/chef/provider/user/useradd.rb +++ b/chef/lib/chef/provider/user/useradd.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/queue.rb b/chef/lib/chef/queue.rb index 86eb7df257..5c82664ae8 100644 --- a/chef/lib/chef/queue.rb +++ b/chef/lib/chef/queue.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/recipe.rb b/chef/lib/chef/recipe.rb index d8baa10120..86a5a4345a 100644 --- a/chef/lib/chef/recipe.rb +++ b/chef/lib/chef/recipe.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource.rb b/chef/lib/chef/resource.rb index 5db1dd557b..cd0aebe873 100644 --- a/chef/lib/chef/resource.rb +++ b/chef/lib/chef/resource.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/apt_package.rb b/chef/lib/chef/resource/apt_package.rb index 58e8b14edc..48238a8f64 100644 --- a/chef/lib/chef/resource/apt_package.rb +++ b/chef/lib/chef/resource/apt_package.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/bash.rb b/chef/lib/chef/resource/bash.rb index 7af5f9756a..4df73e334c 100644 --- a/chef/lib/chef/resource/bash.rb +++ b/chef/lib/chef/resource/bash.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/csh.rb b/chef/lib/chef/resource/csh.rb index 29de9777b9..a52ba93f11 100644 --- a/chef/lib/chef/resource/csh.rb +++ b/chef/lib/chef/resource/csh.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/directory.rb b/chef/lib/chef/resource/directory.rb index 7e8944f5fc..c07fc2a081 100644 --- a/chef/lib/chef/resource/directory.rb +++ b/chef/lib/chef/resource/directory.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/execute.rb b/chef/lib/chef/resource/execute.rb index faa1cda429..053c7f3fbe 100644 --- a/chef/lib/chef/resource/execute.rb +++ b/chef/lib/chef/resource/execute.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/file.rb b/chef/lib/chef/resource/file.rb index 12cff1a7af..857dbe0137 100644 --- a/chef/lib/chef/resource/file.rb +++ b/chef/lib/chef/resource/file.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/gem_package.rb b/chef/lib/chef/resource/gem_package.rb index 1ec9463337..8e903eef47 100644 --- a/chef/lib/chef/resource/gem_package.rb +++ b/chef/lib/chef/resource/gem_package.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/link.rb b/chef/lib/chef/resource/link.rb index 46b5793b0f..61194b5d66 100644 --- a/chef/lib/chef/resource/link.rb +++ b/chef/lib/chef/resource/link.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/package.rb b/chef/lib/chef/resource/package.rb index f5f1c8418e..3d8b47cac4 100644 --- a/chef/lib/chef/resource/package.rb +++ b/chef/lib/chef/resource/package.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/perl.rb b/chef/lib/chef/resource/perl.rb index a9b891ed5c..4bb9ba6bf5 100644 --- a/chef/lib/chef/resource/perl.rb +++ b/chef/lib/chef/resource/perl.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/portage_package.rb b/chef/lib/chef/resource/portage_package.rb index 243799c61d..4a6a7d7df5 100644 --- a/chef/lib/chef/resource/portage_package.rb +++ b/chef/lib/chef/resource/portage_package.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/python.rb b/chef/lib/chef/resource/python.rb index ac2b27c00f..812ef36bfd 100644 --- a/chef/lib/chef/resource/python.rb +++ b/chef/lib/chef/resource/python.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/remote_directory.rb b/chef/lib/chef/resource/remote_directory.rb index a23b39d42c..5973be6217 100644 --- a/chef/lib/chef/resource/remote_directory.rb +++ b/chef/lib/chef/resource/remote_directory.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/remote_file.rb b/chef/lib/chef/resource/remote_file.rb index dace234398..abed583446 100644 --- a/chef/lib/chef/resource/remote_file.rb +++ b/chef/lib/chef/resource/remote_file.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/ruby.rb b/chef/lib/chef/resource/ruby.rb index 591f1a658b..9486808276 100644 --- a/chef/lib/chef/resource/ruby.rb +++ b/chef/lib/chef/resource/ruby.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/script.rb b/chef/lib/chef/resource/script.rb index d59882ab9c..d62402f766 100644 --- a/chef/lib/chef/resource/script.rb +++ b/chef/lib/chef/resource/script.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/service.rb b/chef/lib/chef/resource/service.rb index 1c9a784745..68d5d511b8 100644 --- a/chef/lib/chef/resource/service.rb +++ b/chef/lib/chef/resource/service.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/template.rb b/chef/lib/chef/resource/template.rb index 5f2512a274..84eaca0ea5 100644 --- a/chef/lib/chef/resource/template.rb +++ b/chef/lib/chef/resource/template.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource/user.rb b/chef/lib/chef/resource/user.rb index 1702753408..582272e6bf 100644 --- a/chef/lib/chef/resource/user.rb +++ b/chef/lib/chef/resource/user.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource_collection.rb b/chef/lib/chef/resource_collection.rb index 5278b15c72..9a2dd1021e 100644 --- a/chef/lib/chef/resource_collection.rb +++ b/chef/lib/chef/resource_collection.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/resource_definition.rb b/chef/lib/chef/resource_definition.rb index 9a0a9cb09a..4d15fad167 100644 --- a/chef/lib/chef/resource_definition.rb +++ b/chef/lib/chef/resource_definition.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/rest.rb b/chef/lib/chef/rest.rb index 5b4149509d..2389dfdad5 100644 --- a/chef/lib/chef/rest.rb +++ b/chef/lib/chef/rest.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/runner.rb b/chef/lib/chef/runner.rb index d00c35730d..7ab81ebb3c 100644 --- a/chef/lib/chef/runner.rb +++ b/chef/lib/chef/runner.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/search.rb b/chef/lib/chef/search.rb index 229f738399..d7c45ecae4 100644 --- a/chef/lib/chef/search.rb +++ b/chef/lib/chef/search.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/lib/chef/search_index.rb b/chef/lib/chef/search_index.rb index 932a451999..a93a0f82aa 100644 --- a/chef/lib/chef/search_index.rb +++ b/chef/lib/chef/search_index.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/chef_server/controllers/nodes_spec.rb b/chef/spec/chef_server/controllers/nodes_spec.rb index 65c2df301a..33f27575dc 100644 --- a/chef/spec/chef_server/controllers/nodes_spec.rb +++ b/chef/spec/chef_server/controllers/nodes_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/chef_server/controllers/openid_consumer_spec.rb b/chef/spec/chef_server/controllers/openid_consumer_spec.rb index 0156fd8d49..5e864780a3 100644 --- a/chef/spec/chef_server/controllers/openid_consumer_spec.rb +++ b/chef/spec/chef_server/controllers/openid_consumer_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/chef_server/controllers/openid_register_spec.rb b/chef/spec/chef_server/controllers/openid_register_spec.rb index c883715fc6..396913c8fb 100644 --- a/chef/spec/chef_server/controllers/openid_register_spec.rb +++ b/chef/spec/chef_server/controllers/openid_register_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/lib/chef/provider/easy.rb b/chef/spec/lib/chef/provider/easy.rb index b637efa768..580768f71a 100644 --- a/chef/spec/lib/chef/provider/easy.rb +++ b/chef/spec/lib/chef/provider/easy.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: GNU General Public License version 2 or later # # This program and entire repository is free software; you can diff --git a/chef/spec/lib/chef/provider/snakeoil.rb b/chef/spec/lib/chef/provider/snakeoil.rb index 0486402686..12977664f6 100644 --- a/chef/spec/lib/chef/provider/snakeoil.rb +++ b/chef/spec/lib/chef/provider/snakeoil.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: GNU General Public License version 2 or later # # This program and entire repository is free software; you can diff --git a/chef/spec/lib/chef/resource/cat.rb b/chef/spec/lib/chef/resource/cat.rb index e651c44512..d7bbe7dda8 100644 --- a/chef/spec/lib/chef/resource/cat.rb +++ b/chef/spec/lib/chef/resource/cat.rb @@ -1,5 +1,5 @@ -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: GNU General Public License version 2 or later # # This program and entire repository is free software; you can diff --git a/chef/spec/lib/chef/resource/zen_master.rb b/chef/spec/lib/chef/resource/zen_master.rb index 8b4225fbd4..012453e191 100644 --- a/chef/spec/lib/chef/resource/zen_master.rb +++ b/chef/spec/lib/chef/resource/zen_master.rb @@ -1,5 +1,5 @@ -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: GNU General Public License version 2 or later # # This program and entire repository is free software; you can diff --git a/chef/spec/spec_helper.rb b/chef/spec/spec_helper.rb index 9120b2876c..75d206bea5 100644 --- a/chef/spec/spec_helper.rb +++ b/chef/spec/spec_helper.rb @@ -1,5 +1,5 @@ -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: GNU General Public License version 2 or later # # This program and entire repository is free software; you can diff --git a/chef/spec/unit/chef_spec.rb b/chef/spec/unit/chef_spec.rb index 7d2af6f88d..d2721a7fbd 100644 --- a/chef/spec/unit/chef_spec.rb +++ b/chef/spec/unit/chef_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/client_spec.rb b/chef/spec/unit/client_spec.rb index 8defd2e4a1..f13a273d43 100644 --- a/chef/spec/unit/client_spec.rb +++ b/chef/spec/unit/client_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/compile_spec.rb b/chef/spec/unit/compile_spec.rb index c7f76a4a58..529a2c6727 100644 --- a/chef/spec/unit/compile_spec.rb +++ b/chef/spec/unit/compile_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/config_spec.rb b/chef/spec/unit/config_spec.rb index 51e33401d8..bc886f0f1a 100644 --- a/chef/spec/unit/config_spec.rb +++ b/chef/spec/unit/config_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/cookbook_loader_spec.rb b/chef/spec/unit/cookbook_loader_spec.rb index 501329777b..9c0657c5fe 100644 --- a/chef/spec/unit/cookbook_loader_spec.rb +++ b/chef/spec/unit/cookbook_loader_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/cookbook_spec.rb b/chef/spec/unit/cookbook_spec.rb index 0ae87ed04c..11fa68266e 100644 --- a/chef/spec/unit/cookbook_spec.rb +++ b/chef/spec/unit/cookbook_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/couchdb_spec.rb b/chef/spec/unit/couchdb_spec.rb index 5e7a1202eb..859cccbabe 100644 --- a/chef/spec/unit/couchdb_spec.rb +++ b/chef/spec/unit/couchdb_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/file_cache_spec.rb b/chef/spec/unit/file_cache_spec.rb index c84eea376e..cbed339266 100644 --- a/chef/spec/unit/file_cache_spec.rb +++ b/chef/spec/unit/file_cache_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/file_store_spec.rb b/chef/spec/unit/file_store_spec.rb index 8addeb9e31..25cd8d3935 100644 --- a/chef/spec/unit/file_store_spec.rb +++ b/chef/spec/unit/file_store_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/log/formatter_spec.rb b/chef/spec/unit/log/formatter_spec.rb index e0d8bfd773..0df594f350 100644 --- a/chef/spec/unit/log/formatter_spec.rb +++ b/chef/spec/unit/log/formatter_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/log_spec.rb b/chef/spec/unit/log_spec.rb index 14892b1af4..b42a406855 100644 --- a/chef/spec/unit/log_spec.rb +++ b/chef/spec/unit/log_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/mixin/params_validate_spec.rb b/chef/spec/unit/mixin/params_validate_spec.rb index 937589b059..f81c131766 100644 --- a/chef/spec/unit/mixin/params_validate_spec.rb +++ b/chef/spec/unit/mixin/params_validate_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/mixin/template_spec.rb b/chef/spec/unit/mixin/template_spec.rb index 0ff929e8f6..12cb433605 100644 --- a/chef/spec/unit/mixin/template_spec.rb +++ b/chef/spec/unit/mixin/template_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/node_spec.rb b/chef/spec/unit/node_spec.rb index 971f57716c..7bce15a85f 100644 --- a/chef/spec/unit/node_spec.rb +++ b/chef/spec/unit/node_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/openid_registration_spec.rb b/chef/spec/unit/openid_registration_spec.rb index d849369796..7ca6267865 100644 --- a/chef/spec/unit/openid_registration_spec.rb +++ b/chef/spec/unit/openid_registration_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/platform_spec.rb b/chef/spec/unit/platform_spec.rb index 4eeeebed89..a3e5bf2e24 100644 --- a/chef/spec/unit/platform_spec.rb +++ b/chef/spec/unit/platform_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/directory_spec.rb b/chef/spec/unit/provider/directory_spec.rb index 3e397b506f..6d5ffae660 100644 --- a/chef/spec/unit/provider/directory_spec.rb +++ b/chef/spec/unit/provider/directory_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/file_spec.rb b/chef/spec/unit/provider/file_spec.rb index 6c0a4059f3..616e9d8599 100644 --- a/chef/spec/unit/provider/file_spec.rb +++ b/chef/spec/unit/provider/file_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/link_spec.rb b/chef/spec/unit/provider/link_spec.rb index 462ab9409b..053fa62eb9 100644 --- a/chef/spec/unit/provider/link_spec.rb +++ b/chef/spec/unit/provider/link_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/package/apt_spec.rb b/chef/spec/unit/provider/package/apt_spec.rb index 026d63b05a..618c7b3a4f 100644 --- a/chef/spec/unit/provider/package/apt_spec.rb +++ b/chef/spec/unit/provider/package/apt_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/package_spec.rb b/chef/spec/unit/provider/package_spec.rb index bcfca9dfe8..c2450dce4c 100644 --- a/chef/spec/unit/provider/package_spec.rb +++ b/chef/spec/unit/provider/package_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/remote_file_spec.rb b/chef/spec/unit/provider/remote_file_spec.rb index 51c48d0f9a..ffe08cec08 100644 --- a/chef/spec/unit/provider/remote_file_spec.rb +++ b/chef/spec/unit/provider/remote_file_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/service/init_service_spec.rb b/chef/spec/unit/provider/service/init_service_spec.rb index 948cb7e785..2861e706c0 100644 --- a/chef/spec/unit/provider/service/init_service_spec.rb +++ b/chef/spec/unit/provider/service/init_service_spec.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/service_spec.rb b/chef/spec/unit/provider/service_spec.rb index 5b5c585685..20a0a5de01 100644 --- a/chef/spec/unit/provider/service_spec.rb +++ b/chef/spec/unit/provider/service_spec.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/template_spec.rb b/chef/spec/unit/provider/template_spec.rb index 9135bfb021..18df143c69 100644 --- a/chef/spec/unit/provider/template_spec.rb +++ b/chef/spec/unit/provider/template_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/user/useradd_spec.rb b/chef/spec/unit/provider/user/useradd_spec.rb index 3099a1736d..06b3dc586d 100644 --- a/chef/spec/unit/provider/user/useradd_spec.rb +++ b/chef/spec/unit/provider/user/useradd_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider/user_spec.rb b/chef/spec/unit/provider/user_spec.rb index 9ea40dda4a..087848940c 100644 --- a/chef/spec/unit/provider/user_spec.rb +++ b/chef/spec/unit/provider/user_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/provider_spec.rb b/chef/spec/unit/provider_spec.rb index 0512012598..4e636ac027 100644 --- a/chef/spec/unit/provider_spec.rb +++ b/chef/spec/unit/provider_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/queue_spec.rb b/chef/spec/unit/queue_spec.rb index e902f44631..ba98cd8862 100644 --- a/chef/spec/unit/queue_spec.rb +++ b/chef/spec/unit/queue_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/recipe_spec.rb b/chef/spec/unit/recipe_spec.rb index 011b944934..4f8f88815f 100644 --- a/chef/spec/unit/recipe_spec.rb +++ b/chef/spec/unit/recipe_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/apt_package_spec.rb b/chef/spec/unit/resource/apt_package_spec.rb index fd741a2d08..ae17fcdc80 100644 --- a/chef/spec/unit/resource/apt_package_spec.rb +++ b/chef/spec/unit/resource/apt_package_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/bash_spec.rb b/chef/spec/unit/resource/bash_spec.rb index f86e63d32e..401337bf4e 100644 --- a/chef/spec/unit/resource/bash_spec.rb +++ b/chef/spec/unit/resource/bash_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/csh_spec.rb b/chef/spec/unit/resource/csh_spec.rb index 67ba4499fa..74a6298419 100644 --- a/chef/spec/unit/resource/csh_spec.rb +++ b/chef/spec/unit/resource/csh_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/directory_spec.rb b/chef/spec/unit/resource/directory_spec.rb index 541472faca..a4238a5f88 100644 --- a/chef/spec/unit/resource/directory_spec.rb +++ b/chef/spec/unit/resource/directory_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/execute_spec.rb b/chef/spec/unit/resource/execute_spec.rb index 26c03ba22d..402f9f24e1 100644 --- a/chef/spec/unit/resource/execute_spec.rb +++ b/chef/spec/unit/resource/execute_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/file_spec.rb b/chef/spec/unit/resource/file_spec.rb index a2ad122887..91f7be97e9 100644 --- a/chef/spec/unit/resource/file_spec.rb +++ b/chef/spec/unit/resource/file_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/gem_package_spec.rb b/chef/spec/unit/resource/gem_package_spec.rb index d1329b788e..da8afd2617 100644 --- a/chef/spec/unit/resource/gem_package_spec.rb +++ b/chef/spec/unit/resource/gem_package_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/link_spec.rb b/chef/spec/unit/resource/link_spec.rb index e2605e9bcf..b6037bc40d 100644 --- a/chef/spec/unit/resource/link_spec.rb +++ b/chef/spec/unit/resource/link_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/package_spec.rb b/chef/spec/unit/resource/package_spec.rb index 8756e4f603..c50ff2453b 100644 --- a/chef/spec/unit/resource/package_spec.rb +++ b/chef/spec/unit/resource/package_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/perl_spec.rb b/chef/spec/unit/resource/perl_spec.rb index 528bcef08c..bdce2c35c9 100644 --- a/chef/spec/unit/resource/perl_spec.rb +++ b/chef/spec/unit/resource/perl_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/portage_package_spec.rb b/chef/spec/unit/resource/portage_package_spec.rb index d658c249c4..2f774d191f 100644 --- a/chef/spec/unit/resource/portage_package_spec.rb +++ b/chef/spec/unit/resource/portage_package_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/python_spec.rb b/chef/spec/unit/resource/python_spec.rb index 11c5b84d04..bbc8c4733b 100644 --- a/chef/spec/unit/resource/python_spec.rb +++ b/chef/spec/unit/resource/python_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/remote_directory_spec.rb b/chef/spec/unit/resource/remote_directory_spec.rb index 2d9ce122af..8853e44a47 100644 --- a/chef/spec/unit/resource/remote_directory_spec.rb +++ b/chef/spec/unit/resource/remote_directory_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/remote_file_spec.rb b/chef/spec/unit/resource/remote_file_spec.rb index 4c052e0260..c820eac0b7 100644 --- a/chef/spec/unit/resource/remote_file_spec.rb +++ b/chef/spec/unit/resource/remote_file_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/ruby_spec.rb b/chef/spec/unit/resource/ruby_spec.rb index 5351462154..20e6a4e3e1 100644 --- a/chef/spec/unit/resource/ruby_spec.rb +++ b/chef/spec/unit/resource/ruby_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/script_spec.rb b/chef/spec/unit/resource/script_spec.rb index f003028fd6..08dd7e9fd7 100644 --- a/chef/spec/unit/resource/script_spec.rb +++ b/chef/spec/unit/resource/script_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/service_spec.rb b/chef/spec/unit/resource/service_spec.rb index fa1e8c8943..c3b6a6b816 100644 --- a/chef/spec/unit/resource/service_spec.rb +++ b/chef/spec/unit/resource/service_spec.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/template_spec.rb b/chef/spec/unit/resource/template_spec.rb index 106fe77bda..c05ab53bc4 100644 --- a/chef/spec/unit/resource/template_spec.rb +++ b/chef/spec/unit/resource/template_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource/user_spec.rb b/chef/spec/unit/resource/user_spec.rb index 5cee382590..017aa0d25e 100644 --- a/chef/spec/unit/resource/user_spec.rb +++ b/chef/spec/unit/resource/user_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource_collection_spec.rb b/chef/spec/unit/resource_collection_spec.rb index 1b66e4793e..4665eced4d 100644 --- a/chef/spec/unit/resource_collection_spec.rb +++ b/chef/spec/unit/resource_collection_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource_definition_spec.rb b/chef/spec/unit/resource_definition_spec.rb index 7ea9020af4..3163fd345e 100644 --- a/chef/spec/unit/resource_definition_spec.rb +++ b/chef/spec/unit/resource_definition_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/resource_spec.rb b/chef/spec/unit/resource_spec.rb index 77071e4d0d..4be3287a74 100644 --- a/chef/spec/unit/resource_spec.rb +++ b/chef/spec/unit/resource_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/rest_spec.rb b/chef/spec/unit/rest_spec.rb index a4171cd666..852d4f5aa6 100644 --- a/chef/spec/unit/rest_spec.rb +++ b/chef/spec/unit/rest_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/runner_spec.rb b/chef/spec/unit/runner_spec.rb index f73d5efb22..e2ffc67292 100644 --- a/chef/spec/unit/runner_spec.rb +++ b/chef/spec/unit/runner_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/search_index_spec.rb b/chef/spec/unit/search_index_spec.rb index ff234c6a41..4285ab1585 100644 --- a/chef/spec/unit/search_index_spec.rb +++ b/chef/spec/unit/search_index_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/spec/unit/search_spec.rb b/chef/spec/unit/search_spec.rb index 94e3560a23..b3113f0294 100644 --- a/chef/spec/unit/search_spec.rb +++ b/chef/spec/unit/search_spec.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/stories/chef-client.rb b/chef/stories/chef-client.rb index 3e07b8a847..53f95fe6a5 100644 --- a/chef/stories/chef-client.rb +++ b/chef/stories/chef-client.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/chef/stories/story_helper.rb b/chef/stories/story_helper.rb index cb0d1eb375..b4b0695a90 100644 --- a/chef/stories/story_helper.rb +++ b/chef/stories/story_helper.rb @@ -1,6 +1,6 @@ # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/example-repository/Rakefile b/example-repository/Rakefile index 957e7f6bfa..ee17d2af68 100644 --- a/example-repository/Rakefile +++ b/example-repository/Rakefile @@ -1,8 +1,8 @@ # # Rakefile for Chef Server Repository # -# Author:: Adam Jacob (<adam@hjksolutions.com>) -# Copyright:: Copyright (c) 2008 HJK Solutions, LLC +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008 OpsCode, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/example-repository/cookbooks/fakefile/recipes/default.rb b/example-repository/cookbooks/fakefile/recipes/default.rb index 03813699e7..534114c6ea 100644 --- a/example-repository/cookbooks/fakefile/recipes/default.rb +++ b/example-repository/cookbooks/fakefile/recipes/default.rb @@ -71,27 +71,27 @@ end #end file "/tmp/glen" do - owner "aj-test" +# owner "aj-test" mode 0644 action :create end file "/tmp/foo" do - owner "adam-test" +# owner "adam-test" mode 0644 action :create notifies :delete, resources(:file => "/tmp/glen"), :delayed end remote_file "/tmp/the_park.txt" do - owner "adam-test" +# owner "adam-test" mode 0644 source "the_park.txt" action :create end remote_directory "/tmp/remote_test" do - owner "adam-test" +# owner "adam-test" mode 0755 source "remote_test" files_owner "root" @@ -101,7 +101,7 @@ remote_directory "/tmp/remote_test" do end template "/tmp/foo-template" do - owner "adam-test" +# owner "adam-test" mode 0644 source "monkey.erb" variables({ @@ -120,14 +120,14 @@ link "/tmp/foo" do end directory "/tmp/lots_of_files/" do - owner "adam-test" +# owner "adam-test" mode 0755 action :create end 1000.times do |n| file "/tmp/lots_of_files/somefile#{n}" do - owner "adam-test" +# owner "adam-test" mode 0644 action :create end |