high_five 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODliMzU0MzVmNjgzZGY4NWRlODYwM2RlYzM5MGY5NmIwOGRlM2NmYQ==
+  data.tar.gz: !binary |-
+    YjEzMjcwM2UwNTE5YTJkY2FmNWYzNzVkYzdmN2UwMTRmNDdkMmQzNg==
+SHA512:
+  metadata.gz: !binary |-
+    ZjdmMWVhYjhhOTJhODhhMWZhMTkyODNjNWEyNDRmZTE1NmMzODdiMTFjYjBm
+    MGMwYWVjYzlmYmZiY2VhZjdkMTE0NGUzNTdiZDMxYzE4ZmFhMmEzNjQ3YTRk
+    ZWEyN2QyNGFiNTQzMzFkMDRkMzk0ZTVjYzhlM2Y3MzUyZTljNjQ=
+  data.tar.gz: !binary |-
+    OGRmY2RhMWRmZTgwOTU4YjQwOGFlODU2YmE4ZjdlYWRmMWI2ZTIxYWRjODU2
+    NGI3M2Q5ZWEyOGU3MDFhMmY1NDE1ZGIxNDYwNDE2YTdlMzcwN2I5NmM2ZDNj
+    Yjc3YTEyNzU4MDQwYjZjNjM2YTY3ZWM4YjFhMjljNjZlZTkwZjQ=

data/Gemfile.lock

@@ -1,9 +1,12 @@
 PATH
   remote: .
   specs:
-    high_five (0.1.4)
+    high_five (0.2.0)
+      coffee-script (~> 2.2.0)
       compass (~> 0.12.2)
       multi_json (~> 1.0)
+      nokogiri (>= 1.5.0)
+      plist (>= 3.0)
       sprockets (>= 2.0)
       thor (~> 0.17.0)
       uglifier (~> 2.1.1)
@@ -16,18 +19,25 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    chunky_png (1.2.8)
+    chunky_png (1.2.9)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    diff-lcs (1.2.4)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    diff-lcs (1.2.5)
+    execjs (2.0.2)
     fssm (0.2.10)
     hike (1.2.3)
-    multi_json (1.7.6)
+    mini_portile (0.5.2)
+    multi_json (1.8.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     open4 (1.3.0)
+    plist (3.1.0)
     rack (1.5.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -37,15 +47,15 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    sass (3.2.9)
-    sprockets (2.10.0)
+    sass (3.2.13)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.17.0)
     tilt (1.4.1)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     yui-compressor (0.9.6)

data/Thorfile

@@ -0,0 +1,2 @@
+$: << '.'
+require 'cleanthor/thor/tasks'

data/bin/hi5

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
 # resolve bin path, ignoring symlinks
-require "pathname"
+require 'high_five'
+require 'high_five/thor/runner'
 bin_file = Pathname.new(__FILE__).realpath
 
 # add self to libpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
-begin
-  require 'high_five'
-rescue LoadError
-  require 'rubygems'
-  require 'high_five'
-end
-require 'high_five/cli'
+# begin
+#   require 'high_five'
+# rescue LoadError
+#   require 'rubygems'
+#   require 'high_five'
+# end
+# require 'high_five/cli'
 
-HighFive::Cli.start
+$thor_runner = true
+$high_five_runner = true
+::HighFive::Thor::Runner.start

data/ext/mkrf_conf.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+require 'rbconfig'
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end 
+inst = Gem::DependencyInstaller.new
+begin
+  if RbConfig::CONFIG['host_os'] =~ /mswin|windows|cygwin/i
+    inst.install "win32-open3", "0.0.2"
+  end
+  if RUBY_VERSION < "1.9"
+    inst.install "ruby-debug-base", "~> 0.10.3"
+  else
+    inst.install "ruby-debug-base19", "~> 0.11.24"
+  end
+  rescue
+    exit(1)
+end 
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/high_five.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["brian@tenforwardconsulting.com"]
   s.homepage    = "http://github.com/tenforwardconsulting/high_five"
   s.summary     = %q{HighFive is a set of build scripts and tools for packing HTML5 apps both for the web and for phonegap}
-  s.description = %q{Build, minify, and deal with different platforms and environments for your HTML5 app.  
+  s.description = %q{Build, minify, and deal with different platforms and environments for your HTML5 app.
     This is often used with PhoneGap but designed not to require it, and high_five can be used to deploy any kind of HTML/JS/CSS-based
     application that requires different deployment configurations.
   }
@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "yui-compressor", "~>0.9.6"
   s.add_runtime_dependency "uglifier", "~>2.1.1"
   s.add_runtime_dependency "sprockets", ">=2.0"
+  s.add_runtime_dependency "coffee-script", "~>2.2.0"
+  s.add_runtime_dependency "plist", ">=3.0"
+  s.add_runtime_dependency "nokogiri", ">=1.5.0"
   s.add_development_dependency "rspec", "~>2.13.0"
 
 

data/lib/high_five/android_helper.rb

@@ -0,0 +1,24 @@
+module HighFive
+  module AndroidHelper
+    def self.project_name_from_build_xml(path)
+      File.open(path, 'r', :encoding => 'iso-8859-1').each do |line|
+        if line =~ /<project name="(.*)" /
+          return $1
+        end
+      end
+      nil
+    end
+
+    def android_manifest_path
+      platform_config = base_config.build_platform_config(:android)
+      destination_dir = platform_config.destination
+      root_dir = destination_dir
+      while true
+        glob = Dir[File.join(root_dir, "AndroidManifest.xml")]
+        return glob.first if (glob.length > 0)
+        root_dir = File.expand_path("..", root_dir)
+        raise "Couldn't find android manifest near #{destination_dir}" if root_dir == '/'
+      end
+    end
+  end
+end

data/lib/high_five/cli.rb

@@ -1,7 +1,4 @@
 require 'thor'
-require 'high_five/deploy_task'
-require 'high_five/init_task'
-require 'high_five/android_tasks'
 require 'high_five/config'
 
 module HighFive
@@ -10,6 +7,7 @@ module HighFive
     include HighFive::InitTask
     include HighFive::DeployTask
     include HighFive::AndroidTasks
+    include HighFive::DistTask
     # source root path for Thor::Actions commands
 
     class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"

data/lib/high_five/config.rb

@@ -35,8 +35,9 @@ module HighFive
                    :compass_dir,  # directory that contaings compass' config.rb
                    :dev_index,    # copy generated index.html to here on build for use in development
                    :minify,       # defaults to true in production mode and false otherwise, overridable
-                   :manifest      # generate html5 manifest
-
+                   :manifest,     # generate html5 manifest
+                   :app_name,     # App Name
+                   :app_id        # App id (com.tenforwardconsulting.myapp)
 
     def self.configure(&block) 
       @@instance = HighFive::Config.new

data/lib/high_five/ios_helper.rb

@@ -0,0 +1,34 @@
+module HighFive
+  module IosHelper
+    def IosHelper.uuid_from_mobileprovision(path)
+      uuid_found = false
+      File.open(path, 'r', :encoding => 'iso-8859-1').each do |line|
+        if uuid_found
+          line =~ /<string>(.*)<\/string>/
+          return $1
+        end
+        uuid_found = true if line =~ /UUID/
+      end
+      nil
+    end
+
+    def info_plist_path
+      root_dir = File.dirname(xcodeproj_path)
+      info =  Dir["#{root_dir}/**/*-Info.plist"].first
+      raise "Couldn't find infoplist" if info.nil?
+      return info
+    end
+
+    def xcodeproj_path
+      platform_config = base_config.build_platform_config(:ios)
+      destination_dir = platform_config.destination
+      root_dir = destination_dir
+      while true
+        glob = Dir[File.join(root_dir, "*.xcodeproj")]
+        return glob.first if (glob.length > 0)
+        root_dir = File.expand_path("..", root_dir)
+        raise "Couldn't find xcodeproj near #{destination_dir}" if root_dir == '/'
+      end
+    end
+  end
+end

data/lib/high_five/thor/runner.rb

@@ -0,0 +1,44 @@
+require "thor/runner"
+require 'high_five/thor/task'
+require 'high_five/thor/tasks'
+
+module HighFive
+  module Thor
+    class Runner < ::Thor::Runner
+
+      #this works but I hate it
+      register(HighFive::Thor::Tasks::Distribution, "dist", "dist [PLATFORM]", "Shortcut to distribution:dist")
+      register(HighFive::Thor::Tasks::Deploy, "deploy", "deploy [PLATFORM]", "Shortcut to deploy:deploy")
+      register(HighFive::Thor::Tasks::Initialization, "init", "init", "Shortcut to Initialization:init")
+
+      # Note: because of the way task.run works, there has to be a local
+      # definition. Also, we want tasks to work WITH our base namespace
+      # if it is included, so that we can use our binary with the same
+      # signature we would use thor
+      def method_missing(meth, *args)
+        meth = meth.to_s
+        #meth.sub!(/^high_five:/, '')
+        if (!meth.match(/:/))
+          meth = "high_five:#{meth}"
+        end
+        super meth, *args
+      end
+
+      class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"
+      def initialize(*args)
+        super
+        #override version task
+        if args[2][:current_task][:name] == "version"
+          puts "HighFive #{HighFive::VERSION}" 
+          Process.exit(0)
+        end
+      end
+
+      private
+      def thorfiles(*args)
+        Dir[File.join(File.dirname(__FILE__), 'tasks/*.rb')]
+      end
+
+    end
+  end
+end

data/lib/high_five/thor/task.rb

@@ -0,0 +1,58 @@
+require 'high_five/config'
+
+module HighFive
+  module Thor
+    class Task < ::Thor
+      def self.banner(task, namespace = false, subcommand = true)
+        if self.namespace == "high_five"
+          ns = ""
+        else
+          ns = "#{self.namespace}:"
+        end
+        "hi5 #{ns}" + task.formatted_usage(self, namespace, subcommand)
+      end
+
+      no_tasks {
+        def invoke(name=nil, *args)
+          name.sub!(/^high_five:/, '') if name && $high_five_runner
+          super
+        end
+        
+        class << self
+          def inherited(base) #:nodoc:
+            base.send :extend,  ClassMethods
+          end
+        end
+
+        def base_config
+          begin 
+            @base_config ||= HighFive::Config.load
+          rescue StandardError => e
+            say e.message, :red
+            exit
+          end
+        end
+      }
+
+      def initialize(*args)
+        super
+       
+      end
+    
+      module ClassMethods
+        def namespace(name=nil)
+          case name
+          when nil
+            constant = self.to_s.gsub(/^Thor::Sandbox::/, "")
+            strip = $high_five_runner ? /^HighFive::Thor::Tasks::/ : /(?<=HighFive::)Thor::Tasks::/
+            constant = constant.gsub(strip, "")
+            constant =  ::Thor::Util.snake_case(constant).squeeze(":")          
+            @namespace ||= constant
+          else
+            super
+          end
+        end
+      end
+    end  
+  end
+end

data/lib/high_five/thor/tasks/android_tasks.rb

@@ -0,0 +1,54 @@
+require 'high_five/android_helper'
+require 'nokogiri'
+
+module HighFive
+  module Thor
+    module Tasks
+      class AndroidTasks < ::HighFive::Thor::Task
+        include ::Thor::Actions
+        include HighFive::AndroidHelper
+        namespace :android
+
+        desc "debug", "build the debug apk via ant debug"
+        def debug(target)
+          @destination_root = base_config.root
+          puts "Debugy #{target}"
+        end
+
+        desc "build", "build the apk"
+        def build
+          run('ant -file build.xml "-Dkey.store=/Users/Shared/Jenkins/Home/jobs/modern resident/workspace/modern_resident-mobile/android/Keystore.ks" -Dkey.store.password=modernresident -Dkey.alias=android -Dkey.alias.password=modernresident clean release
+            Buildfile: /Users/Shared/Jenkins/Home/jobs/modern resident/workspace/modern_resident-mobile/android/build.xml')
+        end
+
+        desc "set_version", "build the debug apk via ant debug"
+        method_option :version, :aliases => "-v", :desc => "Set main version"
+        method_option :build_number, :aliases => '-b', :desc => "set build number"
+        def set_version
+          # read and parse the old file
+          file = File.read(android_manifest_path)
+          xml = Nokogiri::XML(file)
+
+          # replace \n and any additional whitespace with a space
+          xml.xpath("//manifest").each do |node|
+            if (options[:version])
+              old = node["android:versionName"]
+              node["android:versionName"] = options[:version]
+              puts "Setting version #{old} => #{options[:version]}"
+            end
+            if (options[:build_number])
+              old = node["android:versionCode"]
+              node["android:versionCode"] = options[:build_number]
+              puts "Setting versionCode #{old} => #{options[:build_number]}"
+            end
+          end
+
+          # save the output into a new file
+          File.open(android_manifest_path, "w") do |f|
+            f.write xml.to_xml
+          end
+        end
+      end
+    end
+  end
+end

data/lib/high_five/{deploy_task.rb → thor/tasks/deploy.rb}

@@ -4,10 +4,11 @@ require 'uglifier'
 require "yui/compressor"
 
 module HighFive
-  module DeployTask 
-
-    def self.included(mod) 
-      mod.class_eval do 
+  module Thor
+    module Tasks
+      class Deploy < ::HighFive::Thor::Task
+        include ::Thor::Actions
+        default_task :deploy
 
         desc "deploy", "Deploy the app for a specific platform in a specific environment"
         method_option :environment, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
@@ -25,7 +26,7 @@ module HighFive
           
           self.source_paths << File.join(base_config.root, @config_root)
           self.source_paths << File.join(base_config.root)
-          self.source_paths << File.join(File.dirname(__FILE__), 'generators')
+          self.source_paths << File.join(File.dirname(__FILE__), '..', '..', 'generators')
           @config.asset_paths.each do |asset_path|
             self.source_paths << asset_path
           end

data/lib/high_five/thor/tasks/distribution.rb

@@ -0,0 +1,74 @@
+require 'high_five/ios_helper'
+require 'high_five/android_helper'
+module HighFive
+  module Thor
+    module Tasks
+      class Distribution < ::HighFive::Thor::Task
+        include ::Thor::Actions
+        include IosHelper
+
+        default_task :dist
+
+        desc "dist [PLATFORM]", "Create a distribution package for a specific platform"
+        method_option :output_file_name, :aliases => "-o", :desc => "Name of the final output file. Defaults to project_name.apk/ipa"
+        method_option :sign_identity, :aliases => "-s", :desc => "Full name of the code sign identity for use by xcode"
+        method_option :provisioning_profile, :aliases => "-p", :desc => "Path to the provisioning profile"
+        def dist(platform)
+          @output_file_name       = options[:output_file_name]
+          @sign_identity          = options[:sign_identity]
+          @provisioning_profile   = options[:provisioning_profile]
+          @platform               = platform
+          @config                 = base_config.build_platform_config(@platform).build_platform_config(@environment)
+          @config_root            = File.join("config", "high_five")
+
+          raise "Please set config.destination" if @config.destination.nil?
+          self.destination_root = @config.destination
+
+          if @platform == "android" || @platform == "amazon"
+            path = self.destination_root
+            while path != base_config.root
+              if File.exists? File.join(path, 'AndroidManifest.xml')
+                android_path = path
+                break
+              else
+                path = File.expand_path('..', path)
+              end
+            end
+
+            if !android_path
+              raise "Couldn't find the path of the android manifest."
+            end
+
+            system("ant -file '#{android_path}/build.xml' release")
+
+            android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
+            if @output_file_name
+              FileUtils.cp("#{android_path}/bin/#{android_name}-release.apk", "#{android_path}/bin/#{@output_file_name}.apk")
+            end
+          elsif @platform == "ios"
+            raise "Please pass in the code sign identity to build an ios app. -s [sign_identity]" if @sign_identity.nil?
+            raise "Please pass in the path to the provisioning profile to build an ios app. -p [provisioning_profile]" if @provisioning_profile.nil?
+
+            ios_path = File.dirname(xcodeproj_path())
+            
+            if !ios_path
+              raise "Couldn't find the path of the xcodeproj."
+            end
+
+            ios_project_name = File.basename(Dir[ios_path + "/*.xcodeproj"].first, '.xcodeproj')
+            keychain = ios_project_name.gsub(/\s/, '').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase + '-ios.keychain'
+
+            @output_file_name ||= ios_project_name
+
+            uuid = HighFive::IosHelper.uuid_from_mobileprovision(@provisioning_profile)
+            ENV['uuid'] = uuid
+            FileUtils.cp(@provisioning_profile, "#{ENV['HOME']}/Library/MobileDevice/Provisioning Profiles/#{uuid}.mobileprovision")
+            system(%Q(cd "#{ios_path}";
+              /usr/bin/xcodebuild -target "#{ios_project_name}" -configuration Release build "CONFIGURATION_BUILD_DIR=#{ios_path}/build" "CODE_SIGN_IDENTITY=#{@sign_identity}" PROVISIONING_PROFILE=$uuid))
+            system(%Q(/usr/bin/xcrun -sdk iphoneos PackageApplication -v "#{ios_path}/build/#{ios_project_name}.app" -o "#{ios_path}/build/#{@output_file_name}.ipa" --embed "#{@provisioning_profile}" --sign "#{@sign_identity}"))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/high_five/{init_task.rb → thor/tasks/initialization.rb}

@@ -1,8 +1,10 @@
 require 'fileutils'
 module HighFive
-  module InitTask
-    def self.included(mod) 
-      mod.class_eval do
+  module Thor
+    module Tasks
+      class Initialization < ::HighFive::Thor::Task
+        include ::Thor::Actions
+        default_task :init
 
         desc "init", "Initialize the high_five configuration in the current working directory"
         def init
@@ -23,9 +25,7 @@ module HighFive
             end
           end
         end
-
-
-      end #end class_eval
+      end 
     end
   end
 end

data/lib/high_five/thor/tasks/ios_tasks.rb

@@ -0,0 +1,42 @@
+require 'high_five/ios_helper'
+require 'plist' 
+
+module HighFive
+  module Thor
+    module Tasks
+      class IosTasks < ::HighFive::Thor::Task
+        include ::Thor::Actions
+        include ::HighFive::IosHelper
+        namespace :ios
+
+        desc "set_version", "build the debug apk via ant debug"
+        method_option :version, :aliases => "-v", :desc => "Set main version"
+        method_option :build_number, :aliases => '-b', :desc => "set build number"
+        def set_version
+          info = info_plist_path
+          puts "Using #{info}"
+          plist = Plist::parse_xml(info)
+
+          if (options[:version])
+            puts "Changing version from #{plist["CFBundleShortVersionString"]} => #{options[:version]}"
+            plist["CFBundleShortVersionString"] = options[:version]
+          end
+
+          if (options[:build_number])
+            puts "Changind build number from #{plist["CFBundleVersion"]} => #{options[:build_number]}"
+            plist["CFBundleVersion"] = options[:build_number]
+          end
+          File.open(info, 'w') do |f|
+            f.write(Plist::Emit.dump(plist))
+          end
+          puts "Wrote Info.plist succesfully"
+        end
+
+        desc "build", "build the apk"
+        def build
+         
+        end
+      end
+    end
+  end
+end

data/lib/high_five/thor/tasks.rb

@@ -0,0 +1,10 @@
+require 'high_five/thor/tasks/deploy'
+require 'high_five/thor/tasks/distribution'
+require 'high_five/thor/tasks/initialization'
+require 'high_five/thor/tasks/android_tasks'
+module HighFive
+  module Thor
+    module Tasks   
+    end
+  end
+end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-    VERSION = "0.1.5"
-end
+  VERSION = "0.2.0"
+end

data/spec/android_helper_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe HighFive::AndroidHelper do
+  it 'should be able to extract the project name from a build.xml' do
+    name = HighFive::AndroidHelper.project_name_from_build_xml(File.join(File.dirname(__FILE__), "dummy", "build.xml"))
+
+    name.should eq 'Fake Name'
+  end
+end

data/spec/config_spec.rb

@@ -27,6 +27,13 @@ describe HighFive::Config do
         config.environment :production do |production|
           production.setting base_url: "http://production.example.com/api"
         end
+
+        config.platform :android do |android|
+          android.setting base_url: "http://android.example.com"
+          android.environment :production do |android_production|
+            android_production.setting base_url: "http://android-production.example.com"
+          end
+        end
       end
       @config = HighFive::Config.instance
     end
@@ -40,6 +47,11 @@ describe HighFive::Config do
       prod.js_settings[:base_url].should eq "http://production.example.com/api"
     end
 
+    it "should handle nested settings properly" do 
+      android_production = @config.build_platform_config(:platform).build_platform_config(:android)
+      android_production.js_settings[:base_url].should eq "http://android-production.example.com"
+    end
+
   end
 
   context "environment configuration" do 
@@ -108,4 +120,39 @@ describe HighFive::Config do
     end
   end
 
+  context "nested settings" do 
+    before do 
+      HighFive::Config.configure do |config|
+        config.root = "/"
+        config.setting base_url: "http://example.com/api"
+        config.platform :ios do |ios|
+
+        end
+        config.platform :android do |android|
+          android.assets "android_asset"
+          android.setting android_flag: true
+          config.environment :production do |android_production|
+            android_production.setting base_url: "http://android-production.example.com/api"
+          end
+        end
+        config.environment :production do |production|
+          production.assets "production_asset"
+          production.setting base_url: "http://production.example.com/api"
+        end
+      end
+      @config = HighFive::Config.instance
+    end
+
+    it "should use the environment setting if none is specified" do 
+      platform_config = @config.build_platform_config('ios').build_platform_config('production')
+      platform_config.js_settings[:base_url].should eq "http://production.example.com/api"
+    end
+
+    it "should allow platforms to specifically override environment settings" do 
+      platform_config = @config.build_platform_config('android').build_platform_config('production')
+      platform_config.js_settings[:base_url].should eq "http://android-production.example.com/api"
+    end
+
+  end
+
 end

data/spec/deploy_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HighFive::DeployTask do 
+describe HighFive::Thor::Tasks::Deploy do 
   def create_dummy_app!
     @original_dir = Dir.pwd
     @project_root = Dir.mktmpdir("hi5")
@@ -9,7 +9,7 @@ describe HighFive::DeployTask do
   end
 
   def cli(options={environment: 'development'})
-    cli = HighFive::Cli.new([], options)
+    cli = HighFive::Thor::Tasks::Deploy.new([], options)
     cli.instance_variable_set("@base_config", HighFive::Config.instance)
     cli
   end

data/spec/dummy/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Fake Name" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

data/spec/init_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tmpdir'
 require 'fileutils'
 
-describe "InitTask" do 
+describe HighFive::Thor::Tasks::Initialization do 
   before :each do
     @original_dir = Dir.pwd
     @project_root = Dir.mktmpdir("hi5")
@@ -15,7 +15,7 @@ describe "InitTask" do
   end
 
   it "should create high_five.rb in the config directory" do
-    HighFive::Cli.start(["init"])
+    ::HighFive::Thor::Tasks::Initialization.start(["init"])
     Dir.exists?(File.join(@project_root, "config")).should be_true
     File.exists?(File.join(@project_root, "config", "high_five.rb")).should be_true
     Dir.exists?(File.join(@project_root, "config", "high_five")).should be_true

data/spec/ios_helper_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe HighFive::IosHelper do
+  it 'should be able to extract a UUID from a mobileprovision file' do
+    uuid = HighFive::IosHelper.uuid_from_mobileprovision(File.join(File.dirname(__FILE__), "dummy", "fake.mobileprovision"))
+
+    uuid.should eq 'THIS-IS-A-FAKE-UUID'
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "high_five"
-require 'high_five/cli'
+require 'high_five/thor/runner'
+require 'high_five/thor/tasks'
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

data/template/config/high_five.rb

@@ -1,4 +1,7 @@
 HighFive::Config.configure do |config|
+  config.app_name = "ExampleApp"
+  config.app_id = "com.example.app"
+  
   config.root = File.join(File.dirname(__FILE__), '..')
   config.destination = "www"
 
@@ -35,13 +38,18 @@ HighFive::Config.configure do |config|
     # android.assets "resources/android"
   end
 
+  config.platform :Web do |web|
+    web.manifest = true #generate app cache manifest (production env only)
+    web.dev_index = "index-debug.html" #copy generated index.html to index-debug (development env only)
+  end
+
   # if you need platform-specific javascripts, 
   # simply create app-<platform>.js 
   # these files are managed by sprockets, and are used to determine the javascript include order
 
   # Environment support: production/development/etc
   # Environments work just like platforms
-  config.envrionment :development do |development|
+  config.environment :development do |development|
     # development.javascripts "lib/some-library-debug-all.js"
     # development.setting base_url: "http://dev.example.com:1234/api/"
   end
@@ -49,6 +57,7 @@ HighFive::Config.configure do |config|
   config.environment :production do |production|
     # production.javascripts "lib/some-library-minified.js"
     # production.setting base_url: "http://production.example.com/api/" #these take precedence over the platform overrides
+    # production.minify :uglifier # or :yui
   end
 
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,15 +90,55 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,15 +146,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
 description: ! "Build, minify, and deal with different platforms and environments
-  for your HTML5 app.  \n    This is often used with PhoneGap but designed not to
-  require it, and high_five can be used to deploy any kind of HTML/JS/CSS-based\n
-  \   application that requires different deployment configurations.\n  "
+  for your HTML5 app.\n    This is often used with PhoneGap but designed not to require
+  it, and high_five can be used to deploy any kind of HTML/JS/CSS-based\n    application
+  that requires different deployment configurations.\n  "
 email:
 - brian@tenforwardconsulting.com
 executables:
@@ -142,18 +169,29 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- Thorfile
 - bin/hi5
+- ext/mkrf_conf.rb
 - high_five.gemspec
 - lib/high_five.rb
-- lib/high_five/android_tasks.rb
+- lib/high_five/android_helper.rb
 - lib/high_five/cli.rb
 - lib/high_five/config.rb
-- lib/high_five/deploy_task.rb
 - lib/high_five/generators/manifest.erb
-- lib/high_five/init_task.rb
+- lib/high_five/ios_helper.rb
+- lib/high_five/thor/runner.rb
+- lib/high_five/thor/task.rb
+- lib/high_five/thor/tasks.rb
+- lib/high_five/thor/tasks/android_tasks.rb
+- lib/high_five/thor/tasks/deploy.rb
+- lib/high_five/thor/tasks/distribution.rb
+- lib/high_five/thor/tasks/initialization.rb
+- lib/high_five/thor/tasks/ios_tasks.rb
 - lib/high_five/version.rb
+- spec/android_helper_spec.rb
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/build.xml
 - spec/dummy/config.rb
 - spec/dummy/config/high_five.rb
 - spec/dummy/config/high_five/app-android.js
@@ -162,6 +200,7 @@ files:
 - spec/dummy/config/high_five/app-ios.js
 - spec/dummy/config/high_five/app-web.js
 - spec/dummy/config/high_five/index.html.erb
+- spec/dummy/fake.mobileprovision
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
 - spec/dummy/public/custom_path/custom_app.js
@@ -169,6 +208,7 @@ files:
 - spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
 - spec/init_spec.rb
+- spec/ios_helper_spec.rb
 - spec/spec_helper.rb
 - template/config/high_five.rb
 - template/config/high_five/app-common.js
@@ -176,32 +216,33 @@ files:
 - template/config/high_five/index.html.erb
 homepage: http://github.com/tenforwardconsulting/high_five
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HighFive is a set of build scripts and tools for packing HTML5 apps both
   for the web and for phonegap
 test_files:
+- spec/android_helper_spec.rb
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/build.xml
 - spec/dummy/config.rb
 - spec/dummy/config/high_five.rb
 - spec/dummy/config/high_five/app-android.js
@@ -210,6 +251,7 @@ test_files:
 - spec/dummy/config/high_five/app-ios.js
 - spec/dummy/config/high_five/app-web.js
 - spec/dummy/config/high_five/index.html.erb
+- spec/dummy/fake.mobileprovision
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
 - spec/dummy/public/custom_path/custom_app.js
@@ -217,4 +259,5 @@ test_files:
 - spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
 - spec/init_spec.rb
+- spec/ios_helper_spec.rb
 - spec/spec_helper.rb

data/lib/high_five/android_tasks.rb

@@ -1,17 +0,0 @@
-module HighFive
-  module AndroidTasks
-    def self.included(mod)
-      mod.class_eval do 
-
-        namespace "android"
-        desc "android_debug", "build the debug apk via ant debug"
-        def android_debug
-          self.destination_root = base_config.root
-          puts "Debugy"
-        end
-
-
-      end #end class_eval
-    end
-  end
-end