xcodebuilder 0.0.14 → 0.0.15

data/lib/xcode_builder.rb

@@ -175,6 +175,7 @@ module XcodeBuilder
 
       # back to working directory
       Dir.chdir current_dir
+      puts "Done."
     end
 
     # desc "Packages the final artifact (IPA + dSYM)"
@@ -196,7 +197,6 @@ module XcodeBuilder
       system cmd.join " "
 
       # delete all the artifacts but the .app. which will be needed by the automation builds
-      puts "the paaaaath #{@configuration.dsym_name}"
       FileUtils.rm_rf @configuration.dsym_name unless !File.exists? @configuration.dsym_name
       FileUtils.rm_rf @configuration.ipa_name unless !File.exists? @configuration.ipa_name
 
@@ -216,16 +216,18 @@ module XcodeBuilder
       pod_dry_run
 
       # tag source as needed
-      @configuration.release_strategy.tag_current_version
+      if @configuration.release_strategy != nil then
+        @configuration.release_strategy.tag_current_version
+      end
 
       # and push pod pod
       push_pod
 
-      # increment version numbers
-      if increment_pod_and_plist_number then
-          # and push appropriately
+      # ask release strategy to bump the release number
+      if @configuration.release_strategy != nil then
           @configuration.release_strategy.prepare_for_next_pod_release
       end
+      puts "Pod successfully released"
     end
 
     # runs a pod dry run before tagging
@@ -251,26 +253,6 @@ module XcodeBuilder
       puts "Done."
     end
 
-    def increment_pod_and_plist_number
-      old_build_number = @configuration.build_number
-      if !prepare_for_next_release then 
-        return false
-      end
-
-      # bump the spec version and save it
-      spec_content = File.open(@configuration.podspec_file, "r").read
-      old_version = "version = '#{old_build_number}'"
-      new_version = "version = '#{@configuration.build_number}'"
-
-      spec_content = spec_content.sub old_version, new_version
-
-      File.open(@configuration.podspec_file, "w") {|f|
-        f.write spec_content
-      }
-
-      true
-    end
-
     def deploy
       package
       @configuration.deployment_strategy.deploy
@@ -290,35 +272,10 @@ module XcodeBuilder
         @configuration.release_strategy.tag_current_version
       end
 
-      if prepare_for_next_release then
+      if @configuration.release_strategy != nil then
         @configuration.release_strategy.prepare_for_next_release
       end
-    end
-
-    def prepare_for_next_release
-      if !@configuration.increment_plist_version then
-        return false
-      end
-      
-      next_build_number = @configuration.next_build_number
-      if next_build_number == nil then
-        return false
-      end
-
-      print "Updating #{@configuration.info_plist} to version #{next_build_number}"
-
-      # read the plist and extract data
-      plist = CFPropertyList::List.new(:file => @configuration.info_plist_path)
-      data = CFPropertyList.native_types(plist.value)
-
-      # re inject new version number into the data
-      data["CFBundleVersion"] = next_build_number
-
-      # recreate the plist and save it
-      plist.value = CFPropertyList.guess(data)
-      plist.save(@configuration.info_plist_path, CFPropertyList::List::FORMAT_XML)
-      puts "Done"
-      return true
+      puts "App successfully released"
     end
   end
 end

data/lib/xcode_builder/configuration.rb

@@ -60,6 +60,12 @@ module XcodeBuilder
     end
 
     def build_number
+      # we have a podspec file, so try to get the version out of that
+      if (podspec_file != nil)  && (File.exists? podspec_file) then
+        # get hte version out of the pod file
+        return build_number_from_podspec
+      end
+
       # no plist is found, return a nil version
       if (info_plist_path == nil)  || (!File.exists? info_plist_path) then
         return nil
@@ -71,6 +77,18 @@ module XcodeBuilder
       data["CFBundleVersion"]
     end
 
+    def build_number_from_podspec
+      file = File.open(podspec_file, "r")
+      begin
+        version_line = file.gets
+      end while version_line.eql? "\n"
+
+      if match = version_line.match(/\s*version\s*=\s*["'](.*)["']\s*/i) 
+        version = match.captures
+      end
+      return version[0]
+    end
+
     def next_build_number
       # if we don't have a current version, we don't have a next version :)
       if build_number == nil then
@@ -84,6 +102,54 @@ module XcodeBuilder
       version_components.join "."
     end
 
+    def increment_pod_number
+      if !increment_plist_version then
+        return false
+      end
+
+      if podspec_file == nil then
+        return false
+      end
+
+      # keep the old build number around
+      old_build_number = build_number
+
+      # bump the spec version and save it
+      spec_content = File.open(podspec_file, "r").read
+      old_version = "version = '#{old_build_number}'"
+      new_version = "version = '#{next_build_number}'"
+
+      spec_content = spec_content.sub old_version, new_version
+
+      File.open(podspec_file, "w") {|f|
+        f.write spec_content
+      }
+
+      true
+    end
+
+    def increment_plist_number
+      if !increment_plist_version then
+        puts "increment is false"
+        return false
+      end
+
+      if info_plist == nil then
+        return false
+      end
+
+      # read the plist and extract data
+      plist = CFPropertyList::List.new(:file => info_plist_path)
+      data = CFPropertyList.native_types(plist.value)
+
+      # re inject new version number into the data
+      data["CFBundleVersion"] = next_build_number
+
+      # recreate the plist and save it
+      plist.value = CFPropertyList.guess(data)
+      plist.save(info_plist_path, CFPropertyList::List::FORMAT_XML)
+    end
+
     def built_app_long_version_suffix
       if build_number == nil then
         ""

data/lib/xcode_builder/release_strategies/git.rb

@@ -54,21 +54,31 @@ module XcodeBuilder
 
       def prepare_for_next_pod_release
         build_number = @configuration.build_number
+        next_build_number = @configuration.next_build_number
+
         raise "build number cannot be empty on release" unless  (build_number != nil) && (!build_number.empty?) 
 
+        # increment the build number
+        @configuration.increment_pod_number
+
+        # commit
         print "Committing #{@configuration.info_plist} and #{@configuration.podspec_file} with version #{build_number}"
-        
         stage_files [@configuration.info_plist, @configuration.podspec_file]
-        commit_and_push_with_message "Preparing for next pod release..."
+        commit_and_push_with_message "Preparing for next pod release #{next_build_number}..."
        
         puts "Done"
       end
 
       def prepare_for_next_release
         build_number = @configuration.build_number
+        next_build_number = @configuration.next_build_number
+
         raise "build number cannot be empty on release" unless  (build_number != nil) && (!build_number.empty?) 
         
-        print "Committing #{@configuration.info_plist} with version #{build_number}"
+        # increment the build number
+        @configuration.increment_plist_number
+        
+        print "Committing #{@configuration.info_plist} with version #{next_build_number}"
 
         stage_files [@configuration.info_plist]
         commit_and_push_with_message "[Xcodebuilder] Releasing build #{build_number}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xcodebuilder
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Olivier Larivain