testflight 0.1.2 → 0.1.4

data/README.rdoc

@@ -2,46 +2,56 @@
 
 If you are an iOS developer, like me, you probably have dealt with the tedious 
 tasks of manually building, packaging, tagging, commiting and deploying your 
-iOS applications to testflightapp.com. Your probably wondered if there is an easier way to do so.
+iOS applications to testflightapp.com. You are probably wondering if there is a better way to do so.
 
 Well, you are absolutely right! This gem is going to make your life much easier. Here is what it does:
 
-1. Reads your XCode project defintion to get your app version and build number 
+1. Reads your XCode project info file to get your app version and build number 
 2. Commits all your changes to the git repository
 3. Builds your project (or workspace)
 4. Packages your application into an IPA file
 5. Uploads the IPA file to testflightapp.com
 6. Tags your project with the version and build
 7. Increments your app build number and commits it to the repo
+8. Keeps a log of all your deployments to testflightapp.com in a FLIGHTLOG file
 
 All that with a simple command:
 
-$ takeoff
+$ testflight takeoff
 
 
 = Configuration
 
-All you have to do is add .tesflight file to your project folder with the following content:
+To setup your project with the deployment script, run the following command:
+
+  $ testflight checkin
+
+This command will ask you a few questions that will guide you through a configuration process.
+If you don't like being asked questions and prefer to do it manually, just create a .tesflight file 
+in your iOS project folder and provide the following information:
 
   build:
-    developer_name:     # This must be your company name or your name as it appears in your certificate
-    increment_bundle:   true
-    commit_changes:     true
+    developer_name:     # This must be your company name or your name as it appears in your .cer from Apple
+    increment_bundle:   true  # If you want each deployment to increment your build number
+  git:
+    commit_changes:     true   # if you are using git and would like to push changes before each build 
+    tag_build:          true   # will tag each build in git
   testflight: 
     api_token:          # Get it from https://testflightapp.com/account/#api
     team_token:         # Get it from https://testflightapp.com/dashboard/team/edit/
-    distribution_lists: ["Internal", "Everyone"] # Configure your distribution lists on https://testflightapp.com
+    distribution_lists: ["Internal", "Everyone"] # Configure your distribution lists at https://testflightapp.com
 
 
-Then go to your project folder and simple type:
+= Execution
 
-$ takeoff
+Once you have checked in (you only need to do it once per project), you are ready for takeoff. Go to your project folder and simple type:
 
+   $ testflight takeoff
 
 Have a safe flight!
 
 
-= Contributions
+= Contribution
 
 Clone the repository, make any changes you like and send me a pull request.
 

data/bin/testflight

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+# Abort beautifully with ctrl+c.
+Signal.trap(:INT) { abort "\nAborting testflight task." }
+
+['cli.rb', 'builder.rb', 'config.rb'].each do |f|
+  require File.expand_path(File.join(File.dirname(__FILE__), "../lib/testflight/#{f}"))
+end
+
+# require 'testflight'
+Testflight::Cli.start

data/lib/templates/testflight.yml.erb

@@ -0,0 +1,10 @@
+build:
+  developer_name:     "<%= @company_name %>"
+  increment_bundle:   <%= @should_increment_bundle == true %>
+git:  
+  commit_changes:     <%= @should_commit_changes == true %>
+  tag_build:          <%= @should_tag_build == true %>
+testflight: 
+  api_token:          <%= @api_token %>
+  team_token:         <%= @team_token %>
+  distribution_lists: [<%=@teams.collect{|t| "\"#{t}\""}.join(", ")%>]

data/lib/testflight.rb

@@ -0,0 +1,28 @@
+#--
+# Copyright (c) 2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module Testflight
+  autoload :Cli,      'testflight/cli'
+  autoload :Builder,  'testflight/builder'
+  autoload :Config,   'testflight/config'
+end

data/lib/testflight/builder.rb

@@ -0,0 +1,212 @@
+#--
+# Copyright (c) 2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'appscript'
+require 'yaml'
+
+module Testflight
+  class Builder
+
+    XCODE_BUILDER       = "/usr/bin/xcodebuild"
+    XCODE_PACKAGER      = "/usr/bin/xcrun"
+    TESTFLIGHT_ENDPOINT = "http://testflightapp.com/api/builds.json"
+
+    include Appscript
+
+    def initialize(opts = {})
+      t0 = Time.now
+
+      if Testflight::Config.commit_changes?
+        commit_changes(opts)
+      end
+      
+      if Testflight::Config.tag_build?
+        tag_build(opts)
+      end
+
+      if Testflight::Config.workspace?
+        build_workspace(opts)
+        package_workspace(opts)
+      else
+        build_project(opts)
+        package_project(opts)
+      end  
+      
+      upload_to_testflightapp(opts)
+      
+      append_log_entry(opts)
+
+      if Testflight::Config.increment_bundle?
+        increment_bundle_version(opts)
+        if Testflight::Config.commit_changes?
+          commit_changes(opts.merge(:message => "Incrementing build number to #{Testflight::Config.project_version}"))
+        end
+      end
+
+      t1 = Time.now
+
+      puts("Build took #{t1-t0} seconds.")
+    end
+
+    ####################################################################################
+    ## Building Project 
+    ####################################################################################
+
+    def build_workspace(opts = {})
+      cmd = "#{XCODE_BUILDER} -workspace '#{Testflight::Config.workspace_name}' "
+      cmd << "-scheme '#{Testflight::Config.application_name}' "
+      cmd << "-sdk 'iphoneos6.0' "
+      cmd << "-configuration 'AdHoc' "
+      cmd << "-arch 'armv6 armv7' "
+      cmd << "CONFIGURATION_BUILD_DIR='#{Testflight::Config.build_dir}' "
+      execute(cmd, opts)
+    end
+
+    def build_project(opts = {})
+      cmd = "#{XCODE_BUILDER} -target '#{Testflight::Config.application_name}' "
+      cmd << "-sdk 'iphoneos6.0' "
+      cmd << "-configuration 'AdHoc' "
+      execute(cmd, opts)
+    end
+
+    ####################################################################################
+    ## Packaging Project 
+    ####################################################################################
+
+    def package_workspace(opts = {})
+      cmd = "#{XCODE_PACKAGER} -sdk iphoneos PackageApplication "
+      cmd << "-v '#{Testflight::Config.build_dir}/#{Testflight::Config.application_name}.app' "
+      cmd << "-o '#{Testflight::Config.distribution_file}' "
+      cmd << "--sign '#{Testflight::Config.developer_name}' "
+      cmd << "--embed '#{Testflight::Config.provisioning_dir}/#{Testflight::Config.ad_hoc_provisioning_name}'"
+      execute(cmd, opts)
+    end
+
+    def package_project(opts = {})
+      cmd = "#{XCODE_PACKAGER} -sdk iphoneos PackageApplication "
+      cmd << "-v '#{Testflight::Config.build_dir}/AdHoc-iphoneos/#{Testflight::Config.application_name}.app' "
+      cmd << "-o '#{Testflight::Config.distribution_file}' "
+      cmd << "--sign '#{Testflight::Config.developer_name}' "
+      cmd << "--embed '#{Testflight::Config.provisioning_dir}/#{Testflight::Config.ad_hoc_provisioning_name}'"
+      execute(cmd, opts)
+    end
+
+    ####################################################################################
+    ## Uploading Project 
+    ####################################################################################
+
+    def upload_to_testflightapp(opts = {})
+      cmd = "curl #{TESTFLIGHT_ENDPOINT} "
+      cmd << "-F file=@#{Testflight::Config.distribution_file} "
+      cmd << "-F api_token=#{Testflight::Config.api_token} "
+      cmd << "-F team_token=#{Testflight::Config.team_token} "
+      cmd << "-F notify=#{opts[:notify]} "
+      cmd << "-F distribution_lists=#{opts[:teams].join(",")} "
+      cmd << "-F notes='#{opts[:message]}'"
+      execute(cmd, opts)
+    end
+
+    ####################################################################################
+    ## Project Versioning
+    ####################################################################################
+
+    def increment_bundle_version(opts = {})
+      # Check if build numbers are numeric
+      build_number = Testflight::Config.build_number.to_i 
+      build_number += 1
+
+      puts("\r\nIncrementing build number to #{build_number}...")
+
+      return if opts[:cold]
+      Testflight::Config.project_info["CFBundleVersion"] = build_number.to_s
+      
+      File.open(Testflight::Config.project_info_path, "w") do |f| 
+        f.write(Testflight::Config.project_info.to_plist) 
+      end
+    end
+
+    ####################################################################################
+    ## Git Support
+    ####################################################################################
+    def commit_changes(opts = {})
+      execute("git add .", opts.merge(:ignore_result => true))
+      execute("git add . --update", opts.merge(:ignore_result => true))
+      execute("git commit -m '#{opts[:message]}'", opts.merge(:ignore_result => true))
+      execute("git push", opts.merge(:ignore_result => true))
+    end
+
+    def tag_build(opts = {})
+      execute("git tag -a #{Testflight::Config.project_version_short} -m 'Release #{Testflight::Config.project_version}'", opts.merge(:ignore_result => true))
+    end
+
+    ####################################################################################
+    ## FlightLog Support
+    ####################################################################################
+    def append_log_entry(opts)
+      lines = []
+      lines << "#{Testflight::Config.application_name} #{Testflight::Config.project_version}"
+      lines << "Deplyed On: #{Time.now}"
+      lines << "Distributed To: #{opts[:teams].join(", ")}"
+      lines << "Notified By Email: #{opts[:notify]}"
+      lines << "Notes: #{opts[:message]}"
+      lines << "---------------------------------------------------------------------------"
+
+      log = "FLIGHTLOG"
+      tmp = log + "~"
+
+      File.open(tmp, "w") do |newfile|
+        lines.each do |line|
+          newfile.puts(line)
+        end
+
+        if File.exist?(log)
+          File.open(log, "r+") do |oldfile|
+            oldfile.each_line do |line| 
+              newfile.puts(line) 
+            end
+          end
+        end
+      end
+
+      File.delete(log) if File.exist?(log)
+      File.rename(tmp, log)
+    end
+
+    ####################################################################################
+    ## Command Support
+    ####################################################################################
+    def execute(cmd, opts = {})
+      puts("\r\n$ " + cmd)
+      return if opts[:cold]
+
+      result = system(cmd)
+      return if opts[:ignore_result]
+
+      unless result
+        puts("Build failed.")
+        exit 1
+      end      
+    end    
+
+  end
+end

data/lib/testflight/cli.rb

@@ -0,0 +1,195 @@
+#--
+# Copyright (c) 2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'thor'
+
+module Testflight
+  class Cli < Thor
+    include Thor::Actions
+
+    class << self
+      def source_root
+        File.expand_path('../../',__FILE__)
+      end
+    end
+
+    map 'c' => :checkin
+    map 't' => :takeoff
+
+    desc 'checkin', 'Initializes project configuration file and prepares you for takeoff'
+    def checkin
+      return unless is_project_folder?
+
+      say("\r\nConfiguring #{Testflight::Config.application_name} #{Testflight::Config.type} for deployment to testflightapp.com...")
+      say("Please answer the following questions to prepare you for takeoff.")
+
+      ["Provisioning", "Distributions", "build"].each do |name| 
+        create_folder(name)
+      end
+
+      @company_name = ask("\r\nWhat is the name of your company, as it appears in your .cer file from Apple?")
+      @should_increment_bundle = yes?("\r\nWould you like to automatically increment build numbers (bundle value) for every deployment? (y/n)")
+
+      if yes?("\r\nDo you use git as your SCM? (y/n)")
+        @should_commit_changes = yes?("\r\nWould you like to commit and push your changes to git as the first step of your deployment? (y/n)")
+        if @should_increment_bundle
+          @should_tag_build = yes?("\r\nWould you like to tag every build in git with the version/build number? (y/n)")
+        end
+      end
+
+      say("\r\nFor the next question, please get your API TOKEN from the following URL: https://testflightapp.com/account/#api")
+      @api_token = ask("Paste your API TOKEN here:")
+
+      say("\r\nFor the next question, please get your TEAM TOKEN from the following URL: https://testflightapp.com/dashboard/team/edit")
+      @team_token = ask("Paste your TEAM TOKEN here:")
+
+      @teams = ask("\r\nPlease enter your distribution lists as you have set them up on testflight (separate team names with a comma):")
+      @teams = @teams.split(",").collect{|t| t.strip}
+
+      template 'templates/testflight.yml.erb', "./#{Testflight::Config.path}"
+
+      update_git_ignore
+
+      say("\r\nConfiguration file '.testflight' has been created. You can edit it manually or run the init command again.")
+      say("\r\nOnly a few steps left, but make sure you do them all.")
+      say("\r\n1). Copy your Ad Hoc Provisioning Profile (.mobileprovision) into the 'Provisioning' folder.")
+      say("2). Create a new build profile called AdHoc and make sure you set it as the default profile for command line builds.")
+      say("\r\nOnce you are done, you can run: testflight takeoff")
+    end
+
+    desc 'takeoff', 'Builds and deploys your project based on your configuration.'
+    method_option :cold, :type => :boolean, :aliases => "c", :required => false
+    def takeoff
+      return unless ready_for_takeoff?
+
+      say("Preparing #{Testflight::Config.application_name} #{Testflight::Config.type} #{Testflight::Config.project_version} for deployment to testflightapp.com...")
+
+      @message = ask("\r\nWhat changes did you make in this build?")
+      @teams = ask_with_multiple_options("\r\nWhich team(s) would you like to distirbute the build to? Provide team number(s, separated by a comma)",
+                                         Testflight::Config.distribution_lists)
+
+      @notify = yes?("\r\nWould you like to notify the team members by email about this build? (y/n)")
+      
+      Testflight::Builder.new(:message => @message, :teams => @teams, :notify => @notify, :cold => options['cold'])
+
+      say("\r\nCongratulations, the build has been deployed! Have a safe flight!")
+      say("")
+    end
+
+    protected
+    
+    def is_project_folder?
+      unless Testflight::Config.application_name
+        say("This folder does not contain an xCode project or a workspace.")
+        say("Please run this command in the folder where you have the project or workspace you want to deploy.")
+        return false
+      end
+
+      true
+    end
+
+    def ready_for_takeoff?
+      return false unless is_project_folder?
+
+      unless File.exists?(Testflight::Config.path)
+        say("Project configuration file does not exist. Please run 'testflight checkin' first.")
+        return false
+      end
+
+      unless Testflight::Config.ad_hoc_provisioning_name
+        say("Please copy your Ad Hoc Provisioning Profile into the Provisioning folder.")
+        return false
+      end
+
+      unless Testflight::Config.project_info_path
+        say("Cannot locate #{Testflight::Config.project_info_file_name} file. Please make sure such file exists in your project.")
+        return false
+      end
+
+      true
+    end
+
+    def create_folder(name)
+      return if File.exist?("#{Dir.pwd}/#{name}")
+      say("Creating folder: #{name}")
+      FileUtils.mkdir(name)
+    end
+
+    # Remove the new files from git commits
+    def update_git_ignore
+      lines = File.exist?('.gitignore') ? File.open('.gitignore').readlines : []
+      
+      changed = false
+      ['build', 'Distributions', 'Provisioning', '.testflight'].each do |name|
+        next if lines.include?(name)
+        lines << name
+        changed = true
+      end
+      return unless changed
+
+      File.open('.gitignore', "w") do |f| 
+        lines.each do |line|
+          f.write(line + "\n") 
+        end
+      end
+    end
+
+    def ask_for_info(question=nil, prompt="> ", allow_blank=false)
+      say(question) if question
+      
+      $stdout.print(prompt)
+      
+      $stdin.each_line do |line|
+        value = line.strip.downcase
+        return value if allow_blank 
+        return value unless value.empty?
+        $stdout.print(prompt)
+      end  
+    end
+
+    def collect_option_selections(opts)
+      lists = []
+      vals = ask_for_info(nil, prompt="? ") 
+      vals.split(",").each do |index|
+        index = index.to_i - 1
+        return nil if index<0 or index>=opts.size
+        lists << opts[index]
+      end
+      lists
+    end 
+
+    def ask_with_multiple_options(question, opts = [])
+      say(question)
+      opts.each_with_index{ |opt, index| say("\t#{index+1}) #{opt}") }
+      
+      vals = collect_option_selections(opts)
+      while vals.nil?
+        say("Invalid selection, please try again.")
+        vals = collect_option_selections(opts)
+      end
+      
+      vals
+    end
+
+  end
+end

data/lib/testflight/config.rb

@@ -23,7 +23,6 @@
 
 require 'fileutils'
 require 'yaml'
-require 'pp'
 require 'plist'
 
 module Testflight
@@ -33,69 +32,57 @@ module Testflight
       '.testflight'
     end
 
-    def self.defaults
-      {
-        "build"       => {
-          "developer_name"      => "As it appears in your Apple certificate",
-          "increment_bundle"    => true,
-          "commit_changes"      => true
-        },
-        "testflight"  => {
-          "api_token"           => "Get it from https://testflightapp.com/account/#api",
-          "team_token"          => "Get it from https://testflightapp.com/dashboard/team/edit/",
-          "distribution_lists"  => [""]
-        }
-      }
-    end
+    ##################################################
+    ## Configuration Attributes
+    ##################################################
 
     def self.config
-      @config ||= begin
-        if File.exist?(path) 
-          YAML::load(File.open(path)) 
-        else
-          File.open(path, "w") do |f| 
-            f.write(defaults.to_yaml) 
-          end
-          raise "Please update #{path} with all necessary properties."
-        end
-      end
+      @config ||= YAML::load(File.open(path)) 
     end
 
-    def self.commit_changes?
-      config["build"]["commit_changes"]
+    def self.build
+      config["build"]
+    end
+
+    def self.developer_name
+      build["developer_name"]
     end
 
     def self.increment_bundle?
-      config["build"]["increment_bundle"]
+      build["increment_bundle"]
     end
 
-    def self.developer_name
-      config["build"]["developer_name"]
+    def self.git
+      config["git"]
+    end
+
+    def self.commit_changes?
+      git["commit_changes"]
+    end
+
+    def self.tag_build?
+      git["tag_build"]
+    end
+
+    def self.testflight
+      config["testflight"]
     end
 
     def self.distribution_lists
-      config["testflight"]["distribution_lists"]
+      testflight["distribution_lists"]
     end
 
     def self.api_token
-      config["testflight"]["api_token"]
+      testflight["api_token"]
     end
 
     def self.team_token
-      config["testflight"]["team_token"]
+      testflight["team_token"]
     end
 
-    def self.valid?
-      return false unless config
-      return false if config.empty?
-      return false if config["build"].nil? 
-      return false if config["build"]["developer_name"].nil?
-      return false if config["testflight"].nil? 
-      return false if config["testflight"]["api_token"].nil?
-      return false if config["testflight"]["team_token"].nil?
-      return false if config["testflight"]["distribution_lists"].nil?
-      true
-    end
+    ##################################################
+    ## Helper Methods
+    ##################################################
 
     def self.project_dir
       Dir.pwd
@@ -158,42 +145,16 @@ module Testflight
     end
 
     def self.distribution_file
-      "#{distributions_dir}/#{application_name}.ipa"
+      "#{distributions_dir}/#{application_name}_#{project_version_short}.ipa"
     end
 
-    def self.setup
-      unless application_name
-        pp "This folder does not contain an xCode project or a workspace."
-        exit 1
-      end
-
-      unless valid?
-        pp "Ensure that you have provided all of the information in the #{config_file} config file"
-        exit 1
-      end
-
-      unless project_files.include?("Distributions")
-        FileUtils.mkdir("Distributions")
-        @project_files = nil
-      end
-
-      unless project_files.include?("Provisioning")
-        FileUtils.mkdir("Provisioning")
-        @project_files = nil
-      end
-
-      unless ad_hoc_provisioning_name
-        pp "Please copy your Ad Hoc Provisioning Profile into the provisioning folder."
-        exit 1
-      end
+    def self.project_info_file_name
+      "#{application_name}-Info.plist"
     end
 
     def self.project_info_path
-      files = Dir["**/#{application_name}-Info.plist"]
-      if files.empty?
-        pp "Cannot locate #{application_name}-Info.plist file. Please make sure such file exists in your project."
-        exit 1
-      end
+      files = Dir["**/#{project_info_file_name}"]
+      return nil if files.empty? 
       files.first
     end
 

data/lib/testflight/version.rb

