wox 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+# 0.0.7 (17 Apr 2011)
+TestFlight task now more closely mimics TestFlight API. See README for new format
+
 # 0.0.6 (16 Apr 2011)
 Build now defaults to building the first target in the application. This can be overridden by setting :target

data/README.md

@@ -56,7 +56,8 @@ Ok so there's a few more things you can do, like creating ipa files and publishi
           testflight :publish, :api_token => 'nphsZ6nVXMl0brDEsevLY0wRfU6iP0NLaQH3nqoh8jG',
                                :team_token => 'Qfom2HnGGJnXrUVnOKAxKAmpNO3wdQ9panhtqcA',
                                :notes => proc { File.read("CHANGELOG") },
-                               :notify => 'Internal'
+                               :distribution_lists => %w[Internal QA],
+                               :notify => true
 
         end
       end

data/lib/wox/build_environment.rb

@@ -12,32 +12,31 @@ module Wox
     attr_reader :info_plist, :build_dir, :default_sdk
     
     def initialize options
+      @options = options
+      
       options[:info_plist] ||= 'Resources/Info.plist'
       options[:version] ||= Plist::parse_xml(options[:info_plist])['CFBundleVersion']
       options[:project_name] ||= xcodebuild_list.first.scan(/project\s\"([^\"]+)/i).flatten.first
+      options[:full_name] ||= "#{self[:project_name]} #{self[:version]}"
       options[:build_dir] ||= 'build'
       options[:sdk] ||= 'iphoneos'
       options[:configuration] ||= 'Release'
       options[:target] ||= targets.first
-      @options = options
+      
+      if options[:ipa_name]
+        options[:ipa_file] ||= File.join self[:build_dir], 
+                                [self[:project_name], self[:version], self[:configuration], self[:ipa_name]].join("-") + ".ipa"
+      end
     end
     
     def apply options, &block
       yield BuildEnvironment.new @options.merge(options)
     end
     
-    def project_name
-      self[:project_name] 
-    end
-        
     def version
       self[:version]
     end
-    
-    def full_name
-      "#{project_name} #{version}"
-    end
-    
+        
     def sdks
       @sdks ||= `xcodebuild -showsdks`.scan(/-sdk (.*?$)/m).flatten
     end
@@ -60,17 +59,13 @@ module Wox
     
     def [](name)
       fail "You need to specify :#{name} in Rakefile" unless @options[name]
-      @options[name]
-    end
-        
-    def configuration_sym
-      self[:configuration].gsub(' ', '_').downcase
+      @options[name].respond_to?(:call) ? @options[name].call : @options[name]
     end
     
-    def ipa_file
-      File.join self[:build_dir], "#{project_name}-#{version}-#{configuration_sym}-#{self[:ipa_name]}.ipa"
+    def has_entry? name
+      @options[name]
     end
-    
+        
     private
     
       def xcodebuild_list

data/lib/wox/builder.rb

@@ -5,7 +5,7 @@ module Wox
     
     def build
       configuration = environment[:configuration]
-      puts "Building #{environment.full_name} configuration:#{configuration}"
+      puts "Building #{environment[:full_name]} configuration:#{configuration}"
       
       log_file = File.join environment[:build_dir], "build-#{configuration}.log"
 

data/lib/wox/helpers/number_helper.rb

@@ -0,0 +1,19 @@
+module Wox
+  module NumberHelper
+    def plural count, singular, plural
+      count == 1 ? singular : plural
+    end
+    
+    def bytes_to_human_size bytes, precision = 1
+      kb = 1024
+      mb = 1024 * kb
+      gb = 1024 * mb
+      case 
+        when bytes < kb; "%d #{plural(bytes, 'byte', 'bytes')}" % bytes
+        when bytes < mb; "%.#{precision}f #{plural((bytes / kb), 'kilobyte', 'kilobytes')}" % (bytes / kb)
+        when bytes < gb; "%.#{precision}f #{plural((bytes / mb), 'megabyte', 'megabytes')}" % (bytes / mb)
+        when bytes >= gb; "%.#{precision}f #{plural((bytes / gb), 'gigabyte', 'gigabytes')}" % (bytes / gb)
+      end
+    end
+  end
+end

data/lib/wox/packager.rb

@@ -3,9 +3,9 @@ module Wox
     include Environment
     
     def package
-      configuration, sdk, ipa_file, build_dir = environment[:configuration], environment[:sdk], environment.ipa_file, environment[:build_dir]
+      configuration, sdk, ipa_file, build_dir = environment[:configuration], environment[:sdk], environment[:ipa_file], environment[:build_dir]
 
-      app_file = File.join build_dir, "#{configuration}-#{sdk}", "#{environment.project_name}.app"
+      app_file = File.join build_dir, "#{configuration}-#{sdk}", "#{environment[:project_name]}.app"
       fail "Couldn't find #{app_file}" unless File.exists? app_file
     
       provisioning_profile_file = find_matching_mobile_provision environment[:provisioning_profile]

data/lib/wox/tasks.rb

@@ -41,7 +41,7 @@ module Wox
       environment.apply options do |e|
         t = nil
         namespace :build do
-          desc "Build #{e.full_name} with #{e[:configuration]} configuration"
+          desc "Build #{e[:full_name]} with #{e[:configuration]} configuration"
           t = task(name) { Builder.new(e).build }
         end
         tasks = BuildTasks.new(e, t)
@@ -57,7 +57,7 @@ module Wox
       environment.apply options.merge({:ipa_name => name}) do |e|
         t = nil
         namespace :ipa do
-          desc "Creates #{e.ipa_file}"
+          desc "Creates #{e[:ipa_file]}"
           t = task(name => parent_task) { Packager.new(e).package }
         end
         
@@ -73,7 +73,7 @@ module Wox
     def testflight name, options
       environment.apply options do |e|
         namespace :testflight do
-          desc "Publishes #{e.ipa_file} to testflight"
+          desc "Publishes #{e[:ipa_file]} to testflight"
           task(name => parent_task) { TestFlight.new(e).publish }
         end
       end

data/lib/wox/test_flight.rb

@@ -1,32 +1,41 @@
+require 'wox/helpers/number_helper'
+
 module Wox
   class TestFlight < Task
     include Environment
+    include NumberHelper
     
-    def notes
-      environment[:notes].respond_to?(:call) ? environment[:notes].call : environment[:notes]
-    end
-    
-    def lists
-      environment[:notify].respond_to?(:join) ? environment[:notify].join(",") : environment[:notify]
+    def arg_to_string arg
+      arg.respond_to?(:join) ? arg.join(",") : arg
     end
-    
-    def publish
+
+    def api_args
       args = { 
-        :file => "@#{environment.ipa_file}",
+        :file => "@#{environment[:ipa_file]}",
         :api_token => environment[:api_token],
         :team_token => environment[:team_token],
-        :notes => notes
+        :notes => environment[:notes]
       }
-      if environment[:notify]
-        args[:notify] = "True"
-        args[:distribution_lists] = lists
-      end
       
-      arg_string = args.map {|k,v| "-F #{k}='#{v}'"}.join(" ")
+      args[:distribution_lists] = environment[:distribution_lists].join(",") if environment.has_entry? :distribution_lists 
+      args[:notify] = environment[:notify] if environment.has_entry? :notify
+      args
+    end
+    
+    def curl_arg_string
+      api_args.map {|k,v| "-F #{k}='#{v}'"}.join(" ")
+    end
+    
+    def publish
+      ipa_file = environment[:ipa_file]
+      
+      puts "Publishing to TestFlight"
+      puts "File: #{ipa_file} (#{bytes_to_human_size File.size?(ipa_file)})"
+      puts "Accessible To: #{environment[:distribution_lists].join(", ")}" if environment.has_entry? :distribution_lists
+      puts "After publish will notify team members" if environment.has_entry? :notify
       
-      puts "Uploading ipa to TestFlight"
       log_file = File.join environment[:build_dir], "testflight.log"
-      run_command "curl --progress-bar #{arg_string} http://testflightapp.com/api/builds.json", :results => log_file
+      run_command "curl --progress-bar #{curl_arg_string} http://testflightapp.com/api/builds.json", :results => log_file
     end
 
   end

data/lib/wox/version.rb

@@ -1,3 +1,3 @@
 module Wox
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wox
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dave Newman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +10:00
+date: 2011-04-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/wox.rb
 - lib/wox/build_environment.rb
 - lib/wox/builder.rb
+- lib/wox/helpers/number_helper.rb
 - lib/wox/packager.rb
 - lib/wox/task.rb
 - lib/wox/tasks.rb