Update formatting of header comments

[chef.git] / cookbooks / mediawiki / resources / extension.rb

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 152e843d381ca1ac513ccd084f0f3fb3dabddfc9..48ba062ec69d44c5e9c98ae9501af552378f7e46 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki

 # Resource:: mediawiki_extension
 #
 # Resource:: mediawiki_extension
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -29,7 +29,6 @@ property :version, :kind_of => String
 property :repository, :kind_of => String
 property :tag, :kind_of => String
 property :reference, :kind_of => String
 property :repository, :kind_of => String
 property :tag, :kind_of => String
 property :reference, :kind_of => String

-property :compose, :kind_of => [TrueClass, FalseClass], :default => false

 property :update_site, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
 property :update_site, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do


@@ -75,26 +74,22 @@ action :create do
       variables new_resource.variables
     end
   else
       variables new_resource.variables
     end
   else

-    extension_script = "#{extension_directory}/#{new_resource.extension}.php"
-

     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
       content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0o664
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
       content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0o664

-      only_if { ::File.exist?(extension_script) }

     end
   end
 
     end
   end
 

-  if new_resource.compose # ~FC023
-    execute "composer-#{new_resource.extension}" do
-      action :nothing
-      command "composer install --no-dev"
-      cwd extension_directory
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      subscribes :run, "git[#{extension_directory}]"
-    end
+  execute "#{extension_directory}/composer.json" do
+    action :nothing
+    command "composer update --no-dev"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    only_if { ::File.exist?("#{extension_directory}/composer.json") }
+    subscribes :run, "git[#{extension_directory}]"

   end
 end
 
   end
 end