@@ -22,7 +22,7 @@
 #++
 
 module Testflight
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testflight
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -27,19 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: Mechanism for building, packaging, tagging and deploying XCode projects
+description: Mechanism for building, packaging, tagging and deploying xCode projects
   to testflightapp.com
 email:
 - theiceberk@gmail.com
 executables:
-- takeoff
+- testflight
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/takeoff
+- bin/testflight
+- lib/templates/testflight.yml.erb
+- lib/testflight/builder.rb
+- lib/testflight/cli.rb
 - lib/testflight/config.rb
-- lib/testflight/prompter.rb
 - lib/testflight/version.rb
+- lib/testflight.rb
 - LICENSE
 - README.rdoc
 homepage: https://github.com/berk/testflight

data/bin/takeoff

@@ -1,182 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pp'
-
-require File.expand_path(File.join(File.dirname(__FILE__), "../lib/testflight/config.rb"))
-require File.expand_path(File.join(File.dirname(__FILE__), "../lib/testflight/prompter.rb"))
-
-XCODE_BUILDER       = "/usr/bin/xcodebuild"
-XCODE_PACKAGER      = "/usr/bin/xcrun"
-TESTFLIGHT_ENDPOINT = "http://testflightapp.com/api/builds.json"
-
-# read project definition
-# read app version and build number
-# add all files to git and commit files
-# tag git with the version and build
-# build files 
-# package files
-# deploy to testflight app
-
-####################################################################################
-## Building Project 
-####################################################################################
-
-def build_workspace
-  cmd = "#{XCODE_BUILDER} -workspace '#{Testflight::Config.workspace_name}' "
-  cmd << "-scheme '#{Testflight::Config.application_name}' "
-  cmd << "-sdk 'iphoneos6.0' "
-  cmd << "-configuration 'AdHoc' "
-  cmd << "-arch 'armv6 armv7' "
-  cmd << "CONFIGURATION_BUILD_DIR='#{Testflight::Config.build_dir}' "
-  pp "Building Workspace..."
-  pp cmd
-  unless system(cmd)
-    pp "Failed to build workspace"
-    exit 1
-  end
-end
-
-def build_project
-  cmd = "#{XCODE_BUILDER} -target '#{Testflight::Config.application_name}' "
-  cmd << "-sdk 'iphoneos6.0' "
-  cmd << "-configuration 'AdHoc' "
-
-  pp "Building Project..."
-  pp cmd
-  unless system(cmd)
-    pp "Failed to build project"
-    exit 1
-  end
-end
-
-####################################################################################
-## Packaging Project 
-####################################################################################
-
-def package_workspace
-  cmd = "#{XCODE_PACKAGER} -sdk iphoneos PackageApplication "
-  cmd << "-v '#{Testflight::Config.build_dir}/#{Testflight::Config.application_name}.app' "
-  cmd << "-o '#{Testflight::Config.distribution_file}' "
-  cmd << "--sign '#{Testflight::Config.developer_name}' "
-  cmd << "--embed '#{Testflight::Config.provisioning_dir}/#{Testflight::Config.ad_hoc_provisioning_name}'"
-  
-  pp "Packaging Workspace..."
-  pp cmd
-  unless system(cmd)
-    pp "Failed to package workspace"
-    exit 1
-  end
-end
-
-def package_project
-  cmd = "#{XCODE_PACKAGER} -sdk iphoneos PackageApplication "
-  cmd << "-v '#{Testflight::Config.build_dir}/AdHoc-iphoneos/#{Testflight::Config.application_name}.app' "
-  cmd << "-o '#{Testflight::Config.distribution_file}' "
-  cmd << "--sign '#{Testflight::Config.developer_name}' "
-  cmd << "--embed '#{Testflight::Config.provisioning_dir}/#{Testflight::Config.ad_hoc_provisioning_name}'"
-  
-  pp "Packaging Project..."
-  pp cmd
-  unless system(cmd)
-    pp "Failed to package project"
-    exit 1
-  end
-end
-
-####################################################################################
-## Uploading Project 
-####################################################################################
-
-def upload_to_testflightapp
-  pp "Uploading to TestFlightApp..."
-
-  notes = Testflight::Prompter.read_info("What has changed in this build?")
-
-  lists = Testflight::Prompter.select_set("Which distribution lists would you like to send this build to? Select one or more lists, separated with comma.", Testflight::Config.distribution_lists)
-
-  notify = Testflight::Prompter.read_options("Would you like to notify your team members by email about this build?")
-  ["y", "yes"].include?(notify) ? notify = "true" : notify = "false"
-
-  cmd = "curl #{TESTFLIGHT_ENDPOINT} "
-  cmd << "-F file=@#{Testflight::Config.distribution_file} "
-  cmd << "-F api_token=#{Testflight::Config.api_token} "
-  cmd << "-F team_token=#{Testflight::Config.team_token} "
-  cmd << "-F notify=#{notify} "
-  cmd << "-F distribution_lists=#{lists.join(",")} "
-  cmd << "-F notes='#{notes}'"
-
-  pp cmd
-  unless system(cmd)
-    pp "Failed to upload to testflight"
-    exit 1
-  end
-end
-
-####################################################################################
-## Project Versioning
-####################################################################################
-
-def increment_bundle_version
-  Testflight::Config.project_info["CFBundleVersion"] = (Testflight::Config.build_number.to_i + 1).to_s
-  pp "Incrementing bundle version to #{Testflight::Config.build_number}..."
-  
-  File.open(Testflight::Config.project_info_path, "w") do |f| 
-    f.write(Testflight::Config.project_info.to_plist) 
-  end
-end
-
-####################################################################################
-## Git Support
-####################################################################################
-def update_git_ignore
-  # build
-  # Distributions
-  # Provisioning
-  # .testflight  
-end
-
-def commit_changes(msg)
-  system("git add .")
-  system("git add . --update")
-  system("git commit -m '#{msg}'")
-  system("git push")
-  
-  system("git tag -a #{Testflight::Config.project_version_short} -m 'Release #{Testflight::Config.project_version}'")
-end
-
-####################################################################################
-## Main 
-####################################################################################
-
-def deploy
-  Testflight::Config.setup
-
-  if Testflight::Config.commit_changes?
-    commit_changes("Preparing build #{Testflight::Config.project_version}")
-  end
-  
-  if Testflight::Config.workspace?
-    build_workspace
-    package_workspace
-  else
-    build_project
-    package_project
-  end  
-  
-  upload_to_testflightapp
-  
-  pp ""
-  
-  if Testflight::Config.increment_bundle?
-    increment_bundle_version
-    if Testflight::Config.commit_changes?
-      commit_changes("Incrementing build number to #{Testflight::Config.project_version}")
-    end
-  end
-  
-  pp "Congratulations! The app has been deployed!"
-end
-
-deploy
-
-

