xcodebuilder 0.0.23 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6ac0109bdfd62356296c4cf80a66a62555f82a
-  data.tar.gz: f4b973544683298402b05a65c9498be031681677
+  metadata.gz: 8d8a7a84bb6f92c9d1a93692976b0c6b47bfb0fa
+  data.tar.gz: d31c2f7eb8fa8ca3a1b47317d140225065b27a24
 SHA512:
-  metadata.gz: c3ac4e931dd0974560c3e24740491d1892dff981a9f0bd65b99f0a39240b95dbbda73cadab76ed949ee413977a8374d6809d54fae9934c7dd49b1ff53342a2bd
-  data.tar.gz: 93bf33ca8c0cd7551568578c5c356990e58a8983c6a95c6ba3ac7b441a60443646f92b7a2ff0bd39436f35fb0a8987d3b4d95734629c95c23a9c734ef1884495
+  metadata.gz: 5efdae1ae7eda5d1d4460731a1fd0771bc48c23205723ca3542efba0204426864b6270ce6911e01cf9d2f465ae80bcd5e7d6c80537a6e59a51a629b1b00d178e
+  data.tar.gz: 297a0bb2b2e1fe5a5578f81c6f3388da46ecbaac8fa0cba52506874b087ff43df6ab80b2861c94939973adb90b20bbb316a31605a701d33bf109baef1f31ff28

data/lib/xcode_builder.rb

@@ -13,28 +13,20 @@ module XcodeBuilder
       @configuration = Configuration.new(
         :configuration => "Release",
         :build_dir => "build",
-        :xcodebuild_extra_args => nil,
-        :xcrun_extra_args => nil,
         :project_file_path => nil,
         :workspace_file_path => nil,
-        :sdk => "iphoneos",
         :scheme => nil,
         :app_name => nil,
-        :app_extension => "app",
         :signing_identity => nil,
         :package_destination_path => "./pkg",
-        :zip_artifacts => false,
-        :skip_dsym => false,
-        :arch => nil,
-        :skip_clean => ENV.fetch('SKIPCLEAN', false),
-        :verbose => ENV.fetch('VERBOSE', false),
+        :skip_clean => false,
+        :verbose => false,
         :info_plist => nil,
         :scm => nil,
-        :tag_vcs => false,
-        :increment_plist_version => false,
         :pod_repo => nil,
         :podspec_file => nil,
-        :upload_dsym => false
+        :xcodebuild_extra_args => nil,
+        :xcrun_extra_args => nil,
       )
       @namespace = namespace
       yield @configuration if block_given?
@@ -47,7 +39,7 @@ module XcodeBuilder
     def xcodebuild(*args)
       # we're using tee as we still want to see our build output on screen
       cmd = []
-      cmd << "/usr/bin/xcodebuild"
+      cmd << "xcrun xcodebuild"
       cmd.concat args
       puts "Running: #{cmd.join(" ")}" if @configuration.verbose
       cmd << "| xcpretty && exit ${PIPESTATUS[0]}"
@@ -68,6 +60,9 @@ module XcodeBuilder
     def build
       clean unless @configuration.skip_clean
 
+      # update the long version number with the date
+      @configuration.timestamp_plist
+
       print "Building Project..."
       success = xcodebuild @configuration.build_arguments, "build"
       raise "** BUILD FAILED **" unless success
@@ -77,34 +72,13 @@ module XcodeBuilder
     # 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,
-      # so do that part only on iphoneos/macosx SDKs
-      #
-      if(@configuration.sdk.eql? "iphoneos") then
-        package_ios_app
-        package_dsym
-        package_artifact unless !@configuration.zip_artifacts
-      elsif (@configuration.sdk.eql? "macosx") then
-        package_macos_app
-        package_dsym
-        package_artifact unless !@configuration.zip_artifacts
-      else
-        package_simulator_app
-      end
-    end
-
-    # desc "Builds an IPA from the built .app"
-    def package_ios_app
+      
       print "Packaging and Signing..."        
       if (@configuration.signing_identity != nil) then 
         puts "" 
         print "Signing identity: #{@configuration.signing_identity}" 
       end
-      if (@configuration.provisioning_profile != nil) then 
-        puts "" 
-        print "Provisioning profile: #{@configuration.provisioning_profile}" 
-      end
-      raise "** PACKAGE FAILED ** No Signing Identity Found" unless @configuration.signing_identity
+
       # 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
@@ -112,107 +86,41 @@ module XcodeBuilder
       # Construct the IPA and Sign it
       cmd = []
       cmd << "/usr/bin/xcrun"
-      cmd << "-sdk #{@configuration.sdk}"
+      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
-      cmd << "--embed '#{File.expand_path(@configuration.provisioning_profile)}'" unless @configuration.provisioning_profile == 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
-      puts "Running #{cmd.join(" ")}" if @configuration.verbose
-      cmd << "2>&1 /dev/null"
-      cmd = cmd.join(" ")
-      system(cmd)
-      
-      # zip the dSYM over to the dist folder
-      puts "Done"
-    end
-
-    def package_macos_app
-      # clean the pkg folder: create it if it doesn't exist yet
-      FileUtils.mkdir_p "\"#{@configuration.package_destination_path}\"" unless  File.exists? "\"#{@configuration.package_destination_path}\""
-      # and remove an existing app_bundle_path if it exists
-      FileUtils.rm_rf "\"#{@configuration.app_bundle_path}\"" unless !File.exists? "\"#{@configuration.app_bundle_path}\""
-
-      # now we can properly copy the app bundle path over.
-      FileUtils.cp_r "\"#{@configuration.built_app_path}\"", "\"#{@configuration.package_destination_path}\""
-    end
-
-    def package_simulator_app
-      # clean the pkg folder: create it if it doesn't exist yet
-      FileUtils.mkdir_p "\"#{@configuration.package_destination_path}\"" unless  File.exists? "\"#{@configuration.package_destination_path}\""
-      # and remove an existing app_bundle_path if it exists
-      FileUtils.rm_rf "\"#{@configuration.app_bundle_path}\"" unless !File.exists? "\"#{@configuration.app_bundle_path}\""
-
-      # now we can properly copy the app bundle path over.
-      FileUtils.cp_r "\"#{@configuration.built_app_path}\"", "\"#{@configuration.package_destination_path}\""
-    end
-
-    # desc "Zips the dSYM to the package folder"
-    def package_dsym
-      return if @configuration.skip_dsym
-      print "Packaging dSYM..."  
-
-      # copy the dSYM to the pkg destination
-      FileUtils.cp_r @configuration.built_dsym_path, @configuration.package_destination_path
 
-      # the version is pulled from a path relative location, so fetch BEFORE
-      # we Dir.chdir
-      dsym_name = @configuration.dsym_name
-      dsym_target_path = @configuration.dsym_path
-
-      # move to pkg destination and zip the dSYM
-      current_dir = Dir.pwd
-      Dir.chdir @configuration.package_destination_path
-
-      cmd = []
-      cmd << "zip"
-      cmd << "-r"
-      cmd << "\"#{dsym_target_path}\""
-      cmd << "\"#{@configuration.app_name}.#{@configuration.app_extension}.dSYM\""
-              
       puts "Running #{cmd.join(" ")}" if @configuration.verbose
       cmd << "2>&1 /dev/null"
       cmd = cmd.join(" ")
       system(cmd)
-
-      FileUtils.rm_rf "#{@configuration.app_name}.#{@configuration.app_extension}.dSYM" unless !File.exists? "#{@configuration.app_name}.#{@configuration.app_extension}.dSYM"
-
-      # back to working directory
-      Dir.chdir current_dir
+      
+      puts ""
       puts "Done."
     end
 
-    # desc "Packages the final artifact (IPA + dSYM)"
-    def package_artifact
-      # keep track of current working dir
-      current_dir = Dir.pwd
-      Dir.chdir @configuration.package_destination_path
-
-      # zip final package
-      cmd = []
-      cmd << "zip"
-      cmd << "-r"
-      cmd << "\"#{@configuration.zipped_package_name}\""
-      cmd << "\"#{@configuration.dsym_name}\"" unless @configuration.skip_dsym
-      cmd << "\"#{@configuration.ipa_name}\"" unless !@configuration.sdk.eql? "iphoneos"
-      cmd << "\"#{@configuration.app_name}.#{@configuration.app_extension}\"" unless !@configuration.sdk.eql? "macosx"
-      cmd << "2>&1 /dev/null"
-
-      system cmd.join " "
-
-      # delete all the artifacts but the .app. which will be needed by the automation builds
-      FileUtils.rm_rf @configuration.dsym_name unless !File.exists? @configuration.dsym_name
-      FileUtils.rm_rf @configuration.ipa_name unless !File.exists? @configuration.ipa_name
+    def deploy
+      package
+      @configuration.deployment_strategy.deploy
+    end
 
-      # back to working directory
-      Dir.chdir current_dir
+    def release
+      # deploy or package depending on configuration
+      if @configuration.deployment_strategy then
+        deploy
+      else 
+        package
+      end
 
-      puts "Done"
-      puts "ZIP package: #{@configuration.zipped_package_name}"
+      puts ""
+      puts "App successfully released"
     end
 
     # desc "For CocoaPod libraries: dry run, tags SCM, pushes to cocoapod and increments build number"
@@ -258,30 +166,5 @@ module XcodeBuilder
       raise "** Pod push failed **" if !result
       puts "Done."
     end
-
-    def deploy
-      package
-      @configuration.deployment_strategy.deploy
-    end
-
-    def release
-      # deploy or package depending on configuration
-      if @configuration.deployment_strategy then
-        deploy
-      else 
-        package
-      end
-
-      # tag first, then prepare for next release and 
-      # commit the updated plist
-      if @configuration.tag_vcs then
-        @configuration.release_strategy.tag_current_version
-      end
-
-      if @configuration.release_strategy != nil then
-        @configuration.release_strategy.prepare_for_next_release
-      end
-      puts "App successfully released"
-    end
   end
 end

data/lib/xcode_builder/configuration.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'Date'
 require File.dirname(__FILE__) + '/deployment_strategies'
 require File.dirname(__FILE__) + '/release_strategies'
 
@@ -20,10 +21,10 @@ module XcodeBuilder
         args << "-project '#{project_file_path}'" if project_file_path
       end
 
-      args << "-sdk #{sdk}"
+      args << "-sdk iphoneos"
       
       args << "-configuration '#{configuration}'"
-      args << "BUILD_DIR=#{File.expand_path build_dir}" unless build_dir == :derived
+      args << "BUILD_DIR=#{File.expand_path build_dir}"
       
       if xcodebuild_extra_args
           args.concat xcodebuild_extra_args if xcodebuild_extra_args.is_a? Array
@@ -35,7 +36,7 @@ module XcodeBuilder
     
     def app_file_name
       raise ArgumentError, "app_name or target must be set in the BetaBuilder configuration block" if app_name.nil?
-      "#{app_name}.#{app_extension}"
+      "#{app_name}.app"
     end
     
     def info_plist_path
@@ -46,19 +47,6 @@ module XcodeBuilder
       end
     end
 
-    def final_bundle_id
-      final_plist_path = "#{app_bundle_path}/Info.plist"
-       # no plist is found, return a nil version
-      if (final_plist_path == nil)  || (!File.exists? final_plist_path) then
-        return nil
-      end
-
-      # read the plist and extract data
-      plist = CFPropertyList::List.new(:file => final_plist_path)
-      data = CFPropertyList.native_types(plist.value)
-      data["CFBundleIdentifier"]
-    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
@@ -74,7 +62,7 @@ module XcodeBuilder
       # read the plist and extract data
       plist = CFPropertyList::List.new(:file => info_plist_path)
       data = CFPropertyList.native_types(plist.value)
-      data["CFBundleVersion"]
+      data["CFBundleShortVersionString"]
     end
 
     def build_number_from_podspec
@@ -128,11 +116,7 @@ module XcodeBuilder
       true
     end
 
-    def increment_plist_number
-      if !increment_plist_version then
-        return false
-      end
-
+    def timestamp_plist
       if info_plist == nil then
         return false
       end
@@ -142,13 +126,20 @@ module XcodeBuilder
       data = CFPropertyList.native_types(plist.value)
 
       # re inject new version number into the data
-      data["CFBundleVersion"] = next_build_number
+      data["CFBundleVersion"] = DateTime.now.strftime("%Y-%m-%d %k:%M")
 
       # recreate the plist and save it
       plist.value = CFPropertyList.guess(data)
       plist.save(info_plist_path, CFPropertyList::List::FORMAT_XML)
     end
 
+
+
+    def ipa_name
+      prefix = app_name == nil ? target : app_name
+      "#{prefix}#{built_app_long_version_suffix}.ipa"
+    end      
+
     def built_app_long_version_suffix
       if build_number == nil then
         ""
@@ -156,50 +147,17 @@ module XcodeBuilder
         "-#{build_number}"
       end
     end
-
-    def ipa_name
-      prefix = app_name == nil ? target : app_name
-      "#{prefix}#{built_app_long_version_suffix}.ipa"
-    end      
     
     def built_app_path
-      sdk_extension = if sdk.eql? "macosx" then "" else "-#{sdk}" end
-      if build_dir == :derived
-        File.join("#{derived_build_dir}", "#{configuration}#{sdk_extension}", "#{app_file_name}")
-      else
-        File.join("#{build_dir}", "#{configuration}#{sdk_extension}", "#{app_file_name}")
-      end
-    end
-    
-    def built_dsym_path
-      "#{built_app_path}.dSYM"
-    end
-    
-    def derived_build_dir 
-      workspace_name = Pathname.new(workspace_file_path).basename.to_s.split(".")[0]
-      for dir in Dir[File.join(File.expand_path("~/Library/Developer/Xcode/DerivedData"), "#{workspace_name}-*")]
-        return "#{dir}/Build/Products" if File.read( File.join(dir, "info.plist") ).match workspace_file_path
-      end
-    end
-
-    def zipped_package_name
-      "#{app_name}#{built_app_long_version_suffix}.zip"
+      File.join("#{build_dir}", "#{configuration}-iphoneos", "#{app_file_name}")
     end
 
     def ipa_path
       File.join(File.expand_path(package_destination_path), ipa_name)
     end
 
-    def dsym_name
-      "#{app_name}#{built_app_long_version_suffix}.dSYM.zip"
-    end
-
-    def dsym_path
-      File.join(File.expand_path(package_destination_path), dsym_name)
-    end
-
     def app_bundle_path
-      "#{package_destination_path}/#{app_name}.#{app_extension}"
+      "#{package_destination_path}/#{app_name}.app"
     end
     
     def deploy_using(strategy_name, &block)

data/lib/xcode_builder/deployment_strategies.rb

@@ -29,11 +29,9 @@ module XcodeBuilder
     private
 
     def self.strategies
-      {:scp => SCP, :testflight => TestFlight, :web => Web}
+      {:testflight => TestFlight}
     end
   end
 end
 
-require File.dirname(__FILE__) + '/deployment_strategies/scp'
 require File.dirname(__FILE__) + '/deployment_strategies/testflight'
-require File.dirname(__FILE__) + '/deployment_strategies/web'

data/lib/xcode_builder/deployment_strategies/testflight.rb

@@ -30,20 +30,6 @@ module XcodeBuilder
           :replace            => @configuration.replace || false
         }
         
-        if @configuration.upload_dsym then
-          payload[:dsym] = File.new(@configuration.dsym_path, 'rb')
-        end
-
-        if @configuration.verbose
-          puts "ipa path: #{@configuration.ipa_path}"
-          puts "release notes: #{release_notes}"
-        end
-        
-        if @configuration.dry_run 
-          puts '** Dry Run - No action here! **'
-          return
-        end
-        
         print "Uploading build to TestFlight..."        
         
         statusCode = 0

data/lib/xcode_builder/release_strategies/git.rb

@@ -76,22 +76,7 @@ module XcodeBuilder
         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?) 
-        
-        # 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}"
-       
-        puts "Done"
-      end
 
       def stage_files files
         cmd = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodebuilder
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.1.0
 platform: ruby
 authors:
 - Olivier Larivain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -109,9 +109,7 @@ files:
 - README.md
 - lib/xcode_builder/build_output_parser.rb
 - lib/xcode_builder/configuration.rb
-- lib/xcode_builder/deployment_strategies/scp.rb
 - lib/xcode_builder/deployment_strategies/testflight.rb
-- lib/xcode_builder/deployment_strategies/web.rb
 - lib/xcode_builder/deployment_strategies.rb
 - lib/xcode_builder/release_strategies/git.rb
 - lib/xcode_builder/release_strategies.rb

data/lib/xcode_builder/deployment_strategies/scp.rb

@@ -1,104 +0,0 @@
-module XcodeBuilder
-  module DeploymentStrategies
-    class SCP < Strategy
-      def extended_configuration_for_strategy
-        proc do
-          def deployment_url
-            File.join(deploy_to, ipa_name)
-          end
-
-          def manifest_url
-            File.join(deploy_to, "manifest.plist")
-          end
-
-          def remote_installation_path
-            File.join(remote_directory)
-          end
-        end
-      end
-
-      def prepare
-        plist = CFPropertyList::List.new(:file => "#{@configuration.built_app_path}/Info.plist")
-        plist_data = CFPropertyList.native_types(plist.value)
-        File.open("pkg/dist/manifest.plist", "w") do |io|
-          io << %{<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>items</key>
-    <array>
-      <dict>
-        <key>assets</key>
-        <array>
-          <dict>
-            <key>kind</key>
-            <string>software-package</string>
-            <key>url</key>
-            <string>#{@configuration.deployment_url}</string>
-          </dict>
-        </array>
-        <key>metadata</key>
-        <dict>
-          <key>bundle-identifier</key>
-          <string>#{plist_data['CFBundleIdentifier']}</string>
-          <key>bundle-version</key>
-          <string>#{plist_data['CFBundleVersion']}</string>
-          <key>kind</key>
-          <string>software</string>
-          <key>title</key>
-          <string>#{plist_data['CFBundleDisplayName']}</string>
-        </dict>
-      </dict>
-    </array>
-  </dict>
-</plist>
-}
-        end
-        File.open("pkg/dist/index.html", "w") do |io|
-          io << %{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-    <title>Beta Download</title>
-    <style type="text/css">
-      body {background:#fff;margin:0;padding:0;font-family:arial,helvetica,sans-serif;text-align:center;padding:10px;color:#333;font-size:16px;}
-      #container {width:300px;margin:0 auto;}
-      h1 {margin:0;padding:0;font-size:14px;}
-      p {font-size:13px;}
-      .link {background:#ecf5ff;border-top:1px solid #fff;border:1px solid #dfebf8;margin-top:.5em;padding:.3em;}
-      .link a {text-decoration:none;font-size:15px;display:block;color:#069;}
-    </style>
-  </head>
-  <body>
-    <div id="container">
-      <div class="link"><a href="itms-services://?action=download-manifest&url=#{@configuration.manifest_url}">Tap Here to Install<br />#{@configuration.target} #{plist_data['CFBundleVersion']}<br />On Your Device</a></div>
-      <p><strong>Link didn't work?</strong><br />
-	Make sure you're visiting this page on your device, not your computer.</p>
-    </div>
-  </body>
-</html>
-}
-        end
-      end
-
-      def deploy
-        cmd = []
-
-        cmd.push "scp"
-
-        if @configuration.remote_port
-          cmd.push "-P #{@configuration.remote_port}"
-        end
-
-        cmd.push "pkg/dist/*"
-        cmd.push "#{@configuration.remote_host}:#{@configuration.remote_installation_path}"
-
-        cmd = cmd.join(" ")
-
-        puts "* Running `#{cmd}`"
-        system(cmd)
-      end
-    end
-  end
-end

data/lib/xcode_builder/deployment_strategies/web.rb

@@ -1,34 +0,0 @@
-require 'rest_client'
-require 'json'
-require 'fileutils'
-
-module XcodeBuilder
-  module DeploymentStrategies
-    class Web < Strategy
-
-      def prepare
-        puts "Nothing to prepare!" if @configuration.verbose
-      end
-      
-      def deploy
-        puts "Deploying to the web server : '#{@configuration.server_url}'"
-
-        payload = {
-            :ipa_file => File.new(@configuration.ipa_path, 'rb'),
-        }
-        statusCode = 0
-        begin
-            response = RestClient::Request.new(:method => :post, :url => "#{@configuration.server_url}", :user => "#{@configuration.server_user}", :password => "#{@configuration.server_password}", :payload => payload).execute
-            statusCode = response.code
-        rescue => e
-            puts "Web upload failed with exception:\n#{e}Response\n#{e.response}"
-        end
-        if (statusCode == 200) || (statusCode == 201)
-            puts "Web upload completed"
-        else
-            puts "Web upload failed" 
-        end
-      end
-    end
-  end
-end