phase 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee563e5e3a3ca6f2ff9187a9ddef4f6bb84b1061
-  data.tar.gz: 1a1f931136fbf9a259cfed4c90530728c2af02c3
+  metadata.gz: efb7ef15efc3d89bc0e365884c2aade6a215cf70
+  data.tar.gz: a352b3bfd0a672d6ce01062263b758251df76023
 SHA512:
-  metadata.gz: 1b02945a1a184c772ee8c7aedb72f71d55b0809504b24fdf67eae93bc7e2e6622e87c78b83884e1e3f8b38ee440a181ce69453b097643df05010eaa75b856ce0
-  data.tar.gz: 3255427e99a5c8560c350278203924d6b8cb98da4d11ddd1d760a9481670ac205826cc09cd7d0dc2e148c783dba48e8558b4ac9c37fa104c93999629a2d218ed
+  metadata.gz: 08044e4ea70d6421c0005306de605bdcd7c03b10d6e3b2723db3a5cd1db463094f11a6b785850d170495279b1aa43c5d6832563d00c725f4bf34f66a8b12cd77
+  data.tar.gz: 217a1d8005beb9e7aeedfd00be6e51b022f3c483534826f8dcb5957056038e5d7f7ae527513d085379ab66bdef9045e8b815199edd9b0e77133c62c7f0a22b35

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/phase/cli/ipa.rb

@@ -25,12 +25,12 @@ module Phase
           fail "invalid syntax: phase ipa [--version version_number] [filename|glob_pattern]..."
         end
 
-        if Phase.config.bundle_id_prefix.blank?
-          fail "missing setting: set `Phase.config.bundle_id_prefix = [PREFIX] in Phasefile"
-        elsif Phase.config.ipa_bucket_name.blank?
-          fail "missing setting: set `Phase.config.ipa_bucket_name = [BUCKET]` in Phasefile"
-        elsif Phase.config.ipa_directory_prefix.blank?
-          fail "missing setting: set `Phase.config.ipa_directory_prefix = [PREFIX] in Phasefile"
+        if Phase.config.ipa.bundle_id_prefix.blank?
+          fail "missing setting: set `Phase.config.ipa.bundle_id_prefix = [PREFIX] in Phasefile"
+        elsif Phase.config.ipa.bucket_name.blank?
+          fail "missing setting: set `Phase.config.ipa.bucket_name = [BUCKET]` in Phasefile"
+        elsif Phase.config.ipa.directory_prefix.blank?
+          fail "missing setting: set `Phase.config.ipa.directory_prefix = [PREFIX] in Phasefile"
         end
 
         super

data/lib/phase/configuration.rb

@@ -2,8 +2,7 @@ module Phase
   class Configuration
 
     attr_accessor :bastions_enabled, :bastion_role, :bastion_user, :public_subnet_name,
-                  :private_subnet_name, :aws_region, :adapter, :backend,
-                  :bundle_id_prefix, :ipa_directory_prefix, :ipa_bucket_name
+                  :private_subnet_name, :aws_region, :adapter, :backend
 
     def initialize
       @bastions_enabled     = false
@@ -14,10 +13,6 @@ module Phase
       @aws_region           = "us-east-1"
       @adapter              = ::Phase::Adapters::AWS
 
-      @bundle_id_prefix     = ""
-      @ipa_directory_prefix = ""
-      @ipa_bucket_name      = ""
-
       self.backend = ::Phase::SSH::Backend
       set_aws_credentials!
     end
@@ -27,6 +22,17 @@ module Phase
       ::SSHKit.config.backend = @backend
     end
 
+    # Available options:
+    #   * bundle_id_prefix
+    #   * directory_prefix
+    #   * bucket_name
+    #   * company_name
+    #   * full_image_url
+    #   * icon_image_url
+    def ipa
+      @ipa ||= ::ActiveSupport::OrderedOptions.new
+    end
+
     def load_phasefile!
       if ::File.exist?(phasefile_path)
         load phasefile_path

