itunes_transporter_generator 0.4.4 → 0.4.5

data/README.md

@@ -29,7 +29,7 @@ You can now upload your .itmsp package to iTunes Connect using the Transporter t
 ## Sample Config file
 Below is a sample configuration file describing an achievement, leaderboard, and in-app purchase. The specific metadata required for each item type is fully described in the [App Metadata Specification guide](http://bit.ly/TtHMF6)
 
-IMPORTANT: please note the syntax for multiline descriptions. This is the literal syntax for YAML used for multiline strings (http://symfony.com/doc/current/components/yaml/yaml_format.html). Also note the indentation.
+IMPORTANT: please note the syntax for multiline descriptions with extra line breaks. This is the literal syntax for [YAML used for multiline strings](http://www.yaml.org/YAML_for_ruby.html#extra_trailing_newlines_with_spaces). Also note the indentation.
 
 ```yaml
 provider: SampleCompany # optional if team_id is supplied
@@ -41,21 +41,28 @@ versions:
     locales:
       - name: en-US
         title: sampleApp
-        description: |
+        description: |+
           Description of sampleApp. This description
           spans multiple lines using the pipe
           characters. All newlines are preserved.
         keywords:
           - Sample
           - App
-        version_whats_new: Version Whats New.
+        version_whats_new: |+
+          Version Whats New. extra
+          line
+          breaks
+          
         software_url: 'http://example.com'
         privacy_url: 'http://example.com'
         support_url: 'http://example.com'
         screenshots:
-          - display_target: 'iOS-3.5-in'
-            file_name: 'test.jpg'
-
+          iphone_4in:
+            - 'test.jpg'
+          iphone_3.5in:
+            - 'test.jpg'
+          ipad:
+            - 'test.jpg'
 achievements: # the order in which achievements are defined will be the order in which they appear in Game Center
 - id: first_achievement
   name: First Achievement
@@ -144,7 +151,6 @@ purchases:
         - name: en
           title: Unlocks a new level
           description: Try your luck at this new level
-
 ```
 
 This configuration will generate the following metadata.xml:
@@ -171,28 +177,29 @@ characters. All newlines are preserved.
                 <keyword>Sample</keyword>
                 <keyword>App</keyword>
               </keywords>
-              <version_whats_new>Version Whats New.</version_whats_new>
+              <version_whats_new>
+                <![CDATA[Version Whats New. extra
+line
+breaks
+
+]]>
+              </version_whats_new>
               <software_url>http://example.com</software_url>
               <privacy_url>http://example.com</privacy_url>
               <support_url>http://example.com</support_url>
               <software_screenshots>
-                <software_screenshot display_target="iOS-3.5-in" position="1">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-4-in" position="1">
+                  <file_name>1_iOS-4-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
-                <software_screenshot display_target="iOS-3.5-in" position="2">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-3.5-in" position="1">
+                  <file_name>1_iOS-3.5-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
                 <software_screenshot display_target="iOS-iPad" position="1">
-                  <file_name>test.jpg</file_name>
-                  <size>20092</size>
-                  <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
-                </software_screenshot>
-                <software_screenshot display_target="iOS-iPad" position="2">
-                  <file_name>test.jpg</file_name>
+                  <file_name>1_iOS-iPad_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
@@ -215,7 +222,7 @@ characters. All newlines are preserved.
                 <before_earned_description>Complete a task</before_earned_description>
                 <after_earned_description>Completed a task</after_earned_description>
                 <achievement_after_earned_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>achievement_first_achievement_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </achievement_after_earned_image>
@@ -235,7 +242,7 @@ characters. All newlines are preserved.
                 <formatter_suffix_singular> Point</formatter_suffix_singular>
                 <formatter_type>INTEGER_COMMA_SEPARATOR</formatter_type>
                 <leaderboard_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>leaderboard_top_scores_en_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </leaderboard_image>
@@ -254,7 +261,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_Sample_Product_Group_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -302,7 +309,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_one_hundred_dollars_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -335,7 +342,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_new_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -366,7 +373,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_another_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -375,8 +382,6 @@ characters. All newlines are preserved.
     </software_metadata>
   </software>
 </package>
-
-
 ```
 
 ## Todo

data/example/config.yaml

@@ -7,28 +7,28 @@ versions:
     locales:
       - name: en-US
         title: sampleApp
-        description: |
+        description: |+
           Description of sampleApp. This description
           spans multiple lines using the pipe
           characters. All newlines are preserved.
         keywords:
           - Sample
           - App
-        version_whats_new: Version Whats New.
+        version_whats_new: |+
+          Version Whats New. extra
+          line
+          breaks
+          
         software_url: 'http://example.com'
         privacy_url: 'http://example.com'
         support_url: 'http://example.com'
         screenshots:
-          - display_target: 'iOS-3.5-in'
-            file_name: 'test.jpg'
-          - display_target: 'iOS-iPad'
-            file_name: 'test.jpg'
-          - display_target: 'iOS-3.5-in'
-            file_name: 'test.jpg'
-          - display_target: 'iOS-iPad'
-            file_name: 'test.jpg'
-
-
+          iphone_4in:
+            - 'test.jpg'
+          iphone_3.5in:
+            - 'test.jpg'
+          ipad:
+            - 'test.jpg'
 achievements: # the order in which achievements are defined will be the order in which they appear in Game Center
 - id: first_achievement
   name: First Achievement

data/example/metadata.xml

@@ -20,28 +20,29 @@ characters. All newlines are preserved.
                 <keyword>Sample</keyword>
                 <keyword>App</keyword>
               </keywords>
-              <version_whats_new>Version Whats New.</version_whats_new>
+              <version_whats_new>
+                <![CDATA[Version Whats New. extra
+line
+breaks
+
+]]>
+              </version_whats_new>
               <software_url>http://example.com</software_url>
               <privacy_url>http://example.com</privacy_url>
               <support_url>http://example.com</support_url>
               <software_screenshots>
-                <software_screenshot display_target="iOS-3.5-in" position="1">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-4-in" position="1">
+                  <file_name>1_iOS-4-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
-                <software_screenshot display_target="iOS-3.5-in" position="2">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-3.5-in" position="1">
+                  <file_name>1_iOS-3.5-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
                 <software_screenshot display_target="iOS-iPad" position="1">
-                  <file_name>test.jpg</file_name>
-                  <size>20092</size>
-                  <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
-                </software_screenshot>
-                <software_screenshot display_target="iOS-iPad" position="2">
-                  <file_name>test.jpg</file_name>
+                  <file_name>1_iOS-iPad_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
@@ -64,7 +65,7 @@ characters. All newlines are preserved.
                 <before_earned_description>Complete a task</before_earned_description>
                 <after_earned_description>Completed a task</after_earned_description>
                 <achievement_after_earned_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>achievement_first_achievement_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </achievement_after_earned_image>
@@ -84,7 +85,7 @@ characters. All newlines are preserved.
                 <formatter_suffix_singular> Point</formatter_suffix_singular>
                 <formatter_type>INTEGER_COMMA_SEPARATOR</formatter_type>
                 <leaderboard_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>leaderboard_top_scores_en_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </leaderboard_image>
@@ -103,7 +104,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_Sample_Product_Group_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -151,7 +152,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_one_hundred_dollars_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -184,7 +185,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_new_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -215,7 +216,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_another_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>

data/example/sample sku.itmsp/metadata.xml

@@ -20,28 +20,29 @@ characters. All newlines are preserved.
                 <keyword>Sample</keyword>
                 <keyword>App</keyword>
               </keywords>
-              <version_whats_new>Version Whats New.</version_whats_new>
+              <version_whats_new>
+                <![CDATA[Version Whats New. extra
+line
+breaks
+
+]]>
+              </version_whats_new>
               <software_url>http://example.com</software_url>
               <privacy_url>http://example.com</privacy_url>
               <support_url>http://example.com</support_url>
               <software_screenshots>
-                <software_screenshot display_target="iOS-3.5-in" position="1">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-4-in" position="1">
+                  <file_name>1_iOS-4-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
-                <software_screenshot display_target="iOS-3.5-in" position="2">
-                  <file_name>test.jpg</file_name>
+                <software_screenshot display_target="iOS-3.5-in" position="1">
+                  <file_name>1_iOS-3.5-in_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
                 <software_screenshot display_target="iOS-iPad" position="1">
-                  <file_name>test.jpg</file_name>
-                  <size>20092</size>
-                  <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
-                </software_screenshot>
-                <software_screenshot display_target="iOS-iPad" position="2">
-                  <file_name>test.jpg</file_name>
+                  <file_name>1_iOS-iPad_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </software_screenshot>
@@ -64,7 +65,7 @@ characters. All newlines are preserved.
                 <before_earned_description>Complete a task</before_earned_description>
                 <after_earned_description>Completed a task</after_earned_description>
                 <achievement_after_earned_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>achievement_first_achievement_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </achievement_after_earned_image>
@@ -84,7 +85,7 @@ characters. All newlines are preserved.
                 <formatter_suffix_singular> Point</formatter_suffix_singular>
                 <formatter_type>INTEGER_COMMA_SEPARATOR</formatter_type>
                 <leaderboard_image>
-                  <file_name>test.jpg</file_name>
+                  <file_name>leaderboard_top_scores_en_test.jpg</file_name>
                   <size>20092</size>
                   <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
                 </leaderboard_image>
@@ -103,7 +104,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_Sample_Product_Group_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -151,7 +152,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_one_hundred_dollars_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -184,7 +185,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_new_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>
@@ -215,7 +216,7 @@ characters. All newlines are preserved.
             </locale>
           </locales>
           <review_screenshot>
-            <file_name>test.jpg</file_name>
+            <file_name>iap_another_level_test.jpg</file_name>
             <size>20092</size>
             <checksum type="md5">ff5bd97a5f40bb75a84884589ecbfc42</checksum>
           </review_screenshot>

data/itunes_transporter_generator.sublime-project

@@ -2,7 +2,7 @@
 	"folders":
 	[
 		{
-			"path": "/Users/Colin/Sandbox/itunes_transporter_generator"
+			"path": "/Users/Colin/Sandbox/My Projects/itunes_transporter_generator"
 		}
 	]
 }

data/lib/itunes.rb

@@ -1,3 +1,3 @@
 module Itunes
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end 

data/lib/itunes/transporter.rb

@@ -66,10 +66,76 @@ module Itunes
       end
     end
 
+    module MetadataImage
+      def normalized_source_filename
+        File.basename(self.file_name).tr('/: ','_')
+      end
+
+      def friendly_filename(filename)
+        filename.gsub(/[^\w\s_-]+/, '')
+        .gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+        .gsub(/\s+/, '_')
+      end
+    end
+
     class VersionScreenshot < Struct.new(:display_target, :file_name, :position)
+      include MetadataImage
+
       def to_s
         "(#{self.position}) #{self.display_target} - #{self.file_name}"
       end
+
+      def normalized_filename
+        "#{self.position}_#{self.display_target}_#{normalized_source_filename}"
+      end
+    end
+
+    class AchievementImage < Struct.new(:id, :file_name)
+      include MetadataImage
+
+      def to_s
+        "achievement #{self.id} - #{self.file_name}"
+      end
+
+      def normalized_filename
+        "achievement_#{friendly_filename(id)}_#{normalized_source_filename}"
+      end
+    end
+
+    class LeaderboardImage < Struct.new(:id, :file_name)
+      include MetadataImage
+
+      def to_s
+        "leaderboard #{self.id} - #{self.file_name}"
+      end
+
+      def normalized_filename
+        "leaderboard_#{friendly_filename(id)}_#{normalized_source_filename}"
+      end
+    end
+
+    class IAPReviewImage < Struct.new(:id, :file_name)
+      include MetadataImage
+
+      def to_s
+        "iap #{self.id} - #{self.file_name}"
+      end
+
+      def normalized_filename
+        "iap_#{friendly_filename(id)}_#{normalized_source_filename}"
+      end
+    end
+
+    class IAPFamilyReviewImage < Struct.new(:name, :file_name)
+      include MetadataImage
+
+      def to_s
+        "iap #{self.name} - #{self.file_name}"
+      end
+
+      def normalized_filename
+        "iap_#{friendly_filename(name)}_#{normalized_source_filename}"
+      end
     end
   end
 end

data/lib/itunes/transporter/generator.rb

@@ -9,6 +9,7 @@ module Itunes
       include Itunes::Transporter::Helpers
 
       attr_reader :files_to_process
+      attr_reader :images_to_process
       attr_accessor :id_prefix
       attr_accessor :provider
       attr_accessor :team_id
@@ -21,6 +22,7 @@ module Itunes
 
       def initialize(options)
         @files_to_process = ['metadata.xml']
+        @images_to_process = []
 
         config_file = options.i || options.input
 
@@ -45,25 +47,35 @@ module Itunes
             version.locales.each do |locale|
               doc.locale('name' => locale.name) do
                 doc.title(locale.title)
-                doc.description() do
-                  doc.cdata!(locale.description)
+
+                if locale.description
+                  doc.description() do
+                    doc.cdata!(locale.description)
+                  end
                 end
                 
-                doc.keywords() do
-                  locale.keywords.each do |keyword|
-                    doc.keyword(keyword)
+                if locale.keywords
+                  doc.keywords() do
+                    locale.keywords.each do |keyword|
+                      doc.keyword(keyword)
+                    end
                   end
                 end
 
-                doc.version_whats_new(locale.version_whats_new)
-                doc.software_url(locale.software_url)
-                doc.privacy_url(locale.privacy_url)
-                doc.support_url(locale.support_url)
+                if locale.version_whats_new
+                  doc.version_whats_new() do
+                    doc.cdata!(locale.version_whats_new)
+                  end
+                end
+                # doc.version_whats_new(locale.version_whats_new) if locale.version_whats_new
+                doc.software_url(locale.software_url)  if locale.software_url
+                doc.privacy_url(locale.privacy_url) if locale.privacy_url
+                doc.support_url(locale.support_url) if locale.support_url
 
                 doc.software_screenshots() do
                   locale.screenshots.each do |screenshot|
                     doc.software_screenshot('display_target' => screenshot.display_target, 'position' => screenshot.position) do
-                      create_screenshot_xml(doc, screenshot.file_name)
+                      create_image_xml(doc, screenshot)
                     end
                   end
                 end
@@ -87,7 +99,8 @@ module Itunes
               doc.before_earned_description(locale.before_earned_description)
                 doc.after_earned_description(locale.after_earned_description)
                 doc.achievement_after_earned_image() do
-                  create_screenshot_xml(doc, locale.achievement_after_earned_image || @default_achievement_image)
+                  image = AchievementImage.new(achievement.id,locale.achievement_after_earned_image || @default_achievement_image)
+                  create_image_xml(doc, image)
                 end
               end
             end
@@ -119,7 +132,8 @@ module Itunes
 
                 doc.formatter_type(locale.formatter_type)
                 doc.leaderboard_image() do
-                  create_screenshot_xml(doc, locale.leaderboard_image)
+                  image = LeaderboardImage.new("#{leaderboard.id}_#{locale.name}", locale.leaderboard_image)
+                  create_image_xml(doc, image)
                 end
               end
             end
@@ -169,7 +183,8 @@ module Itunes
           end if purchase.locales.count > 0
 
           doc.review_screenshot() do
-            create_screenshot_xml(doc, purchase.review_screenshot_image)
+            screenshot = IAPReviewImage.new(purchase.product_id, purchase.review_screenshot_image)
+            create_image_xml(doc, screenshot)
           end if purchase.review_screenshot_image
         end
       end
@@ -191,7 +206,8 @@ module Itunes
           end
 
           doc.review_screenshot() do
-            create_screenshot_xml(doc, family.review_screenshot_image)
+            screenshot = IAPFamilyReviewImage.new(family.name, family.review_screenshot_image)
+            create_image_xml(doc, screenshot)
           end
 
           doc.review_notes(family.review_notes)
@@ -202,12 +218,12 @@ module Itunes
         end
       end
 
-      def create_screenshot_xml(doc, file_name)
-        image_path = Dir.pwd + "/#{file_name}"
-        @files_to_process << image_path
+      def create_image_xml(doc, image)
+        image_path = File.join(Dir.pwd,image.file_name)
+        @images_to_process << image
 
-        doc.file_name(file_name)
-        doc.size(File.size?(image_path))
+        doc.file_name(image.normalized_filename)
+        doc.size(File.size?(image.file_name))
         doc.checksum(Digest::MD5.file(image_path).hexdigest, 'type' => 'md5')
       end
 
@@ -236,26 +252,27 @@ module Itunes
                 end
               end
 
-              doc.game_center() do
-                # generate XML for all achievements
-                if @achievements.count > 0
-                  doc.achievements() do
-                    @achievements.each_with_index do |val, index|
-                      create_achievement_xml(doc, val, index + 1)
+              if @achievements.count > 0 || @leaderboards.count > 0
+                doc.game_center() do
+                  # generate XML for all achievements
+                  if @achievements.count > 0
+                    doc.achievements() do
+                      @achievements.each_with_index do |val, index|
+                        create_achievement_xml(doc, val, index + 1)
+                      end
                     end
                   end
-                end
 
-                # generate XML for all leaderboards
-                if @leaderboards.count > 0
-                  doc.leaderboards() do
-                    @leaderboards.each_with_index do |val, index|
-                      create_leaderboard_xml(doc, val, index + 1)
+                  # generate XML for all leaderboards
+                  if @leaderboards.count > 0
+                    doc.leaderboards() do
+                      @leaderboards.each_with_index do |val, index|
+                        create_leaderboard_xml(doc, val, index + 1)
+                      end
                     end
                   end
                 end
               end
-
               # generate XML for all auto-renewable subscriptions and other IAPs (consumable, non-consumable, subscription, free-subscription)
               if @purchases.count > 0
                 auto_renewable_purchase_family = @purchases[:auto_renewable_purchase_family]
@@ -288,6 +305,10 @@ module Itunes
             FileUtils.cp(file, itmsp_dir)
           end
 
+          @images_to_process.each do |image|
+            FileUtils.cp(image.file_name, File.join(itmsp_dir,image.normalized_filename))
+          end
+
           output[:messages] << "Successfully created iTunes metadata package: #{itmsp_dir}"
         rescue Exception => e
           output[:errors] << e.message

data/lib/itunes/transporter/helpers.rb

@@ -4,6 +4,9 @@ require 'itunes/transporter'
 module Itunes
   module Transporter
     module Helpers
+
+      KNOWN_DISPLAY_TARGETS = {'ipad' => 'iOS-iPad', 'iphone_3.5in' => 'iOS-3.5-in', 'iphone_4in' =>'iOS-4-in'}
+
       def metadata_from_yaml(yaml_file)
         objs = YAML.load_file(Dir.pwd + "/#{yaml_file}")
 
@@ -42,24 +45,15 @@ module Itunes
               locale.support_url = loc['support_url']
               locale.screenshots = []
 
-              loc['screenshots'].sort! { |a, b| a['display_target'].downcase <=> b['display_target'].downcase }
-
-              current_display_target = ''
-              current_position = 1
-
-              loc['screenshots'].each do |scrshot|
-                if (current_display_target != scrshot['display_target'])
-                  current_position = 1
-                  current_display_target = scrshot['display_target']
+              loc['screenshots'].each do |target, target_screenshots|
+                raise "Unknown display target for screenshot" unless KNOWN_DISPLAY_TARGETS.keys.include?(target)
+                target_screenshots.each_with_index do |scrshot, index|
+                  screenshot = VersionScreenshot.new
+                  screenshot.display_target = KNOWN_DISPLAY_TARGETS[target]
+                  screenshot.file_name = scrshot
+                  screenshot.position = index+1
+                  locale.screenshots << screenshot
                 end
-
-                screenshot = VersionScreenshot.new
-                screenshot.display_target = current_display_target
-                screenshot.file_name = scrshot['file_name']
-                screenshot.position = current_position
-
-                locale.screenshots << screenshot
-                current_position = current_position + 1
               end
 
               version.locales << locale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itunes_transporter_generator
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -110,8 +110,16 @@ files:
 - ./example/config copy.yaml
 - ./example/config.yaml
 - ./example/metadata.xml
+- ./example/sample sku.itmsp/1_iOS-3.5-in_test.jpg
+- ./example/sample sku.itmsp/1_iOS-4-in_test.jpg
+- ./example/sample sku.itmsp/1_iOS-iPad_test.jpg
+- ./example/sample sku.itmsp/achievement_first_achievement_test.jpg
+- ./example/sample sku.itmsp/iap_another_level_test.jpg
+- ./example/sample sku.itmsp/iap_new_level_test.jpg
+- ./example/sample sku.itmsp/iap_one_hundred_dollars_test.jpg
+- ./example/sample sku.itmsp/iap_Sample_Product_Group_test.jpg
+- ./example/sample sku.itmsp/leaderboard_top_scores_en_test.jpg
 - ./example/sample sku.itmsp/metadata.xml
-- ./example/sample sku.itmsp/test.jpg
 - ./example/test.jpg
 - ./Gemfile
 - ./itmsp.gemspec