xcodebuilder 0.0.7 → 0.0.8

data/lib/xcode_builder.rb

@@ -53,7 +53,7 @@ module XcodeBuilder
       system(cmd)
     end
     
-    # # desc "Clean the Build"
+    # desc "Clean the Build"
     def clean
       unless @configuration.skip_clean
         print "Cleaning Project..."
@@ -62,7 +62,7 @@ module XcodeBuilder
       end
     end
     
-    # # desc "Build the beta release of the app"
+    # desc "Build the beta release of the app"
     def build
       clean unless @configuration.skip_clean
 
@@ -72,7 +72,7 @@ module XcodeBuilder
       puts "Done"
     end
     
-    # # desc "Package the release as a distributable archive"
+    # desc "Package the release as a distributable archive"
     def package
       build
       # there is no need for IPA or dSYM unless we have a device/macosx build,
@@ -91,7 +91,7 @@ module XcodeBuilder
       end
     end
 
-    # # desc "Builds an IPA from the built .app"
+    # desc "Builds an IPA from the built .app"
     def package_ios_app
       print "Packaging and Signing..."          
       raise "** PACKAGE FAILED ** No Signing Identity Found" unless @configuration.signing_identity
@@ -106,8 +106,8 @@ module XcodeBuilder
       cmd << "PackageApplication"
       cmd << "-v '#{@configuration.built_app_path}'"
       cmd << "-o '#{@configuration.ipa_path}'"
-      cmd << "--sign '#{@configuration.signing_identity}'"
-      cmd << "--embed '#{@configuration.provisioning_profile}'" unless @configuration.signing_identity == nil
+      cmd << "--sign '#{@configuration.signing_identity}'" unless @configuration.signing_identity == nil
+      cmd << "--embed '#{@configuration.provisioning_profile}'"
       if @configuration.xcrun_extra_args then
         cmd.concat @configuration.xcrun_extra_args if @configuration.xcrun_extra_args.is_a? Array
         cmd << @configuration.xcrun_extra_args if @configuration.xcrun_extra_args.is_a? String
@@ -143,9 +143,7 @@ module XcodeBuilder
 
     # desc "Zips the dSYM to the package folder"
     def package_dsym
-      if @configuration.skip_dsym then
-        return
-      end
+      return if @configuration.skip_dsym
       print "Packaging dSYM..."  
 
       # copy the dSYM to the pkg destination
@@ -203,14 +201,18 @@ module XcodeBuilder
       puts "ZIP package: #{@configuration.zipped_package_name}"
     end
 
-    # desc "For CocoaPod libraries: Tags SCM, pushes to cocoapod and increments build number"
+    # desc "For CocoaPod libraries: dry run, tags SCM, pushes to cocoapod and increments build number"
     def pod_release
-      build
       raise "CocoaPod repo is not set, aborting cocoapod_release task." unless @configuration.pod_repo != nil
       raise "Spec file is not set, aborting cocoapod_release task." unless @configuration.podspec_file != nil
 
-      # tag and push current pod
+      # make a dry run first
+      pod_dry_run
+
+      # tag source as needed
       @configuration.release_strategy.tag_current_version
+
+      # and push pod pod
       push_pod
 
       # increment version numbers
@@ -220,16 +222,27 @@ module XcodeBuilder
       end
     end
 
+    # runs a pod dry run before tagging
+    def pod_dry_run
+      clean unless @configuration.skip_clean
+
+      print "Pod dry run..."
+      podfile = if @configuration.podspec_file == nil then "" else @configuration.podspec_file end
+      result = system "pod spec lint #{podfile} --error-only"
+      raise "** Pod dry run failed **" if !result
+      puts "Done"
+    end
+
     def push_pod
       cmd = []
       cmd << "pod"
       cmd << "push"
       cmd << @configuration.pod_repo
-      # cmd << "--local-only"
       cmd << "--allow-warnings"
 
       print "Pushing to CocoaPod..."
-      system (cmd.join " ")
+      result = system (cmd.join " ")
+      raise "** Pod push failed **" if !result
       puts "Done."
     end
 
@@ -255,7 +268,6 @@ module XcodeBuilder
 
     def deploy
       package
-      # deploy first
       @configuration.deployment_strategy.deploy
     end
 

data/lib/xcode_builder/release_strategies/git.rb

@@ -26,12 +26,11 @@ module XcodeBuilder
         #first, tag
         cmd << "git"
         cmd << "tag"
-        # -f sounds brutal to start with, so let's give it a try without
-#        cmd << "-f"
         cmd << @tag_name
 
         cmd << "2>&1 %s git.output" % (@configuration.verbose ? '| tee' : '>')
-        system(cmd.join " ")
+        result = system(cmd.join " ")
+        raise "Could not tag repository" unless result
         puts
         puts "Done"
 
@@ -46,6 +45,7 @@ module XcodeBuilder
         cmd << @branch
         cmd << "2>&1 %s git.output" % (@configuration.verbose ? '| tee' : '>')
         system(cmd.join " ")
+        raise "Could not push to #{@origin}" unless result
         
         puts
         puts "Done"
@@ -108,7 +108,8 @@ module XcodeBuilder
         cmd << @branch
         cmd << "2>&1 %s git.output" % (@configuration.verbose ? '| tee' : '>')
         
-        system(cmd.join " ")
+        result = system(cmd.join " ")
+        raise "Could not push #{@branch} to #{@origin}" unless result
         puts 
       end
     end

metadata

@@ -1,96 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xcodebuilder
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Olivier Larivain
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: CFPropertyList
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - olarivain@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
 - CHANGES.md
-files: 
+files:
 - CHANGES.md
 - LICENSE
 - README.md
@@ -105,37 +99,28 @@ files:
 - lib/xcodebuilder.rb
 homepage: http://github.com/olarivain/xcodebuilder
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A set of Rake tasks and utilities for building and releasing xcode projects
 test_files: []
-