data/lib/phase/kit/ipa/app.rb

@@ -18,54 +18,36 @@ module Phase
       end
 
       def plist_xml
-        <<-EOXML.strip_heredoc
-          <?xml version="1.0" encoding="UTF-8"?>
-          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-          <plist version="1.0">
-          <dict>
-            <key>items</key>
-            <array>
-              <dict>
-                <key>assets</key>
-                <array>
-                  <dict>
-                    <key>kind</key>
-                    <string>software-package</string>
-                    <key>url</key>
-                    <string>https://s3.amazonaws.com/orca-static-assets/apps/#{ipa_filename}</string>
-                  </dict>
-                </array>
-                <key>metadata</key>
-                <dict>
-                  <key>bundle-identifier</key>
-                  <string>#{bundle_id_prefix}.#{bundle_name}</string>
-                  <key>bundle-version</key>
-                  <string>#{version}</string>
-                  <key>kind</key>
-                  <string>software</string>
-                  <key>title</key>
-                  <string>#{human_name}</string>
-                </dict>
-              </dict>
-            </array>
-          </dict>
-          </plist>
-        EOXML
+        xml = ::File.read( ::File.expand_path("../../templates/ipa_xml.plist", __dir__) )
+        ::ERB.new(xml).result(binding)
       end
 
       private
 
-        def human_name
-          name.titleize
-        end
-
         def bundle_name
           name
         end
 
         def bundle_id_prefix
-          Phase.config.bundle_id_prefix
+          Phase.config.ipa.bundle_id_prefix
+        end
+
+        def company_name
+          Phase.config.ipa.company_name
+        end
+
+        def full_image_url
+          Phase.config.ipa.full_image_url
         end
+
+        def human_name
+          name.titleize
+        end
+
+        def icon_image_url
+          Phase.config.ipa.icon_image_url
+        end
+
     end
   end
 end

data/lib/phase/kit/ipa/enterprise_deployment.rb

@@ -15,8 +15,8 @@ module Phase
         @file_paths.uniq!
 
         @aws = ::Fog::Storage::AWS.new(region: Phase.config.aws_region)
-        @bucket = aws.directories.get(Phase.config.ipa_bucket_name)
-        @prefix = ::Pathname.new(Phase.config.ipa_directory_prefix)
+        @bucket = aws.directories.get(Phase.config.ipa.bucket_name)
+        @prefix = ::Pathname.new(Phase.config.ipa.directory_prefix)
 
         @apps = []
       end
@@ -24,47 +24,36 @@ module Phase
       def run!
         ::FileUtils.mkdir(version) rescue nil
 
-        @apps = file_paths.map do |path|
-          app = App.new(path, version)
-          write_plist!(app)
-          copy_ipa!(app)
-          upload!(app)
+        manifest_path = ::File.join(::Dir.pwd, version, "manifest.txt")
+        ::File.open(manifest_path, 'w') do |manifest|
+          file_paths.map do |path|
+            app = App.new(path, version)
+            app.download_url = download_url(app)
 
-          log "...done"
-          log ""
+            log "#{app.name}: writing .plist..."
+            write_plist!(app)
 
-          app
-        end
+            log "#{app.name}: copying .ipa..."
+            copy_ipa!(app)
 
-        write_manifest!
-      end
+            log "#{app.name}: uploading files..."
+            upload!(app)
 
-      def write_manifest!
-        log "writing manifest"
+            log "#{app.name}: updating manifest..."
+            manifest << manifest_url(app)
+            manifest << "\n"
 
-        manifest_path = ::File.join(::Dir.pwd, version, "manifest.txt")
-        ::File.open(manifest_path, 'w') do |file|
-          apps.each do |app|
-            url = [
-              "itms-services://?action=download-manifest&url=https://s3.amazonaws.com",
-              bucket.key,
-              prefix,
-              app.plist_filename
-            ].join("/")
-
-            file << url
-            file << "\n"
+            log "#{app.name}: done"
+            log ""
           end
         end
       end
 
       def write_plist!(app)
