chef 10.28.2-x86-mingw32

data/lib/chef/solr_query/query_transform.rb

@@ -0,0 +1,65 @@
+#
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'treetop'
+require 'chef/solr_query/lucene_nodes'
+
+class Chef
+  class Exceptions
+    class QueryParseError < StandardError
+    end
+  end
+end
+
+class Chef
+  class SolrQuery
+    class QueryTransform
+      @@base_path = File.expand_path(File.dirname(__FILE__))
+      Treetop.load(File.join(@@base_path, 'lucene.treetop'))
+      @@parser = LuceneParser.new
+
+      def self.parse(data)
+        tree = @@parser.parse(data)
+        msg = "Parse error at offset: #{@@parser.index}\n"
+        msg += "Reason: #{@@parser.failure_reason}"
+        raise Chef::Exceptions::QueryParseError, msg if tree.nil?
+        self.clean_tree(tree)
+        tree.to_array
+      end
+
+      def self.transform(data)
+        return "*:*" if data == "*:*"
+        tree = @@parser.parse(data)
+        msg = "Parse error at offset: #{@@parser.index}\n"
+        msg += "Reason: #{@@parser.failure_reason}"
+        raise Chef::Exceptions::QueryParseError, msg if tree.nil?
+        self.clean_tree(tree)
+        tree.transform
+      end
+
+      private
+
+      def self.clean_tree(root_node)
+        return if root_node.elements.nil?
+        root_node.elements.delete_if do |node|
+          node.class.name == "Treetop::Runtime::SyntaxNode"
+        end
+        root_node.elements.each { |node| self.clean_tree(node) }
+      end
+    end
+  end
+end

data/lib/chef/solr_query/solr_http_request.rb

