From 20f60fef42a69b141f8b9e727afe6cb1ba63b796 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Mon, 6 Oct 2014 16:05:04 +0200
Subject: [PATCH] Improved make process

---
 config/locales/user.en.yml |  2 +-
 make_mobile                | 57 ++++++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/config/locales/user.en.yml b/config/locales/user.en.yml
index 8dea4e16..1be4d253 100644
--- a/config/locales/user.en.yml
+++ b/config/locales/user.en.yml
@@ -119,7 +119,7 @@ en:
         Feedback of your order is given by one or two checks next to your order.
       feedback:
         title: Feedback
-        subtitle: We gladly improve our app with your feedback!
+        subtitle: We gladly improve our app using your feedback!
         submit: Submit feedback
         received: Thank you for your feedback. We appreciate your opinion!
         empty_content: No feedback given
diff --git a/make_mobile b/make_mobile
index 228f197b..9bff4dd5 100755
--- a/make_mobile
+++ b/make_mobile
@@ -1,23 +1,45 @@
-#!/usr/bin/env bash
-ANDROID_ROOT="$HOME/Documents/workspace/mozo/www/assets"
-spring stop
-rm -rf $ANDROID_ROOT
-mkdir $ANDROID_ROOT
-rm -rf public/assets
-QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app bundle exec rake assets:precompile
-find public/assets -name "*.gz" -exec rm -f {} \;
-./bin/dedigest_assets
+#!/usr/bin/env ruby
+require 'versionomy'
+require 'colorize'
+require 'pry'
+class String; def to_version; Versionomy.parse(self) end end
+
+HOME=ENV['HOME']
+APP_ROOT="#{HOME}/Documents/workspace/mozo"
+APP_ASSET_ROOT="#{APP_ROOT}/www/assets"
+app_config_path = File.join(APP_ROOT, 'config.xml')
+app_config = File.read(app_config_path)
+current_version = app_config.match(/version="([\.\d]+)"/)[1].to_version
+new_version = File.read("config/version").strip.to_version
+version_increased = false
+while new_version <= current_version
+  version_increased = true
+  new_version = new_version.bump(:tiny)
+end
+puts "Increasing version value to #{new_version}".colorize(:red) if version_increased
+
+`spring stop`
+`rm -rf #{APP_ASSET_ROOT}`
+`mkdir #{APP_ASSET_ROOT}`
+`rm -rf public/assets`
+`QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app bundle exec rake assets:precompile`
+`find public/assets -name "*.gz" -exec rm -f {} \\;`
+`./bin/dedigest_assets`
 
 # correct stuff
-./bin/user_asset_corrections
+`./bin/user_asset_corrections`
 
 # now move stuff to a cleaned up cordova location
-cp -r public/assets/user $ANDROID_ROOT/user
-cp -r public/assets/theme1 $ANDROID_ROOT/theme1
-cp -r public/assets/vendor $ANDROID_ROOT/vendor
-find $ANDROID_ROOT/theme1 -name "*.css" -exec rm -f {} \;
-find $ANDROID_ROOT/theme1 -name "*.js" -exec rm -f {} \;
-find public/assets -iname "font*" -depth 1 -exec cp {} $ANDROID_ROOT \;
+`cp -r public/assets/user #{APP_ASSET_ROOT}/user`
+`cp -r public/assets/theme1 #{APP_ASSET_ROOT}/theme1`
+`cp -r public/assets/vendor #{APP_ASSET_ROOT}/vendor`
+
+# Theme1 files are not used
+`find #{APP_ASSET_ROOT}/theme1 -name "*.css" -exec rm -f {} \\;`
+`find #{APP_ASSET_ROOT}/theme1 -name "*.js" -exec rm -f {} \\;`
+
+# copy font files
+`find public/assets -iname "font*" -depth 1 -exec cp {} #{APP_ASSET_ROOT} \\;`
 
 # rm -rf public/assets/cmtool;
 # rm -rf public/assets/jquery-ui;
@@ -30,4 +52,5 @@ find public/assets -iname "font*" -depth 1 -exec cp {} $ANDROID_ROOT \;
 # rm -rf public/assets/cartoon;
 # rm -rf public/assets/frames;
 # QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb;
-rm -rf public/assets
+`rm -rf public/assets`
+File.open(app_config_path, 'w+'){|f| f.puts app_config.sub(%[version="#{current_version}"], %[version="#{new_version}"])}