hawk 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3deafc194337b349ad8c93571940218715418c
-  data.tar.gz: fab353ca3ce2398d263d84536b05f7ef47a93e98
+  metadata.gz: 7b05a47ba96ddfaad667c74f74763b610e451050
+  data.tar.gz: 2d857c9095aec321547cc170f780707706b82077
 SHA512:
-  metadata.gz: f90c1d27935237c955abbfc05eb48fce7a44fd82650ef1f47e779e4da7aa748ba05b478d2176d5f4432268c2719b57cb6354e4e9240d37a383c5942964004141
-  data.tar.gz: c06286c596b726884eab5860ca1b53836d3677068b012f3a5d643f6cde350183ac20b66fec45799077d0184c46d40b3a0a193050cf0038b25db7b6d79c6084f5
+  metadata.gz: f4aba4da0bc56168aef6fd77dc7e15584e20379c08c19f27562761956c3c8a5e40286a6e557a3660087af4f73be48bef616f067a88d192544eba0fa8e5d6fe61
+  data.tar.gz: d6d96883fd7410d5b4349762658f2f5f21223458a1e607d80fb2727e8b078920d108ea30cbdfd86739c294a762e0bfb6595b2adfaa4daff5944b8c90febb826a

data/lib/hawk/builder.rb

@@ -24,6 +24,18 @@ module Hawk
       def configuration(configuration)
         @configuration = configuration
       end
+
+      def vendor_name(name)
+        @vendor_name = name
+      end
+
+      def icon_path(path)
+        @icon_path = path
+      end
+
+      def fullsize_image_path(path)
+        @fullsize_image_path = path
+      end
     end
 
     def app_name
@@ -42,6 +54,26 @@ module Hawk
       `git rev-parse --short HEAD`.chomp
     end
 
+    def vendor_name
+      @vendor_name
+    end
+
+    def icon_path
+      @icon_path
+    end
+
+    def escaped_icon_url
+      (icon_path)? CGI.escapeHTML(icon_url) : 'https://raw.githubusercontent.com/mtrudel/hawk/master/templates/icon.png'
+    end
+
+    def fullsize_image_path
+      @fullsize_image_path
+    end
+
+    def escaped_fullsize_image_url
+      (fullsize_image_path)? CGI.escapeHTML(fullsize_image_url) : 'https://raw.githubusercontent.com/mtrudel/hawk/master/templates/fullsize_image.png'
+    end
+
     def ipa_file
       if (!@ipa_file)
         output_dir = Dir.tmpdir

data/lib/hawk/cli.rb

@@ -13,6 +13,11 @@ module Hawk
             options[:preserve_ipa] = true
           end
 
+          options[:preserve_manifest] = false
+          opts.on( '-m', '--preserve-manifest', 'Leave a copy of the manifest.plist file in the current directory' ) do
+            options[:preserve_manifest] = true
+          end
+
           opts.on( '-h', '--help', 'Display this screen' ) do
             puts opts
             exit

data/lib/hawk/s3_uploader.rb

@@ -37,6 +37,7 @@ module Hawk
       if (!@plist_url) 
         @plist_url = object('manifest.plist') do |obj|
           plist_data = build_plist
+          File.write(File.join(Dir.pwd, 'manifest.plist'), plist_data) if @options[:preserve_manifest]
           print 'Uploading plist to S3...'
           obj.write(plist_data, :content_type => 'application/xml')
           puts 'done'
@@ -58,6 +59,30 @@ module Hawk
       @webpage_url
     end
 
+    def icon_url
+      if (!@icon_url) 
+        file = icon_path
+        @icon_url = object(File.basename(file)) do |obj|
+          print "Uploading #{File.basename(file)} to S3..."
+          obj.write(Pathname.new(file), :content_type => 'image/png')
+          puts 'done'
+        end
+      end
+      @icon_url
+    end
+
+    def fullsize_image_url
+      if (!@fullsize_image_url) 
+        file = fullsize_image_path
+        @icon_url = object(File.basename(file)) do |obj|
+          print "Uploading #{File.basename(file)} to S3..."
+          obj.write(Pathname.new(file), :content_type => 'image/png')
+          puts 'done'
+        end
+      end
+      @fullsize_image_url
+    end
+
     private
 
     def object(name, &block)

data/lib/hawk/version.rb

@@ -1,3 +1,3 @@
 module Hawk
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/templates/Hawkfile

@@ -37,6 +37,27 @@
 # How many days to wait before deleting the files from S3. Defaults to 30 days
 #delete_after 30
 
+#
+# Vendor name - an optional value to be displayed alongside the app name during
+# the install process
+#
+#vendor_name "ABC Co"
+
+#
+# Icon path - the path (relative to this Hawkfile) that a 57x57px PNG formatted
+# app icon can be found, to be used during the app install. This is optional,
+# and if omitted a plain white icon will be used in its stead
+#
+#icon_path 'path/to/icon.png'
+
+#
+# Full size icon image path - the path (relative to this Hawkfile) that
+# a 512x512x PNG formatted app icon can be found. to be used during the app
+# install. This is optional, and if omitted a plain white icon will be used in
+# its stead
+#
+#fullsize_image_path 'path/to/fullsize_image.png'
+
 #
 # User list - a list of users to send emails to upon successsful upload of a new
 # version of your app. Specified one email address per line, to keep diffs sane

data/templates/manifest.plist.erb

@@ -13,6 +13,18 @@
                     <key>url</key>
                     <string><%= escaped_ipa_url %></string>
                 </dict>
+                <dict>
+                    <key>kind</key>
+                    <string>display-image</string>
+                    <key>url</key>
+                    <string><%= escaped_icon_url %></string>
+                </dict>
+                <dict>
+                    <key>kind</key>
+                    <string>full-size-image</string>
+                    <key>url</key>
+                    <string><%= escaped_fullsize_image_url %></string>
+                </dict>
             </array>
             <key>metadata</key>
             <dict>
@@ -24,6 +36,10 @@
                 <string>software</string>
                 <key>title</key>
                 <string><%= app_name %></string>
+                <% if vendor_name %>
+                <key>subtitle</key>
+                <string><%= vendor_name %></string>
+                <% end %>
             </dict>
         </dict>
     </array>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hawk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mat Trudel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -78,6 +78,8 @@ files:
 - lib/hawk/s3_uploader.rb
 - lib/hawk/version.rb
 - templates/Hawkfile
+- templates/fullsize_image.png
+- templates/icon.png
 - templates/install.html.erb
 - templates/manifest.plist.erb
 homepage: http://github.com/mtrudel/hawk