antenna-ota 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b807db1b06113f1407044abb45251cb713266f43
-  data.tar.gz: 21078d78892d63282e1664707906e8dfea720bb8
+  metadata.gz: 5268c6276e2dd2cdebbd16c1a1df41dc49bab722
+  data.tar.gz: 953bc51904fcb09accd8aa90df9691fb7ba09113
 SHA512:
-  metadata.gz: eb3a2ecb9baddd85d495d299dcb519927028a726fb9b009b712f2e3dd6daa94afcc45362e44c6da89c839002eb285ca094eecdae3baf8865c75721b12729f9b0
-  data.tar.gz: a0a59e1048541991ca3e61a6f568e8a039f809c3ba13bca025758811c98192e591f1205aac3ecaa96959970a53d7e7af97ee1fbc6711f0d8be1e3c2f1a7ec814
+  metadata.gz: b26482d957a336ef3c6ecc5b659d0d6f07947ceccd1738687608aa94027f6aee35791f4b4c4821fc06aafe92bbbbbcc906f0fed8581d2e620583e51be42569ed
+  data.tar.gz: 322384d8829dcd4dd5dc5743be1a2d2b52b030250bdda63b59d48eb1ca42fa0bbe4a00a5e6beadb41a12328dc4e4f16d7acff59f1c2da813f1f95340c0c8605c

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+notifications:
+  recipients:
+    - ci@funkreich.de

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/soulchild/antenna.svg?branch=master)](https://travis-ci.org/soulchild/antenna)
+
 # Antenna
 
 Antenna aims to take the pain out of creating and distributing all the necessary files for Enterprise iOS over-the-air distribution. It generates the mandatory XML manifest, app icons and an HTML file, automatically extracting all the needed information from the specified `.ipa` file, and uploads everything via a distribution method of your choice (currently only S3 is supported, but you're encouraged to create other storage backends). The result is a (signed S3) URL, which you may then send to your clients, so they can easily install your app from Mobile Safari with just one tap.
@@ -30,9 +32,11 @@ $ antenna
     -t, --trace          Display backtrace when an error occurs
 ```
 
-## Example
+## Examples
+
+### 1. Private, signed URL
 
-Create a new S3 bucket called `antenna-ota` on Amazon's `eu-central-1` S3 cluster and upload OverTheAir.ipa:
+Create a new S3 bucket called `antenna-ota` on Amazon's `eu-central-1` S3 cluster and upload OverTheAir.ipa, resulting in a signed URL for distribution:
 
 ```bash
 $ antenna s3 -a <YOUR-S3-ACCESS-KEY> -s <YOUR-S3-SECRET-KEY> --file OverTheAir.ipa --region eu-central-1 --create --bucket antenna-ota
@@ -43,7 +47,20 @@ Distributing OverTheAir.html ...
 https://antenna-ota.s3.eu-central-1.amazonaws.com/OverTheAir.html?<...signing-parameters...>
 ```
 
-The resulting URL leads to an installation page like the following and can be distributed to your users for installation. The meta-data and app-icon is automatically extracted from the given .ipa file.
+### 2. Public, unsigned URL
+
+Upload OverTheAir.ipa to Amazon's `eu-central-1` S3 cluster, resulting in a publically available, unsigned URL for distribution:
+
+```bash
+$ antenna s3 -a <YOUR-S3-ACCESS-KEY> -s <YOUR-S3-SECRET-KEY> --file OverTheAir.ipa --public --acl public-read --region eu-central-1 --bucket antenna-ota
+Distributing OverTheAir.ipa ...
+Distributing OverTheAir.png ...
+Distributing OverTheAir.plist ...
+Distributing OverTheAir.html ...
+https://antenna-ota.s3.eu-central-1.amazonaws.com/OverTheAir.html
+```
+
+The resulting URLs show an installation page like the following and can be distributed to your users for installation. The meta-data and app-icon is automatically extracted from the given .ipa file:
 
 ![Installation site](https://raw.githubusercontent.com/soulchild/antenna/master/assets/example-installation.png)
 

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/antenna.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
   
   spec.add_dependency "aws-sdk", '~> 2.0', '>= 2.0.0'
   spec.add_dependency "commander", "~> 4.3"
-  spec.add_dependency "highline", '~> 1.7', '>= 1.7.2'
+  spec.add_dependency "highline", '~> 1.7', '>= 1.7.0'
   spec.add_dependency "CFPropertyList", '~> 2.3', '>= 2.3.0'
   spec.add_dependency "rubyzip", '~> 1.0', '>= 1.0.0'
 end

data/lib/antenna.rb

@@ -1 +1 @@
-require "antenna/version"
+require "antenna/version"

data/lib/antenna/command/s3.rb

@@ -17,7 +17,8 @@ command :s3 do |c|
   c.option '-e', '--endpoint ENDPOINT', "S3 endpoint (optional, e.g. https://mys3.example.com)"
   c.option '-x', '--expires EXPIRES', "Expiration of URLs in seconds (optional, e.g. 86400 = one day)"
   c.option '-i', '--base BASE', "Base filename (optional, defaults to IPA filename without .ipa extension)"
-  c.option '--acl ACL', "Permissions for uploaded files. Must be one of: public_read, private, public_read_write, authenticated_read (optional, defaults to private)"
+  c.option '-p', '--public', "Use public instead of signed URLs (you'll probably want '--acl public-read' as well)"
+  c.option '--acl ACL', "Permissions for uploaded files. Must be one of: private, public-read, public-read-write, authenticated-read, bucket-owner-read, bucket-owner-full-control (optional, defaults to private)"
 
   c.action do |args, options|
     determine_file! unless @file = options.file
@@ -40,7 +41,14 @@ command :s3 do |c|
 
     s3 = Antenna::Distributor::S3.new(@access_key_id, @secret_access_key, @region, @endpoint)
     distributor = Antenna::Distributor.new(s3)
-    puts distributor.distribute @file, { :bucket => @bucket, :create => !!options.create, :expire => options.expires, :acl => @acl, :base => options.base } 
+    puts distributor.distribute @file, { 
+      :bucket => @bucket, 
+      :create => !!options.create, 
+      :public => !!options.public,
+      :expire => options.expires, 
+      :acl    => options.acl, 
+      :base   => options.base 
+    } 
   end
 
   private

data/lib/antenna/distributor.rb

@@ -60,7 +60,7 @@ module Antenna
     end
 
     def process_app_icon(ipa)
-      ipa.bundle_icon_files["57x57@2x"] || ipa.bundle_icon_files["60x60@2x"] || ipa.bundle_icon_files["60x60@3x"]
+      ipa.bundle_icon(57, 2) || ipa.bundle_icon(57, 1) || ipa.bundle_icon(60, 2) || ipa.bundle_icon(60, 1)
     end
 
     def build_manifest(ipa, ipa_url, app_icon_url)

data/lib/antenna/distributor/s3.rb

@@ -7,6 +7,7 @@ module Antenna
         :access_key_id      => access_key_id,
         :secret_access_key  => secret_access_key,
         :region             => region || "us-east-1",
+        :force_path_style   => true
       }
       options[:endpoint] = endpoint if endpoint
       @s3 = Aws::S3::Resource.new(options)
@@ -34,9 +35,14 @@ module Antenna
         :key          => filename,
         :content_type => content_type,
         :body         => data,
+        :acl          => @options[:acl]
       })
 
-      URI.parse(object.presigned_url(:get, { :expires_in => @options[:expire] }))
+      if @options[:public]
+        URI.parse(object.public_url)
+      else
+        URI.parse(object.presigned_url(:get, { :expires_in => @options[:expire] }))
+      end
     end
   end
 end

data/lib/antenna/infoplist.rb

@@ -1,13 +1,32 @@
-require "CFPropertyList"
+require "cfpropertylist"
 
 module Antenna
   class InfoPlist
-    attr_accessor :bundle_display_name, :bundle_short_version, :bundle_identifier, :bundle_version, :bundle_icon_filenames, :bundle_minimum_os_version
+    attr_accessor :bundle_display_name, :bundle_short_version, :bundle_identifier, :bundle_version, :bundle_icons, :bundle_minimum_os_version
+
+    class << self
+      # Class method to instantiate object with data from file.
+      def from_file(filename)
+        self.new(File.read(filename))
+      end
+
+      # Heuristically determines available icon sizes and resolutions from icon filenames
+      # and normalizes them into a hash. This hopefully works for most cases out there.
+      # Returns a hash of hashes like the following: 
+      # { icon_width => { icon_resolution => icon_filename } }
+      def determine_icons(iconfiles)
+        icons = Hash.new { |h, k| h[k] = { } }
+        iconfiles.each { |file| 
+          (width, height, resolution) = file.to_s.scan(/(\d+)?x?(\d+)?@?(\d+)?x?(\.png)?$/).flatten
+          next unless width
+          icons[width.to_i][(resolution || 1).to_i] = File.basename(file, ".*")
+        }
+        icons
+      end
+    end
 
     def initialize(data)
-      infoplist = CFPropertyList::List.new(
-        :data   => data, 
-      )
+      infoplist = CFPropertyList::List.new(:data => data)
       infoplist_data = CFPropertyList.native_types(infoplist.value)
 
       @bundle_display_name        = infoplist_data["CFBundleDisplayName"] || infoplist_data["CFBundleName"]
@@ -15,12 +34,15 @@ module Antenna
       @bundle_short_version       = infoplist_data["CFBundleShortVersionString"]
       @bundle_version             = infoplist_data["CFBundleVersion"]
       @bundle_minimum_os_version  = infoplist_data["MinimumOSVersion"]
+      @bundle_icons               = {}
 
-      icons = infoplist_data["CFBundleIcons"]
-      if icons
-        primary_icon = icons["CFBundlePrimaryIcon"]
-        if primary_icon
-          @bundle_icon_filenames = primary_icon["CFBundleIconFiles"]
+      if icons = infoplist_data["CFBundleIconFiles"]
+        @bundle_icons = self.class.determine_icons(icons)
+      else
+        if icons = infoplist_data["CFBundleIcons"]
+          if primary_icon = icons["CFBundlePrimaryIcon"]
+            @bundle_icons = self.class.determine_icons(primary_icon["CFBundleIconFiles"])
+          end
         end
       end
     end

data/lib/antenna/ipa.rb

@@ -11,38 +11,34 @@ module Antenna
       @bundle_icon_files = {}
 
       Zip::File.open(filename) do |zipfile|
-        zipfile.dir.entries("Payload").each do |entry|
-          # Find app name
-          if entry =~ /.app$/
-            app_entry = zipfile.find_entry("Payload/#{entry}")
-            if app_entry
-              @app_name = entry
+        # Determine app name
+        @app_name = zipfile.dir.entries('Payload').
+          select { |file| file =~ /.app$/ }.
+          first
+        raise "Unable to determine app name from #{filename}" unless @app_name
 
-              # Find and parse Info.plist
-              infoplist_entry = zipfile.find_entry("Payload/#{@app_name}/Info.plist")
-              if infoplist_entry
-                infoplist_data = infoplist_entry.get_input_stream.read
-                @info_plist = Antenna::InfoPlist.new(infoplist_data)
-                break
-              end
-            end
-          end
-        end
-
-        say "Info.plist not found in #{filename}" and abort unless @info_plist
+        # Find and read Info.plist
+        infoplist_entry = zipfile.get_entry("Payload/#{@app_name}/Info.plist")
+        infoplist_data = infoplist_entry.get_input_stream.read
+        @info_plist = Antenna::InfoPlist.new(infoplist_data)
+        raise "Unable to find Info.plist in #{filename}" unless @info_plist
+      end
+    end
 
-        # Extract main icon files
-        @info_plist.bundle_icon_filenames.each do |icon|
-          icon_glob = "Payload/#{@app_name}/#{icon}*.png"
-          zipfile.glob(icon_glob).each do |entry|
-            (width, height, resolution) = entry.to_s.scan(/(\d+)x(\d+)@(\d+)x\.png$/).flatten
-            if width and height and resolution
-              key = "#{width}x#{height}@#{resolution}x"
-              @bundle_icon_files[key] = entry.get_input_stream.read
+    # Returns icon image data for given pixel size and resolution (defaults to 1).
+    def bundle_icon(size, resolution=1)
+      icon_data = nil
+      if resolutions = @info_plist.bundle_icons[size]
+        if filename = resolutions[resolution]
+          icon_glob = "Payload/#{@app_name}/#{filename}*.png"
+          Zip::File.open(@filename) do |zipfile|
+            zipfile.glob(icon_glob).each do |icon|
+              icon_data = icon.get_input_stream.read
             end
           end
         end
       end
+      icon_data
     end
 
     def input_stream

data/lib/antenna/manifest.rb

@@ -57,4 +57,4 @@ EOF
       ERB.new(template).result(binding)
     end
   end
-end
+end

data/lib/antenna/version.rb

@@ -1,3 +1,3 @@
 module Antenna
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antenna-ota
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tobi Kremer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +105,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt