Merge branch 'publish-cli'

Author: tiennou

Resources/Info.plist

@@ -92,7 +92,7 @@
 	<key>SUEnableAutomaticChecks</key>
 	<true/>
 	<key>SUFeedURL</key>
-	<string>https://s3.amazonaws.com/builds.phere.net/GitX/development/GitX-dev.xml</string>
+	<string>https://gitx.github.com/gitx/appcast.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>UpdateKey.pem</string>
 </dict>

Resources/UpdateKey.pem

@@ -1,20 +1,36 @@
 -----BEGIN PUBLIC KEY-----
-MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQDLgrI0GgvtC1rRi6dRNW+N1hcieyZZ
-YFAjvnMpgUP6tsvc1j1V4wgK6pyuU1MCpbrMhSNccqO9D/Xx1ySpbUajn6WKeX8J
-FXDCi1mbq7D8jUbXhReDRcI1NbI6r2cw0Rv5wQU+RFKGwaBpyNZy434k0/zTEMlY
-3PzhGe3jeNOutnqc71f3LTk2wrqlVXsI4y0dl7a2JcwZyXv+/5QniKlukZIFjR5b
-tiwhicOtI8AsabNM1dIAVlsady+P/DwpRsTfCRY+Mo//4RU0hSE+i8Z3y0pz71Wv
-L89yS1GONRQMeYbRDX1ZZcfIYlMmVEcsHh94i199pUmkgdw08iTyjnlrAhUA+VTd
-fA3w0Yptf3eWqSZPBGCayaUCggEAFhMtxRAWnHvZW3MZTfmeDs8IhhkbSfoBtD+r
-2T+EUUCyYPiN4PvmF+4aNWMoWh2lsd6cpvtg5I2qo/qX1HGtQwOc2FHnMmLkUPJz
-kLz7nwpzgdFQ3EyZ3jzmzvNwtsYJ7y7LzkIR22jnLslSl8SiMI+gIwze/oSTEb1X
-o5xadOsFNiAANUSEa1/42xQEHbwfYWMJIEXTBx6GyKJDcep1bK4cFx0A+xnghIhm
-4oah6kYG5ns7wDEcJ/+1FcZbogif5qcTjB2UFvL77jKuqRBcI8xiALVlnAPGkC3R
-rT033W13tnJolae7dLy4UA3taELH+CoaoSgOk6o20ZgjJUbd0wOCAQYAAoIBAQCA
-E4nDRoShNyE20aUxBC8uF5MhDJE0VomcOKPmyDd3Jl4DlEogzMGAwAZKrQKcBlkB
-CAYaWes7ULDDA0RNABWHSI9t/brrQcOPrvRMA6wgcuA5oQcm8zVziuwXJwb+NqwG
-so2ysvryjlUDtHPc2jJ5hUSqkp22NeQv2iK4RoQ9pDJp5/alzH7fYgqECB45AuhA
-34BCKE7B2fakJ5YLQdXZOzG5O3r3azWAewqp4J34Npiqn5LSdl8FZIhMaxmi9mBa
-65w0CNY4/VyyvOgPqCo5zPNxCJxypsvI0IUYRWeJFkEpQLmZ0K1bpmGT1iGnT4A5
-5llf69yaJyoGJDoD/Rj6
+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
+OYnwI0t5XQO9V9JUcX7L
 -----END PUBLIC KEY-----

Scripts/build.py

@@ -1,181 +1,40 @@
 #!/usr/bin/env python
+# encoding: utf-8
 
 import argparse
 import subprocess
 import os
 
-import package
-import sign
+import helpers
+from project import Project
 
-app = "GitX"
-product = "%s.app" % (app,)
-label = "dev"
-base_version = "0.15"
-release_branch = "master"
 
-signing_key = "Developer ID Application: Rowan James"
+def build(project):
+    print "Building scheme {} ({}), please wait…".format(project.scheme(), project.current_config())
+    helpers.xcodebuild(project.scheme(), project.workspace(), project.current_build_config(), ["build"], project.build_base_dir())
+    print "Successfully built to {}".format(project.build_product())
 
-project_root = os.getcwd()
-artifact_prefix = "%s-%s" % (app, label)
-workspace = "%s.xcworkspace" % (app,)
-scheme = "GitX"
-debug_config = "Debug"
-release_config = "Release"
 
-agvtool = "xcrun agvtool"
+def clean(project):
+    print "Cleaning scheme {} ({})".format(project.scheme(), project.current_config())
+    helpers.xcodebuild(project.scheme(), project.workspace(), project.current_build_config(), ["clean"], project.build_base_dir())
 
-updates_template_file = os.path.join(project_root, 'updates', 'GitX-dev.xml.tmpl')
-release_notes_file = os.path.join(project_root, 'updates', 'GitX-dev.html')
-updates_signing_key_file = os.path.join(project_root, 'updates', 'gitx-updates.key')
-updates_appcast_file = 'GitX-dev.xml'
 
-pause = 3
+def build_cmd(args):
+    if args.action == 'clean':
+        project = Project(os.getcwd(), "debug")
+        clean(project)
+        project = Project(os.getcwd(), "release")
+        clean(project)
+    else:
+        project = Project(os.getcwd(), args.action, None)
+        build(project)
 
-build_base_dir = os.path.join(project_root, "build")
-
-class BuildError(RuntimeError):
-    pass
-
-def clean(args):
-    clean_scheme(scheme, args.config)
-
-def release():
-    try:
-        assert_clean()
-        assert_branch(release_branch)
-        build_number = commit_count()
-        set_versions(base_version, build_number, "dev")
-
-        build_scheme(scheme, release_config)
-
-        build_dir = os.path.join(build_base_dir, release_config)
-        built_product = os.path.join(build_dir, product)
-        sign_app(built_product)
-
-        image_path = os.path.join(build_dir, "%s-%s.dmg" % (artifact_prefix, build_number))
-        image_name = "%s %s" % (app, build_number)
-        package_app(built_product, image_path, image_name)
-
-        prepare_release(build_number, image_path)
-
-    except BuildError as e:
-        print("error: %s" % (str(e),))
-
-
-def debug():
-    try:
-        build_scheme(scheme, debug_config)
-
-    except BuildError as e:
-        print("error: %s" % (str(e),))
-
-
-def prepare_release(build_number, image_source_path):
-    release_dir = "release"
-    try:
-        os.makedirs(release_dir)
-    except OSError:
-        pass
-
-    # Tag the release
-    tag = 'builds/%s/%s' % (base_version, build_number)
-    subprocess.check_call(['git', 'tag', tag])
-
-    import appcast
-    appcast_text = appcast.generate_appcast(image_source_path, updates_template_file, build_number, updates_signing_key_file)
-    with open(os.path.join(release_dir, updates_appcast_file), 'w') as appcast_file:
-        appcast_file.write(appcast_text)
-
-    import shutil
-    copied_image = os.path.join(release_dir, os.path.basename(image_source_path))
-    unversioned_image = os.path.join(release_dir, artifact_prefix + ".dmg")
-    shutil.copyfile(image_source_path, copied_image)
-    shutil.copyfile(image_source_path, unversioned_image)
-
-    publish_release_notes_file = os.path.join(release_dir, os.path.basename(release_notes_file))
-    shutil.copyfile(release_notes_file, publish_release_notes_file)
-    publish_release_notes_filebase, publish_release_notes_ext = os.path.splitext(publish_release_notes_file)
-    publish_release_notes_version_file = "%s-%s%s" % (publish_release_notes_filebase, build_number, publish_release_notes_ext)
-    shutil.copyfile(release_notes_file, publish_release_notes_version_file)
-
-
-def build(args):
-    if args.config == "debug":
-        debug()
-    if args.config == "release":
-        release()
-
-
-def assert_clean():
-    0
-    # status = check_string_output(["git", "status", "--porcelain", "--untracked-files=no"])
-    # if len(status):
-    #     raise BuildError("Working copy must be clean\n%s" % status)
-
-
-def assert_branch(branch="master"):
-    ref = check_string_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
-    if ref != branch:
-        raise BuildError("HEAD must be %s, but is %s" % (branch, ref))
-
-
-def build_scheme(scheme, config):
-    xcodebuild(scheme, workspace, config, ["build"])
-
-
-def clean_scheme(scheme, config):
-    xcodebuild(scheme, workspace, config, ["clean"])
-
-
-def commit_count():
-    count = check_string_output(["git", "rev-list", "HEAD", "--count"])
-    return count
-
-
-def set_versions(base_version, build_number, label):
-    print("mvers: " + check_string_output(["agvtool", "mvers", "-terse1"]))
-    print("vers:  " + check_string_output(["agvtool", "vers", "-terse"]))
-    marketing_version = "%s.%s %s" % (base_version, build_number, label)
-    build_version = "%s.%s" % (base_version, build_number)
-    subprocess.check_call(["agvtool", "new-marketing-version", marketing_version])
-    subprocess.check_call(["agvtool", "new-version", "-all", build_version])
-
-
-def xcodebuild(scheme, workspace, config, commands):
-    cmd = ["xcrun", "xcodebuild", "-workspace", workspace, "-scheme", scheme, "-configuration", config]
-    cmd = cmd + commands
-    cmd.append('BUILD_DIR=%s' % (build_base_dir))
-    try:
-        output = check_string_output(cmd)
-        return output
-    except subprocess.CalledProcessError as e:
-        raise BuildError(str(e))
-
-
-def check_string_output(command):
-    return subprocess.check_output(command).decode('utf-8').strip()
-
-
-def sign_app(app_path):
-    sign.sign_everything_in_app(app_path, key=signing_key)
-
-
-def package_app(app_path, image_path, image_name):
-    package.package(app_path, image_path, image_name)
 
 if __name__ == "__main__":
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-
     parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers()
-
-    parser_config = subparsers.add_parser('config')
-    parser_config.add_argument('config', choices=['debug', 'release'])
-    parser_config.set_defaults(func=clean)
-
-    parser_build = subparsers.add_parser('build')
-    parser_build.add_argument('config', choices=['debug', 'release'])
-    parser_build.set_defaults(func=build)
+    parser.add_argument('action', choices=['debug', 'release', 'clean'], nargs='?', default='debug')
+    parser.set_defaults(func=build_cmd)
 
     args = parser.parse_args()
     args.func(args)

Scripts/helpers.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+
+import subprocess
+import base64
+
+class BuildError(RuntimeError):
+    pass
+
+
+def sign_file(filename, signing_key_file):
+    hashProc = subprocess.Popen(['openssl', 'dgst', '-sha1', '-binary', filename],
+                                stdout=subprocess.PIPE)
+    hash = hashProc.communicate()[0]
+    signProc = subprocess.Popen(['openssl', 'dgst', '-dss1', '-sign', signing_key_file],
+                                stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    signProc.stdin.write(hash)
+    binsig = signProc.communicate()[0]
+    return base64.b64encode(binsig).decode()
+
+
+def check_string_output(command):
+    return subprocess.check_output(command).decode('utf-8').strip()
+
+
+def assert_clean():
+    status = check_string_output(["git", "status", "--porcelain", "--untracked-files=no"])
+    if len(status):
+        raise BuildError("Working copy must be clean\n%s" % status)
+
+
+def assert_branch(branch="master"):
+    ref = check_string_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+    if ref != branch:
+        raise BuildError("HEAD must be %s, but is %s" % (branch, ref))
+
+
+def set_version(build_version, label):
+    marketing_version = build_version
+    if label != None:
+        marketing_version += " %s" % (label)
+    subprocess.check_call(["xcrun", "agvtool", "new-marketing-version", marketing_version])
+    subprocess.check_call(["xcrun", "agvtool", "new-version", "-all", build_version])
+
+
+def xcodebuild(scheme, workspace, config, commands, build_dir):
+    cmd = ["xcrun", "xcodebuild", "-workspace", workspace, "-scheme", scheme, "-configuration", config]
+    cmd = cmd + commands
+    cmd.append('BUILD_DIR=%s' % (build_dir))
+    try:
+        output = check_string_output(cmd)
+        return output
+    except subprocess.CalledProcessError as e:
+        raise BuildError(str(e))
+

Scripts/package.py

@@ -10,6 +10,9 @@
 import shutil
 import os
 
+class PackageError(RuntimeError):
+    pass
+
 def package(app, bundle, name, verbose=False):
     appBase = os.path.dirname(app)
     appName = os.path.basename(app)
@@ -26,8 +29,10 @@ def package(app, bundle, name, verbose=False):
                'create', bundle,
                '-srcfolder', tmp_dir,
                '-volname', name]
-    
-    subprocess.call(hdiutil)
+
+    ret = subprocess.call(hdiutil)
+    # if ret != 0:
+        # raise PackageError("Failed to package error: ")
     shutil.move(movedApp, app)
     shutil.rmtree(tmp_dir)