@@ -0,0 +1,132 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'net/http'
+require 'uri'
+require 'chef/json_compat'
+require 'chef/config'
+
+class Chef
+  class SolrQuery
+    class SolrHTTPRequest
+      CLASS_FOR_METHOD = {:GET => Net::HTTP::Get, :POST => Net::HTTP::Post}
+
+      TEXT_XML = {"Content-Type" => "text/xml"}
+
+      def self.solr_url=(solr_url)
+        @solr_url = solr_url
+        @http_client = nil
+        @url_prefix = nil
+      end
+
+      def self.solr_url
+        @solr_url || Chef::Config[:solr_url]
+      end
+
+      def self.http_client
+        @http_client ||= begin
+          uri = URI.parse(solr_url)
+          http_client = Net::HTTP.new(uri.host, uri.port)
+          http_client.use_ssl = true if uri.port == 443
+          http_client
+        end
+      end
+
+      def self.url_prefix
+        @url_prefix ||= begin
+          uri = URI.parse(solr_url)
+          if uri.path == ""
+            "/solr"
+          else
+            uri.path.gsub(%r{/$}, '')
+          end
+        end
+      end
+
+      def self.select(params={})
+        url = "#{url_prefix}/select?#{url_join(params)}"
+        Chef::Log.debug("Sending #{url} to Solr")
+        request = new(:GET, url)
+        json_response = request.run("Search Query to Solr '#{solr_url}#{url}'")
+        Chef::JSONCompat.from_json(json_response)
+      end
+
+      def self.update(doc)
+        url = "#{url_prefix}/update"
+        Chef::Log.debug("POSTing document to SOLR:\n#{doc}")
+        request = new(:POST, url, TEXT_XML) { |req| req.body = doc.to_s }
+        request.run("POST to Solr '#{solr_url}#{url}', data: #{doc}")
+      end
+
+      def self.url_join(params_hash={})
+        params = params_hash.inject("") do |param_str, params|
+          param_str << "#{params[0]}=#{escape(params[1])}&"
+        end
+        params.chop! # trailing &
+        params
+      end
+
+      def self.escape(s)
+        s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
+          '%'+$1.unpack('H2'*$1.size).join('%').upcase
+        }.tr(' ', '+')
+      end
+
+      def initialize(method, url, headers=nil)
+        args = headers ? [url, headers] : url
+        @request = CLASS_FOR_METHOD[method].new(*args)
+        yield @request if block_given?
+      end
+
+      def http_client
+        self.class.http_client
+      end
+
+      def solr_url
+        self.class.solr_url
+      end
+
+      def run(description="HTTP Request to Solr")
+        response = http_client.request(@request)
+        request_failed!(response, description) unless response.kind_of?(Net::HTTPSuccess)
+        response.body
+      rescue NoMethodError => e
+        # http://redmine.ruby-lang.org/issues/show/2708
+        # http://redmine.ruby-lang.org/issues/show/2758
+        if e.to_s =~ /#{Regexp.escape(%q|undefined method 'closed?' for nil:NilClass|)}/
+          Chef::Log.fatal("#{description} failed.  Chef::Exceptions::SolrConnectionError exception: Errno::ECONNREFUSED (net/http undefined method closed?) attempting to contact #{solr_url}")
+          Chef::Log.debug("Rescued error in http connect, treating it as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.debug(e.backtrace.join("\n"))
+          raise Chef::Exceptions::SolrConnectionError, "Errno::ECONNREFUSED: Connection refused attempting to contact #{solr_url}"
+        else
+          raise
+        end
+      end
+
+      def request_failed!(response, description='HTTP call')
+        Chef::Log.fatal("#{description} failed (#{response.class} #{response.code} #{response.message})")
+        response.error!
+      rescue Timeout::Error, Errno::EINVAL, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+        Chef::Log.debug(e.backtrace.join("\n"))
+        raise Chef::Exceptions::SolrConnectionError, "#{e.class.name}: #{e.to_s}"
+      end
+
+    end
+  end
+end

data/lib/chef/streaming_cookbook_uploader.rb

@@ -0,0 +1,201 @@
+# inspired by/cargo-culted from http://stanislavvitvitskiy.blogspot.com/2008/12/multipart-post-in-ruby.html
+# On Apr 6, 2010, at 3:00 PM, Stanislav Vitvitskiy wrote:
+#
+# It's free to use / modify / distribute. No need to mention anything. Just copy/paste and use.
+#
+# Regards,
+# Stan
+
+require 'net/http'
+require 'mixlib/authentication/signedheaderauth'
+require 'openssl'
+require 'chef/version'
+
+class Chef
+  class StreamingCookbookUploader
+
+    DefaultHeaders = { 'accept' => 'application/json', 'x-chef-version' => ::Chef::VERSION }
+    
+    class << self
+
+      def post(to_url, user_id, secret_key_filename, params = {}, headers = {})
+        make_request(:post, to_url, user_id, secret_key_filename, params, headers)
+      end
+      
+      def put(to_url, user_id, secret_key_filename, params = {}, headers = {})
+        make_request(:put, to_url, user_id, secret_key_filename, params, headers)
+      end
+      
+      def make_request(http_verb, to_url, user_id, secret_key_filename, params = {}, headers = {})
+        boundary = '----RubyMultipartClient' + rand(1000000).to_s + 'ZZZZZ'
+        parts = []
+        content_file = nil
+        
+        timestamp = Time.now.utc.iso8601
+        secret_key = OpenSSL::PKey::RSA.new(File.read(secret_key_filename))
+
+        unless params.nil? || params.empty?
+          params.each do |key, value|
+            if value.kind_of?(File)
+              content_file = value
+              filepath = value.path
+              filename = File.basename(filepath)
+              parts << StringPart.new( "--" + boundary + "\r\n" +
+                                       "Content-Disposition: form-data; name=\"" + key.to_s + "\"; filename=\"" + filename + "\"\r\n" +
+                                       "Content-Type: application/octet-stream\r\n\r\n")
+              parts << StreamPart.new(value, File.size(filepath))
+              parts << StringPart.new("\r\n")
+            else
+              parts << StringPart.new( "--" + boundary + "\r\n" +
+                                       "Content-Disposition: form-data; name=\"" + key.to_s + "\"\r\n\r\n")
+              parts << StringPart.new(value.to_s + "\r\n")
+            end
+          end
+          parts << StringPart.new("--" + boundary + "--\r\n")
+        end
+        
+        body_stream = MultipartStream.new(parts)
+        
+        timestamp = Time.now.utc.iso8601
+        
+        url = URI.parse(to_url)
+        
+        Chef::Log.logger.debug("Signing: method: #{http_verb}, path: #{url.path}, file: #{content_file}, User-id: #{user_id}, Timestamp: #{timestamp}")
+        
+        # We use the body for signing the request if the file parameter
+        # wasn't a valid file or wasn't included. Extract the body (with 
+        # multi-part delimiters intact) to sign the request.
+        # TODO: tim: 2009-12-28: It'd be nice to remove this special case, and
+        # always hash the entire request body. In the file case it would just be
+        # expanded multipart text - the entire body of the POST.
+        content_body = parts.inject("") { |result,part| result + part.read(0, part.size) }
+        content_file.rewind if content_file # we consumed the file for the above operation, so rewind it.
+        
+        signing_options = {
+          :http_method=>http_verb,
+          :path=>url.path,
+          :user_id=>user_id,
+          :timestamp=>timestamp}
+        (content_file && signing_options[:file] = content_file) || (signing_options[:body] = (content_body || ""))
+        
+        headers.merge!(Mixlib::Authentication::SignedHeaderAuth.signing_object(signing_options).sign(secret_key))
+
+        content_file.rewind if content_file
+
+        # net/http doesn't like symbols for header keys, so we'll to_s each one just in case
+        headers = DefaultHeaders.merge(Hash[*headers.map{ |k,v| [k.to_s, v] }.flatten])
+
+        req = case http_verb
+              when :put
+                Net::HTTP::Put.new(url.path, headers)
+              when :post
+                Net::HTTP::Post.new(url.path, headers)
+              end              
+        req.content_length = body_stream.size
+        req.content_type = 'multipart/form-data; boundary=' + boundary unless parts.empty?
+        req.body_stream = body_stream
+        
+        http = Net::HTTP.new(url.host, url.port)
+        if url.scheme == "https"
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        res = http.request(req)
+        #res = http.start {|http_proc| http_proc.request(req) }
+
+        # alias status to code and to_s to body for test purposes
+        # TODO: stop the following madness!
+        class << res
+          alias :to_s :body
+          
+          # BUGBUG this makes the response compatible with what respsonse_steps expects to test headers (response.headers[] -> response[])
+          def headers
+            self
+          end
+          
+          def status
+            code.to_i
+          end
+        end
+        res
+      end
+      
+    end
+
+    class StreamPart
+      def initialize(stream, size)
+        @stream, @size = stream, size
+      end
+      
+      def size
+        @size
+      end
+      
+      # read the specified amount from the stream
+      def read(offset, how_much)
+        @stream.read(how_much)
+      end
+    end
+
+    class StringPart
+      def initialize(str)
+        @str = str
+      end
+      
+      def size
+        @str.length
+      end
+
+      # read the specified amount from the string startiung at the offset
+      def read(offset, how_much)
+        @str[offset, how_much]
+      end
+    end
+
+    class MultipartStream
+      def initialize(parts)
+        @parts = parts
+        @part_no = 0
+        @part_offset = 0
+      end
+      
+      def size
+        @parts.inject(0) {|size, part| size + part.size}
+      end
+      
+      def read(how_much)
+        return nil if @part_no >= @parts.size
+
+        how_much_current_part = @parts[@part_no].size - @part_offset
+        
+        how_much_current_part = if how_much_current_part > how_much
+                                  how_much
+                                else
+                                  how_much_current_part
+                                end
+        
+        how_much_next_part = how_much - how_much_current_part
+
+        current_part = @parts[@part_no].read(@part_offset, how_much_current_part)
+        
+        # recurse into the next part if the current one was not large enough
+        if how_much_next_part > 0
+          @part_no += 1
+          @part_offset = 0
+          next_part = read(how_much_next_part)
+          current_part + if next_part
+                           next_part
+                         else
+                           ''
+                         end
+        else
+          @part_offset += how_much_current_part
+          current_part
+        end
+      end
+    end
+    
+  end
+
+
+end

data/lib/chef/tasks/chef_repo.rake

@@ -0,0 +1,334 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'rubygems'
+require 'chef/json_compat'
+require 'chef'
+require 'chef/role'
+require 'chef/cookbook/metadata'
+require 'tempfile'
+require 'rake'
+
+# Allow REMOTE options to be overridden on the command line
+REMOTE_HOST = ENV["REMOTE_HOST"] if ENV["REMOTE_HOST"] != nil
+REMOTE_SUDO = ENV["REMOTE_SUDO"] if ENV["REMOTE_SUDO"] != nil
+if defined? REMOTE_HOST
+  REMOTE_PATH_PREFIX = "#{REMOTE_HOST}:"
+  REMOTE_EXEC_PREFIX = "ssh #{REMOTE_HOST}"
+  REMOTE_EXEC_PREFIX += " sudo" if defined? REMOTE_SUDO
+  LOCAL_EXEC_PREFIX = ""
+else
+  REMOTE_PATH_PREFIX = ""
+  REMOTE_EXEC_PREFIX = ""
+  LOCAL_EXEC_PREFIX = "sudo"
+end
+
+desc "Update your repository from source control"
+task :update do
+  puts "** Updating your repository"
+
+  case $vcs
+  when :svn
+    sh %{svn up}
+  when :git
+    pull = false
+    IO.foreach(File.join(TOPDIR, ".git", "config")) do |line|
+      pull = true if line =~ /\[remote "origin"\]/
+    end
+    if pull
+      sh %{git pull} 
+    else
+      puts "* Skipping git pull, no origin specified"
+    end
+  else
+    puts "* No SCM configured, skipping update"
+  end
+end
+
+desc "Install the latest copy of the repository on this Chef Server"
+task :install => [ :update, :roles, :upload_cookbooks ] do
+  if File.exists?(File.join(TOPDIR, "config", "server.rb"))
+    puts "* Installing new Chef Server Config"
+    sh "#{LOCAL_EXEC_PREFIX} rsync -rlt --delete --exclude '.svn' --exclude '.git*' config/server.rb #{REMOTE_PATH_PREFIX}#{CHEF_SERVER_CONFIG}"
+  end
+  if File.exists?(File.join(TOPDIR, "config", "client.rb"))
+    puts "* Installing new Chef Client Config"
+    sh "#{LOCAL_EXEC_PREFIX} rsync -rlt --delete --exclude '.svn' --exclude '.git*' config/client.rb #{REMOTE_PATH_PREFIX}#{CHEF_CLIENT_CONFIG}"
+  end
+end
+
+desc "By default, run rake test_cookbooks"
+task :default => [ :test_cookbooks ]
+
+desc "Create a new cookbook (with COOKBOOK=name, optional CB_PREFIX=site-)"
+task :new_cookbook do
+  puts "***WARN: rake new_cookbook is deprecated. Please use 'knife cookbook create COOKBOOK' command.***"
+  create_cookbook(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))
+  create_readme(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))
+  create_metadata(File.join(TOPDIR, "#{ENV["CB_PREFIX"]}cookbooks"))
+end
+
+def create_cookbook(dir)
+  raise "Must provide a COOKBOOK=" unless ENV["COOKBOOK"]
+  puts "** Creating cookbook #{ENV["COOKBOOK"]}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "attributes")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "files", "default")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "templates", "default")}" 
+  unless File.exists?(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb"))
+    open(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb"), "w") do |file|
+      file.puts <<-EOH
+#
+# Cookbook Name:: #{ENV["COOKBOOK"]}
+# Recipe:: default
+#
+# Copyright #{Time.now.year}, #{COMPANY_NAME}
+#
+EOH
+      case NEW_COOKBOOK_LICENSE
+      when :apachev2
+        file.puts <<-EOH
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+EOH
+      when :none
+        file.puts <<-EOH
+# All rights reserved - Do Not Redistribute
+#
+EOH
+      end
+    end
+  end
+end
+
+def create_readme(dir)
+  raise "Must provide a COOKBOOK=" unless ENV["COOKBOOK"]
+  puts "** Creating README for cookbook: #{ENV["COOKBOOK"]}"
+  unless File.exists?(File.join(dir, ENV["COOKBOOK"], "README.rdoc"))
+    open(File.join(dir, ENV["COOKBOOK"], "README.md"), "w") do |file|
+      file.puts <<-EOH
+Description
+===========
+
+Requirements
+============
+
+Attributes
+==========
+
+Usage
+=====
+
+EOH
+    end
+  end
+end
+
+def create_metadata(dir)
+  raise "Must provide a COOKBOOK=" unless ENV["COOKBOOK"]
+  puts "** Creating metadata for cookbook: #{ENV["COOKBOOK"]}"
+  
+  case NEW_COOKBOOK_LICENSE
+  when :apachev2
+    license = "Apache 2.0"
+  when :none
+    license = "All rights reserved"
+  end
+
+  unless File.exists?(File.join(dir, ENV["COOKBOOK"], "metadata.rb"))
+    open(File.join(dir, ENV["COOKBOOK"], "metadata.rb"), "w") do |file|
+      if File.exists?(File.join(dir, ENV["COOKBOOK"], 'README.rdoc'))
+        long_description = "long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))"
+      end
+      file.puts <<-EOH
+maintainer       "#{COMPANY_NAME}"
+maintainer_email "#{SSL_EMAIL_ADDRESS}"
+license          "#{license}"
+description      "Installs/Configures #{ENV["COOKBOOK"]}"
+#{long_description}
+version          "0.1"
+EOH
+    end
+  end
+end
+
+desc "Create a new self-signed SSL certificate for FQDN=foo.example.com"
+task :ssl_cert do
+  $expect_verbose = true
+  fqdn = ENV["FQDN"]
+  fqdn =~ /^(.+?)\.(.+)$/
+  hostname = $1
+  domain = $2
+  keyfile = fqdn.gsub("*", "wildcard")
+  raise "Must provide FQDN!" unless fqdn && hostname && domain
+  puts "** Creating self signed SSL Certificate for #{fqdn}"
+  sh("(cd #{CADIR} && openssl genrsa 2048 > #{keyfile}.key)")
+  sh("(cd #{CADIR} && chmod 644 #{keyfile}.key)")
+  puts "* Generating Self Signed Certificate Request"
+  tf = Tempfile.new("#{keyfile}.ssl-conf")
+  ssl_config = <<EOH
+[ req ]
+distinguished_name = req_distinguished_name
+prompt = no
+
+[ req_distinguished_name ]
+C                      = #{SSL_COUNTRY_NAME}
+ST                     = #{SSL_STATE_NAME}
+L                      = #{SSL_LOCALITY_NAME}
+O                      = #{COMPANY_NAME}
+OU                     = #{SSL_ORGANIZATIONAL_UNIT_NAME}
+CN                     = #{fqdn}
+emailAddress           = #{SSL_EMAIL_ADDRESS}
+EOH
+  tf.puts(ssl_config)
+  tf.close
+  sh("(cd #{CADIR} && openssl req -config '#{tf.path}' -new -x509 -nodes -sha1 -days 3650 -key #{keyfile}.key > #{keyfile}.crt)")
+  sh("(cd #{CADIR} && openssl x509 -noout -fingerprint -text < #{keyfile}.crt > #{keyfile}.info)")
+  sh("(cd #{CADIR} && cat #{keyfile}.crt #{keyfile}.key > #{keyfile}.pem)")
+  sh("(cd #{CADIR} && chmod 644 #{keyfile}.pem)")
+end
+
+rule(%r{\b(?:site-)?cookbooks/[^/]+/metadata\.json\Z} => [ proc { |task_name| task_name.sub(/\.[^.]+$/, '.rb') } ]) do |t|
+  system("knife cookbook metadata from file #{t.source}")
+end
+
+desc "Build cookbook metadata.json from metadata.rb"
+task :metadata => FileList[File.join(TOPDIR, '*cookbooks', ENV['COOKBOOK'] || '*', 'metadata.rb')].pathmap('%X.json')
+
+rule(%r{\broles/\S+\.json\Z} => [ proc { |task_name| task_name.sub(/\.[^.]+$/, '.rb') } ]) do |t|
+  system("knife role from file #{t.source}")
+end
+
+desc "Update roles"
+task :roles  => FileList[File.join(TOPDIR, 'roles', '**', '*.rb')].pathmap('%X.json')
+
+desc "Update a specific role"
+task :role, :role_name do |t, args|
+  system("knife role from file #{File.join(TOPDIR, 'roles', args.role_name)}.rb")
+end
+
+desc "Upload all cookbooks"
+task :upload_cookbooks => [ :metadata ]
+task :upload_cookbooks do
+  system("knife cookbook upload --all")
+end
+
+desc "Upload a single cookbook"
+task :upload_cookbook => [ :metadata ]
+task :upload_cookbook, :cookbook do |t, args|
+  system("knife cookbook upload #{args.cookbook}")
+end
+
+desc "Test all cookbooks"
+task :test_cookbooks do
+  system("knife cookbook test --all")
+end
+
+desc "Test a single cookbook"
+task :test_cookbook, :cookbook do |t, args|
+  system("knife cookbook test #{args.cookbook}")
+end
+
+namespace :databag do
+  path = "data_bags"
+
+  desc "Upload a single databag"
+  task :upload, :databag do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+    databag = File.join(path, input_databag)
+
+    if File.exists?(databag) && File.directory?(databag)
+      system "knife data bag create #{input_databag}"
+      Dir.foreach(databag) do |item|
+        name, type = item.split('.')
+        if type == 'json' && name.length > 0
+          system "knife data bag from file #{input_databag} " + File.join(databag, item)
+        end
+      end
+    else
+      puts "ERROR: Could not find the databag in your databag path (" + File.join(path, input_databag) + "), skipping it"
+    end
+  end
+
+  desc "Upload all databags"
+  task :upload_all do
+    if File.exists?(path) && File.directory?(path)
+      Dir.foreach(path) do |databag|
+        if databag == databag[/^[\-[:alnum:]_]+$/]
+          Rake::Task['databag:upload'].execute( { :databag => databag } )
+        end
+      end
+    else
+      puts "ERROR: Could not find any databags, skipping it"  
+    end
+  end
+
+  desc "Create a databag"
+  task :create, :databag do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+
+    FileUtils.mkdir(path) unless File.exists?(path)
+    databag = File.join(path, input_databag)
+    FileUtils.mkdir(databag) unless File.exists?(databag)
+  end
+
+  desc "Create a databag item stub"
+  task :create_item, :databag, :item do |t, args|
+    input_databag = args[:databag] || 'none_specified'
+    input_item = args[:item] || false
+
+    databag = File.join(path, input_databag)
+    if File.exists?(databag) && File.directory?(databag)
+      if input_item
+        json_filename = File.join(databag, "#{input_item}.json")
+        if !File.exists?(json_filename)
+          stub = <<EOH
+{
+  "id" : "#{input_item}"
+}
+EOH
+          json_file = File.new(json_filename, "w")
+          json_file.write(stub)
+          json_file.close
+        else
+          puts "ERROR: databag item already exists (#{json_filename}), skipping it"
+        end
+      else
+        puts "ERROR: No item id specified, skipping it"
+      end
+    else
+      puts "ERROR: Could not find your databag (#{databag}), skipping it"
+    end   
+  end
+
+end
+