-        log "#{app.name}: writing .plist"
         ::File.open(plist_path(app), 'w') { |file| file << app.plist_xml }
       end
 
       def copy_ipa!(app)
-        log "#{app.name}: copying .ipa"
         ::FileUtils.cp(app.qualified_path, ipa_path(app))
       end
 
@@ -81,15 +70,30 @@ module Phase
           acl: "public-read"
         })
 
-        log "#{app.name}: uploading .ipa"
         ipa.save
-
-        log "#{app.name}: uploading .plist"
         plist.save
       end
 
       private
 
+        def download_url(app)
+          [
+            "https://s3.amazonaws.com",
+            bucket.key,
+            prefix,
+            app.ipa_filename
+          ].join("/")
+        end
+
+        def manifest_url(app)
+          [
+            "itms-services://?action=download-manifest&url=https://s3.amazonaws.com",
+            bucket.key,
+            prefix,
+            app.plist_filename
+          ].join("/")
+        end
+
         def plist_path(app)
           ::File.join(::Dir.pwd, version, app.plist_filename)
         end

data/lib/phase/templates/ipa_xml.plist

@@ -0,0 +1,65 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>items</key>
+        <array>
+            <dict>
+                <key>assets</key>
+                <array>
+                    <dict>
+                        <key>kind</key>
+                        <string>software-package</string>
+                        <!-- optional.  md5 every n bytes.  -->
+                        <!-- will restart a chunk if md5 fails. -->
+                        <!-- <key>md5-size</key>
+                        <integer>10485760</integer> -->
+
+                        <!-- optional.  array of md5 hashes -->
+                        <!-- <key>md5s</key>
+                        <array>
+                            <string>41fa64bb7a7cae5a46bfb45821ac8bba</string>
+                            <string>51fa64bb7a7cae5a46bfb45821ac8bba</string>
+                        </array> -->
+                        <key>url</key>
+                        <string><%= download_url %></string>
+                    </dict>
+
+                    <dict>
+                        <key>kind</key>
+                        <string>display-image</string>
+                        <key>needs-shine</key>
+                        <false/>
+                        <key>url</key>
+                        <string><%= icon_image_url %></string>
+                    </dict>
+
+                    <dict>
+                        <key>kind</key>
+                        <string>full-size-image</string>
+                        <!-- <key>md5</key>
+                        <string>61fa64bb7a7cae5a46bfb45821ac8bba</string> -->
+                        <key>needs-shine</key>
+                        <false/>
+                        <key>url</key>
+                        <string><%= full_image_url %></string>
+                    </dict>
+                </array>
+
+                <key>metadata</key>
+                <dict>
+
+                    <key>bundle-identifier</key>
+                    <string><%= "#{bundle_id_prefix}.#{bundle_name}" %></string>
+                    <key>bundle-version</key>
+                    <string><%= version %></string>
+                    <key>kind</key>
+                    <string>software</string>
+                    <key>subtitle</key>
+                    <string><%= company_name %></string>
+                    <key>title</key>
+                    <string><%= human_name %></string>
+                </dict>
+            </dict>
+        </array>
+    </dict>
+</plist>

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.10"
+	VERSION = "0.0.11"
 end

data/lib/phase.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'capistrano'
 require 'colorize'
+require 'erb'
 require 'fog'
 require 'progressbar'
 require 'sshkit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -230,6 +230,7 @@ files:
 - lib/phase/kit/ssh/command.rb
 - lib/phase/kit/ssh/runners.rb
 - lib/phase/tasks/deploy.rb
+- lib/phase/templates/ipa_xml.plist
 - lib/phase/util/console.rb
 - lib/phase/version.rb
 - phase.gemspec