Update cookbooks

* Replace old nginx cookbook with new chef_nginx cookbooks
* Update application cookbook

cookbooks/application/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Application Changelog
 
+## v5.2.0
+
+* Add `application_directory` resource.
+* Chef 13 compatibility.
+
 ## v5.1.0
 
-* Add `application_cookbook_file`, `application_file`, and `application_template resources.
+* Add `application_cookbook_file`, `application_file`, and `application_template` resources.
 
 ## v5.0.0
 

cookbooks/application/README.md

@@ -137,9 +137,9 @@ end
 * `action_on_update_immediately` – Run the `action_on_update` notification with
   `:immediately`. *(default: false)*
 
-### `application_cookbook_file`, `application_file`, `application_template`
+### `application_cookbook_file`, `application_directory`, `application_file`, `application_template`
 
-The `application_cookbook_file`, `application_file`, and `application_template`
+The `application_cookbook_file`, `application_directory`, `application_file`, and `application_template`
 resources extend the core Chef resources to take some application-level
 configuration in to account:
 
@@ -148,6 +148,7 @@ application '/opt/myapp' do
   template 'myapp.conf' do
     source 'myapp.conf.erb'
   end
+  directory 'logs'
 end
 ```
 
@@ -163,9 +164,9 @@ Some test recipes are available as examples for common application frameworks:
 
 * [Sinatra](https://github.com/poise/application_ruby/blob/master/test/cookbooks/application_ruby_test/recipes/sinatra.rb)
 * [Rails](https://github.com/poise/application_ruby/blob/master/test/cookbooks/application_ruby_test/recipes/rails.rb)
-* [Flask](https://github.com/poise/application_python/blob/master/test/cookbooks/application_python_test/recipes/flask.rb)
-* [Django](https://github.com/poise/application_python/blob/master/test/cookbooks/application_python_test/recipes/django.rb)
-* [Express](https://github.com/poise/application_javascript/blob/master/test/cookbooks/application_javascript_test/recipes/express.rb)
+* [Flask](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/flask.rb)
+* [Django](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/django.rb)
+* [Express](https://github.com/poise/application_javascript/blob/master/test/cookbook/recipes/express.rb)
 
 ## Upgrading From 4.x
 
@@ -244,7 +245,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2015, Noah Kantrowitz
+Copyright 2015-2016, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/app_file_mixin.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,10 +48,13 @@ module PoiseApplication
       #   @return [String, Integer]
       attribute(:group, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.group })
 
-      # @!attribute user
+      # @!attribute owner
       #   Override the default user to be the app owner if unspecified.
       #   @return [String, Integer]
-      attribute(:user, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.owner })
+      attribute(:owner, kind_of: [String, Integer, NilClass], default: lazy { parent && parent.owner })
+
+      # For the forgetful.
+      alias_method :user, :owner
     end
 
     module Provider

cookbooks/application/files/halite_gem/poise_application/app_mixin.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/error.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/resources.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 require 'poise_application/resources/application'
 require 'poise_application/resources/application_cookbook_file'
+require 'poise_application/resources/application_directory'
 require 'poise_application/resources/application_file'
 require 'poise_application/resources/application_template'
 

cookbooks/application/files/halite_gem/poise_application/resources/application.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/resources/application_cookbook_file.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/resources/application_directory.rb

@@ -0,0 +1,50 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# 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 'poise_application/app_file_mixin'
+
+
+module PoiseApplication
+  module Resources
+    # (see ApplicationDirectory::Resource)
+    # @since 5.1.0
+    module ApplicationDirectory
+      # An `application_directory` resource to manage Chef files inside and
+      # Application cookbook deployment.
+      #
+      # @provides application_directory
+      # @action create
+      # @action delete
+      # @example
+      #   application '/srv/myapp' do
+      #     directory 'logs'
+      #   end
+      class Resource < Chef::Resource::Directory
+        include PoiseApplication::AppFileMixin
+        provides(:application_directory)
+        actions(:create, :delete)
+        subclass_providers!
+
+        def initialize(*args)
+          super
+          # For older Chef.
+          @resource_name = :application_directory
+        end
+      end
+
+    end
+  end
+end

cookbooks/application/files/halite_gem/poise_application/resources/application_file.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/resources/application_template.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/service_mixin.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/utils.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/application/files/halite_gem/poise_application/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 
 module PoiseApplication
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

cookbooks/application/libraries/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.