data/lib/testflight/prompter.rb

@@ -1,81 +0,0 @@
-#--
-# Copyright (c) 2012 Michael Berkovich
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module Testflight
-  class Prompter
-
-    def self.read_options(question=nil, opts=["Yes", "No"], vals=["y", "yes", "n", "no"], joiner = "/")
-      prompt = "(#{opts.join(joiner)})? "
-      pp question if question
-      
-      $stdout.print(prompt)
-      
-      $stdin.each_line do |line|
-        value = line.strip.downcase
-        return value if vals.include?(value)
-        $stdout.print(prompt)
-      end  
-    end
-
-    def self.read_info(question=nil, prompt="> ", allow_blank=false)
-      pp question if question
-      
-      $stdout.print(prompt)
-      
-      $stdin.each_line do |line|
-        value = line.strip.downcase
-        return value if allow_blank 
-        return value unless value.empty?
-        $stdout.print(prompt)
-      end  
-    end
-
-    def self.read_set_values(opts)
-      lists = []
-      vals = read_info(nil, prompt="? ") 
-      vals.split(",").each do |index|
-        index = index.to_i - 1
-        return nil if index<0 or index>=opts.size
-        lists << opts[index]
-      end
-      lists
-    end 
-
-    def self.select_set(question, opts = [])
-      pp question
-
-      opts.each_with_index do |opt, index|
-        pp "    #{index+1}) #{opt}"
-      end
-      
-      vals = read_set_values(opts)
-      while vals.nil?
-        pp "Invalid selection, please try again."
-        vals = read_set_values(opts)
-      end
-      
-      vals
-    end
-
-  end
-end