xcodebuilder 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f2c186bfa641c9e2eadf057e6a7748d6dc669b
-  data.tar.gz: 13834c56ca7c3acc454974334bda8bfc11c6365e
+  metadata.gz: b2884ecb86de6f30765001abd365acc4d99aba99
+  data.tar.gz: 134ac9259f1d7d47b96acc4e8af1c6f478997b6b
 SHA512:
-  metadata.gz: dbab4c92062bcfe006f978bf24e70b17a5c38c0fdd540cc39ec44d65b6f2f30391390c1e2e70db91f27bf725b424940b42961c4b9833e88442139a5a3b8e5c43
-  data.tar.gz: 89cbc68cef52955205d738af1dbdb36ed728bf080366d84301a1144583bbdb7bc6447cf0b9fdad3bbc381b9067c37290a1b7309c384bee99b228628a99f0b161
+  metadata.gz: af6ae39c60c829533d5e6be8cf146615ac90b67f4da258e11678e076d1fa5452c0b1a48bd99cbec59ce681fefea963c408c7e1a6493b18415b89225d1156dc2b
+  data.tar.gz: abb6ab02babab4fc030cb03cefa21dc585a957a68a19fbb45327f0c8eec2a0ab66b80c392530c32669b781daec1c2213484c1aab62921cdc870021e0f450a239

data/lib/xcode_builder.rb

@@ -28,7 +28,8 @@ module XcodeBuilder
         :xcodebuild_extra_args => nil,
         :xcrun_extra_args => nil,
         :timestamp_build => nil,
-        :pod_repo_sources => nil
+        :pod_repo_sources => nil,
+        :watch_app => false
       )
       @namespace = namespace
       yield @configuration if block_given?
@@ -70,9 +71,9 @@ module XcodeBuilder
       # update the long version number with the date
       @configuration.timestamp_plist if @configuration.timestamp_build
 
-      print "Building Project..."
-      success = xcodebuild @configuration.build_arguments, "build"
-      raise "** BUILD FAILED **" unless success
+      # print "Building Project..."
+      # success = xcodebuild @configuration.build_arguments, "archive"
+      # raise "** BUILD FAILED **" unless success
       puts "Done"
     end
     
@@ -80,37 +81,68 @@ module XcodeBuilder
     def package
       build
 
-      print "Packaging and Signing..."        
-      if (@configuration.signing_identity != nil) then 
-        puts "" 
-        print "Signing identity: #{@configuration.signing_identity}" 
-      end
-
+      puts "Packaging and Signing..."        
       # trash and create the dist IPA path if needed
       FileUtils.rm_rf @configuration.package_destination_path unless !File.exists? @configuration.package_destination_path
       FileUtils.mkdir_p @configuration.package_destination_path
     
       # Construct the IPA and Sign it
       cmd = []
-      cmd << "/usr/bin/xcrun"
-      cmd << "-sdk iphoneos"
-      cmd << "PackageApplication"
-      cmd << "'#{@configuration.built_app_path}'"
-      cmd << "-o '#{@configuration.ipa_path}'"
-      cmd << "--sign '#{@configuration.signing_identity}'" unless @configuration.signing_identity == nil
-
-      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
-      end
+      cmd << "-exportArchive"
+      cmd << "-exportFormat"
+      cmd << "ipa"
+      cmd << "-exportWithOriginalSigningIdentity"
+      cmd << "-archivePath"
+      cmd << "'#{File.expand_path @configuration.xcarchive_path}'"
+      cmd << "-exportPath"
+      cmd << "'#{File.expand_path @configuration.ipa_path}'"
+
+      # puts "Running #{cmd.join(" ")}" if @configuration.verbose
+      # cmd << "2>&1 /dev/null"
+      # cmd = cmd.join(" ")
+      # system(cmd)
+      xcodebuild cmd, ""
+      puts "Done."
 
-      puts "Running #{cmd.join(" ")}" if @configuration.verbose
-      cmd << "2>&1 /dev/null"
-      cmd = cmd.join(" ")
-      system(cmd)
+      if @configuration.watch_app then
+        reinject_wk_stub_in_ipa
+      end
       
+    end
+
+    def reinject_wk_stub_in_ipa
+      puts ""
+      print "Reinject WK support into signed IPA..."
+      # create a tmp folder
+      tmp_folder = @configuration.package_destination_path + "tmp"
+      FileUtils.mkdir_p tmp_folder
+
+      # copy the ipa to it
+      FileUtils.cp "#{File.expand_path @configuration.ipa_path}", tmp_folder
+
+      # evaluate this here because this is based on pwd
+      full_ipa_path = @configuration.ipa_path
+      # keep track of current folder so can cd back to it and cd to tmp folder
+      current_folder = `pwd`.gsub("\n", "")
+      Dir.chdir tmp_folder
+
+      # unzip ipa and get rid of it
+      `unzip '#{@configuration.ipa_name}'`
+      FileUtils.rm @configuration.ipa_name
+
+      # now reinject the shiznit in
+      FileUtils.mkdir "WatchKitSupport"
+      #get the xcode path
+      base = `xcode-select --print-path`.gsub("\n", "")
+      wk_path = "#{base}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/Library/Application Support/WatchKit/*"
+      FileUtils.cp_r Dir.glob(wk_path), "WatchKitSupport"
+
+      # now zip the fucker
+      `zip -r '#{full_ipa_path}' *`
+      Dir.chdir current_folder
+      FileUtils.rm_rf tmp_folder
+      print " Done."
       puts ""
-      puts "Done."
     end
 
     def deploy

data/lib/xcode_builder/configuration.rb

@@ -22,6 +22,8 @@ module XcodeBuilder
       end
 
       args << "-sdk iphoneos"
+
+      args << "-archivePath #{File.expand_path xcarchive_path}"
       
       args << "-configuration '#{configuration}'"
       args << "BUILD_DIR=\"#{File.expand_path build_dir}\""
@@ -135,6 +137,10 @@ module XcodeBuilder
       File.join("#{build_dir}", "#{configuration}-iphoneos", "#{app_file_name}")
     end
 
+    def xcarchive_path
+      File.join("#{build_dir}", "#{configuration}.xcarchive")
+    end
+
     def ipa_path
       File.join(File.expand_path(package_destination_path), ipa_name)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodebuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Olivier Larivain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList