hawk 0.2.0 → 1.0.0

data/README.md

@@ -2,28 +2,10 @@
 
 Hawk is a simple iOS ad-hoc distribution tool. Deployments are lightweight,
 backed by S3 storage (sourced from your own AWS account), and notifications of
-new builds happen via email. Beyond a couple of S3 buckets, the only moving
-parts to hawk are local on your machine. Hawk is a lightweight, low-friction way
+new builds happen via email. Beyond an AWS account and an S3 bucket, the only moving
+parts to hawk are on your machine. Hawk is a lightweight, low-friction way
 to make ad-hoc deploys easy.
 
-## Status
-
-Hawk is alpha quality software at this point, although I'm rapidly working
-towards firming up a 1.0 release in the next few weeks (by mid Feb 2013). Some
-features that will be coming in the near future include
-
-### Planned for 0.2
-* Automatic object expiry on S3 for .ipa and plist bundles
-* Support for Xcode workspace files
-
-### Planned for 0.3
-* Automatic bucket name selection option
-* Tighter ACL support on uploaded files
-
-### Planned for 0.4
-* UDID validation
-* Internal refactor
-
 ## Installation
 
 Install hawk on your machine by either running `gem install hawk`, or else by

data/lib/hawk/builder.rb

@@ -64,10 +64,6 @@ module Hawk
       ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', 'templates', 'manifest.plist.erb'))).result(binding)
     end
 
-    def itms_url
-      "itms-services://?action=download-manifest&url=#{plist_url}"
-    end
-
     private
 
     def app_file

data/lib/hawk/notifier.rb

@@ -1,13 +1,12 @@
 require 'uri'
+require 'cgi'
 
 module Hawk
   module Notifier
     module DSL
       def user(user)
-        puts "Warning: UDID check not implemented yet" if user.is_a? Hash
-        user = { user => nil } unless (user.is_a? Hash)
-        @users ||= {}
-        @users.merge!(user)
+        @users ||= []
+        @users << user
       end
 
       def email_subject(subject)
@@ -19,10 +18,18 @@ module Hawk
       end
     end
 
+    def itms_url
+      "itms-services://?#{URI.encode_www_form(:action => "download-manifest", :url => plist_url)}"
+    end
+
+    def escaped_ipa_url
+      CGI.escapeHTML(ipa_url)
+    end
+
     def notify_users
       subject = URI.encode(ERB.new(@email_subject).result(binding)).gsub('?','%3F').gsub('&','%26')
       body = URI.encode(ERB.new(@email_body).result(binding)).gsub('?','%3F').gsub('&','%26')
-      `open "mailto:?bcc=#{@users.keys.join(',')}&subject=#{subject}&body=#{body}"`
+      `open "mailto:?bcc=#{@users.join(',')}&subject=#{subject}&body=#{body}"`
     end
   end
 end

data/lib/hawk/s3_uploader.rb

@@ -25,7 +25,7 @@ module Hawk
         file = ipa_file
         @ipa_url = object(File.basename(file)) do |obj|
           print "Uploading #{File.basename(file)} to S3..."
-          obj.write(Pathname.new(file))
+          obj.write(Pathname.new(file), :content_type => 'application/octet-stream')
           puts 'done'
         end
       end
@@ -58,8 +58,7 @@ module Hawk
       end
       obj = @bucket.objects["#{prefix}#{name}"]
       yield obj
-      obj.acl = :public_read
-      obj.public_url
+      obj.url_for(:read, :expires => 86400 * (@delete_after || 30)).to_s
     end
   end
 end

data/lib/hawk/version.rb

@@ -1,3 +1,3 @@
 module Hawk
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/templates/Hawkfile

@@ -25,6 +25,11 @@
 # AWS Credentials - used to upload your app and associated metadata into S3 so
 # that users can download and install your app
 #
+# Note that if you don't want to check your key material into source control,
+# you can erase the two access key lines from this file and set some environment
+# variables instead. See http://amazon.rubyforge.org/doc/files/README.html for
+# details. Note that the bucket name is always required
+#
 #access_key_id 'AAAAAAAAAAAAAAAAAAAA'
 #secret_access_key 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 #bucket_name 'mah-bukkit'
@@ -34,14 +39,11 @@
 
 #
 # User list - a list of users to send emails to upon successsful upload of a new
-# version of your app. Can be specified as simple email addresses, or optionally
-# as a hash with the value being the UDID of their device. Any specified UDIDs
-# will be checked against the built app, to verify that they are entitled to run
-# the app. Any failures will result in a warning being displayed
+# version of your app. Specified one email address per line, to keep diffs sane
 #
 #user 'alice@example.com'
 #user 'bob@example.com'
-#user 'claire@example.com' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+#user 'claire@example.com'
 
 #
 # Notification settings - parameters describing the email to be sent out. This

data/templates/manifest.plist.erb

@@ -11,7 +11,7 @@
                     <key>kind</key>
                     <string>software-package</string>
                     <key>url</key>
-                    <string><%= ipa_url %></string>
+                    <string><%= escaped_ipa_url %></string>
                 </dict>
             </array>
             <key>metadata</key>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hawk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk