Major overhaul; kill shell scripts and use ruby

* Adds truckload of options
* No longer requires edition of the scripts to change small things on the build
* Adaptative packing of output binaries (based on the architectures you chose to build for)
* Accepts user input for setup
* Colors!

Author: biasedbit

.gitignore

@@ -1,6 +1,3 @@
 .DS_Store
-bin
-src
-include
-lib
-*.tar.*
+build
+curl

README.md

@@ -1,22 +1,21 @@
-Curl iOS build script
-=====================
+Curl iOS build utility
+======================
 
 Script to build curl for iOS. Supports:
 
 - iPhoneSimulator (i386)
-- newer iPhones/iPads (arm v7)
+- newer iPhones/iPads (arm v7/7s)
 
 Curl version `7.27.0` and above now supports native (Dawrwin) SSL so the other alternatives (GnuTLS and OpenSSL) have been removed. The script now compiles `libcurl.a` with SSL support at no additional binary size (yay!).
 
-> **NOTES**  
-> 1. These scripts **no longer compile for armv6**, you must manually change the files if you wish to add support.
+To list all possible options and flags, run `./build_curl --help`.
 
 
 ## Default configuration
 
 The script is configured to produce the smallest binary possible, with Curl being configured only to support HTTP and HTTPS protocols (no FTP, DICT, FILE, etc).
 
-Make sure you take a peek at `build.sh` and change the vars according to your needs.
+Run `./build_curl --help` to list out all the options.
 
 
 ## Using on your project
@@ -35,20 +34,26 @@ You need to add the following frameworks:
 
 ## Optimizing for space on your apps
 
-The scripts generates three binary files:
+The scripts generates different binary files, depending on how you configure it:
 
-1. One with all the architectures combined (i386 and armv7), recommended for iOS development (runs both on simulator and phones);
-2. One with just i386, to use on OSX development;
-3. One with just armv7, to use on phones;
+* A binary output file for each architecture
+* A binary with all arm architectures together (if you compile with armv6 and armv7, you'll get a single arm binary that contains both architectures)
+* A binary output file with i386 only (unless you don't build for i386)
+* A binary output file with all of the architectures combined
 
-When you're about to build the final release (to submit to the app store), you should use the third one, as it is slightly smaller in size.
+When you're about to build the final release (to submit to the AppStore), you should use the combined arm binary. The i386 binary is only required for the simulator, so keeping it off the AppStore build means you can shave off a couple hundred KBs on your final package.
 
 > **ProTip™**  
 > Use different build targets, and include different variations of the above files in each of them so this process is automatic.
 
 
 ## Acknowledgments
 
-These scripts are based on the excellent work of [Felix Schulze (x2on)](https://github.com/x2on), with some help from [Bob](http://stackoverflow.com/questions/9039554/using-libcurl-on-ios-5-as-an-alternative-to-nsurlconnection/9528936#9528936).
+This repository has dramatically changed over time, having begun with a bunch of shell scripts and evolving to a streamlined ruby script. The original scripts were based on the excellent work of [Felix Schulze (x2on)](https://github.com/x2on), with some help from [Bob](http://stackoverflow.com/questions/9039554/using-libcurl-on-ios-5-as-an-alternative-to-nsurlconnection/9528936#9528936).
 
-Also huge thanks to [Jonas Schnelli](https://github.com/jonasschnelli) for the pull request that included native Darwin SSL support.
+Also **huge** thanks to [Jonas Schnelli](https://github.com/jonasschnelli) for the pull request that included native Darwin SSL support.
+
+
+## License
+
+Seriously? ...

build-libcurl.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+require_relative 'lib/curl_builder'
+
+module CurlBuilder
+  class Orchestrator
+    include CurlBuilder::Logging
+
+    def build
+      configuration = Parser.new.parse(ARGV)
+      return if configuration[:setup][:clean_and_exit]
+
+      CurlBuilder.logger.level = Logger.const_get(configuration[:setup][:log_level].upcase.to_sym)
+
+      # Start building
+      Preparer.new(configuration: configuration).prepare
+      compiled_archs = Compiler.new(configuration: configuration).compile
+      error { 'Compilation failed for all requested architectures.' } if compiled_archs.empty?
+      return if compiled_archs.empty?
+
+      packed = Packer.new(configuration: configuration).pack(compiled_archs)
+      if packed.empty?
+        error { 'Unable to pack any of the output binaries' }
+        error { "To determine the cause, please run again with '#{param('--log-level debug --verbose')}'." }
+      else
+        cenas = packed.collect { |k, v| "#{k} (#{v.join(', ')})" }.join(', ')
+        info { "Build complete with output binaries: #{param(cenas)}" }
+        info { "Output can be found on the '#{param('curl')}' folder" }
+      end
+    rescue Errors::TaskError => e
+      error { "Build failed, output follows:\n#{black('----')}\n#{gray(e.message)}\n#{black('----')}" }
+    ensure
+      Cleaner.new(configuration: configuration).cleanup unless configuration.nil?
+    end
+
+    def log_id
+      ' BUILD '
+    end
+  end
+end
+
+CurlBuilder::Orchestrator.new.build

build_curl

@@ -0,0 +1,99 @@
+require 'logger'
+require 'optparse'
+require 'fileutils'
+require 'open3'
+
+
+require_relative 'curl_builder/errors'
+require_relative 'curl_builder/paths'
+require_relative 'curl_builder/logging'
+require_relative 'curl_builder/configurable_step'
+
+# Steps
+require_relative 'curl_builder/parser'
+require_relative 'curl_builder/preparer'
+require_relative 'curl_builder/compiler'
+require_relative 'curl_builder/packer'
+require_relative 'curl_builder/cleaner'
+
+
+# Phases
+#   1. Read stdin: Parser
+#   2. Download lib and create folders: Preparer
+#   3. For each arch, compile: Compiler
+#   4. Create output: Wrapper
+#   5. Cleanup: Cleaner
+
+module CurlBuilder
+  extend self
+
+
+  # Defaults
+
+  DEFAULT_PROTOCOLS = {
+    'http'   => true,
+    'rtsp'   => false,
+    'ftp'    => false,
+    'file'   => false,
+    'ldap'   => false,
+    'ldaps'  => false,
+    'rtsp'   => false,
+    'dict'   => false,
+    'telnet' => false,
+    'tftp'   => false,
+    'pop3'   => false,
+    'imap'   => false,
+    'smtp'   => false,
+    'gopher' => false
+  }
+
+  DEFAULT_FLAGS = {
+    'darwinssl' => true,
+    'ssl'       => false,
+    'libssh2'   => false,
+    'librtmp'   => false,
+    'libidn'    => false,
+    'ca-bundle' => false
+  }
+
+  DEFAULT_SETUP = {
+    log_level:          'info', # debug, info, warn, error
+    verbose:            false,
+    sdk_version:        '6.0',
+    libcurl_version:    '7.27.0',
+    architectures:      %w(i386 armv7 armv7s),
+    xcode_home:         '/Applications/Xcode.app/Contents/Developer',
+    run_on_dir:         Dir::pwd,
+    work_dir:           'build',
+    result_dir:         'curl',
+    clean_and_exit:     false,
+    cleanup:            true,
+  }
+
+  VALID_ARGS = {
+    architectures: %w(i386 armv6 armv7 armv7s)
+  }
+
+
+  attr_accessor :logger
+
+
+  def logger
+    @logger ||= Logger.new($stdout)
+  end
+
+
+  # Helper functions
+
+  def build_protocols(protocols)
+    protocols.collect { |protocol, enabled| enabled ? "--enable-#{protocol}" : "--disable-#{protocol}" }
+  end
+
+  def build_flags(flags)
+    flags.collect { |flag, enabled| enabled ? "--with-#{flag}" : "--without-#{flag}" }
+  end
+
+  def filter_valid_archs(archs)
+    VALID_ARGS[:architectures] & archs
+  end
+end

clean.sh

@@ -0,0 +1,35 @@
+module CurlBuilder
+  class Cleaner < ConfigurableStep
+    include Paths
+    include Logging
+
+
+    # Creation
+
+    def initialize(options = {})
+      super options
+    end
+
+
+    # ConfigurableStep
+
+    def log_id
+      ' CLEAN '
+    end
+
+
+    # Interface
+
+    def cleanup
+      unless setup(:cleanup)
+        debug { "Skipping cleanup..." }
+        return
+      end
+
+      info { "Cleaning up..." }
+      FileUtils.rm_rf work_dir
+
+      FileUtils.rm_rf result_dir if setup(:clean_and_exit)
+    end
+  end
+end