Switch gps-tile tests to run on Debian

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 6816904521e6f8a5ddcf1b81afe9d1f72d24de02..cb71e73a5aa74a7bd7051ca73022f64ba5f3e0d9 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -453,7 +453,7 @@ action :create do
     only_if { new_resource.build_assets }
   end
 
     only_if { new_resource.build_assets }
   end
 

-  bundle_exec "#{rails_directory}/app/assets/javascripts/i18n" do
+  bundle_exec "#{rails_directory}/config/i18n-js.yml" do

     action :nothing
     directory rails_directory
     command "rails i18n:js:export"
     action :nothing
     directory rails_directory
     command "rails i18n:js:export"


@@ -463,7 +463,18 @@ action :create do
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"

-    only_if { new_resource.build_assets }
+    only_if { new_resource.build_assets && ::File.exist?("#{rails_directory}/config/i18n-js.yml") }
+  end
+
+  bundle_exec "#{rails_directory}/config/i18n.yml" do
+    action :nothing
+    directory rails_directory
+    command "i18n export"
+    environment "HOME" => rails_directory
+    user new_resource.user
+    group new_resource.group
+    subscribes :run, "git[#{rails_directory}]"
+    only_if { new_resource.build_assets && ::File.exist?("#{rails_directory}/config/i18n.yml") }

   end
 
   bundle_exec "#{rails_directory}/public/assets" do
   end
 
   bundle_exec "#{rails_directory}/public/assets" do


@@ -480,7 +491,8 @@ action :create do
     subscribes :run, "file[#{rails_directory}/config/settings.local.yml]"
     subscribes :run, "file[#{rails_directory}/config/storage.yml]"
     subscribes :run, "bundle_exec[#{rails_directory}/package.json]"
     subscribes :run, "file[#{rails_directory}/config/settings.local.yml]"
     subscribes :run, "file[#{rails_directory}/config/storage.yml]"
     subscribes :run, "bundle_exec[#{rails_directory}/package.json]"

-    subscribes :run, "bundle_exec[#{rails_directory}/app/assets/javascripts/i18n]"
+    subscribes :run, "bundle_exec[#{rails_directory}/config/i18n-js.yml]"
+    subscribes :run, "bundle_exec[#{rails_directory}/config/i18n.yml]"

     only_if { new_resource.build_assets }
   end
 
     only_if { new_resource.build_assets }
   end