Merge branch 'master' into build_no_on_icon

Conflicts:
	modules/bump_version_module.rb

Author: dev4dev

Diff for: Gemfile

@@ -7,3 +7,4 @@ gem "ocunit2junit"
 gem "commander"
 gem "xcodeproj", "~> 0.9.0"
 gem "plist", "~> 3.1.0"
+gem "rmagick", "~> 2.13.2"

Diff for: Gemfile.lock

@@ -17,6 +17,7 @@ GEM
     plist (3.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rmagick (2.13.2)
     xcodeproj (0.9.0)
       activesupport (~> 3.2.13)
       colored (~> 1.2)
@@ -31,4 +32,5 @@ DEPENDENCIES
   ocunit2junit
   plist (~> 3.1.0)
   rest-client (~> 1.6.7)
+  rmagick (~> 2.13.2)
   xcodeproj (~> 0.9.0)

Diff for: docs/CONFIGURATION.md

@@ -33,11 +33,9 @@ Global Configuration Parameters:
 
 		bump_version:
 			enabled:    false
-			push:		false
 			up_mver:	false
 			simple:		false
 	`bump_version.enabled` **[bool]** - enable or disable module for configuration  
-	`bump_version.push` **[bool]** - push changes to git repo or not  
 	`bump_version.up_mver` **[bool]** - update marketing version field or not (semantic version format major.minor.build)  
 	`bump_version.simple` **[bool]** - update marketing version to build number
 4. **Build Module**  

Diff for: modules/build_module.rb

@@ -1,4 +1,7 @@
 require "xcodeproj"
+require 'plist'
+require "rmagick"
+include Magick
 
 class BuildModule < BaseModule
   config_key 'build'
@@ -120,7 +123,6 @@ def self.add_version_number_to_icon config, project_name
     target = project.targets.select{|t| t.name == target_name}.first
     project_info_file = real_path(target.build_settings(config.build.configuration)['INFOPLIST_FILE'])
 
-    require 'Plist'
     begin
       project_info = Plist::parse_xml project_info_file
       icons_names = project_info['CFBundleIcons']['CFBundlePrimaryIcon']['CFBundleIconFiles']
@@ -132,24 +134,26 @@ def self.add_version_number_to_icon config, project_name
     icons_patterns = icons_names.map do |icon|
       "**/#{icon}"
     end
-    
-    require "rmagick"
-    include Magick
-    Dir[icons_patterns].each do |icon|
+    puts icons_patterns
+    Dir.glob(icons_patterns).each do |icon|
       filename = real_path icon
       retina = !!filename.index('@')
-      image = Image::read(filename).first
-      draw = Draw::new
-      draw.annotate(image, 0, 0, 0, 0, config.runtime.version) {
-        self.font_family = 'Arial'
-        self.fill = 'green'
-        self.stroke = 'black'
-        self.pointsize = if retina then 22 else 11
-        self.font_weight = BoldWeight
-        self.gravity = SouthGravity
-        self.text_antialias = true
-      }
-      image.write filename
+      begin
+        image = Image::read(filename).first
+        draw = Draw::new
+        draw.annotate(image, 0, 0, 0, 0, config.runtime.version) {
+          self.font_family = 'Arial'
+          self.fill = 'blue'
+          self.stroke = 'black'
+          self.pointsize = if retina then 22 else 11 end
+          self.font_weight = BoldWeight
+          self.gravity = SouthGravity
+          self.text_antialias = true
+        }
+        image.write filename
+      rescue Exception => e
+        next
+      end
     end
 
     hook :build_complete, proc {

Diff for: modules/bump_version_module.rb

@@ -6,16 +6,35 @@ class BumpVersionModule < BaseModule
   def self.run config
     info "Bumping version..."
 
+    begin
+      system %Q[git pull origin #{config.branch.name}] or fail "failed pulling remote repos"
+      
+      version, build_number = self.bump_version
+      self.update_marketing_version config, version, build_number
+      
+      system %Q[git commit -am "AUTOBUILD -- configuration: #{config.runtime.configuration}, ver: #{version}, build: #{build_number}"]
+      info "Push updated version numbers to git"
+      result = system %Q[git push origin #{config.branch.name}]
+      unless result
+        puts "\nFailed pushing data to repo, waiting 5 seconds before retry..."
+        system %Q[git reset --hard HEAD^]
+        sleep 5
+      end
+    end until result
+  end
+  
+  private
+  def self.bump_version
     system %Q[agvtool bump -all]
     build_number = `agvtool vers -terse`.strip
-    
     version = `agvtool mvers -terse1`.strip
     unless is_version_ok? version
-      info "ERROR: Bad version value #{version}"
-      info "Aborting..."
-      return false
+      fail "ERROR: Bad version value #{version}. Aborting..."
     end
-    
+    [version, build_number]
+  end
+  
+  def self.update_marketing_version config, version, build_number
     if config.bump_version.up_mver
       if config.bump_version.simple?
         version = build_number
@@ -27,15 +46,6 @@ def self.run config
       end
       system %Q[agvtool new-marketing-version "#{version}"]
     end
-    
     config.runtime.version = version
-    
-    if config.bump_version.push?
-      hook :complete, proc {
-        info "Push updated version numbers to git"
-        system %Q[git commit -am "AUTOBUILD -- configuration: #{config.runtime.configuration}, ver: #{version}, build: #{build_number}"]
-        system %Q[git push origin #{config.branch.name}]
-      }
-    end
   end
 end