blast_off 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1202d1d5e2f9986fe696bf9d5380561292d91e45
-  data.tar.gz: 35baf8634c4c525a5e37220a8a5f85f5dd6beb5d
+  metadata.gz: 5a6e9251f16129eb15def3ec26795df792984bec
+  data.tar.gz: 188ebf9f63c74820302fdfeed8aa6ee678ea559f
 SHA512:
-  metadata.gz: f63439b3cde6a62bb732e5c170efa7df41db779086f2031232ccb0a554e1d8eeb1c8cc23105b021753403acc483bc522364e03f7d8c10a6c9321cf6859edb9b8
-  data.tar.gz: 041bff9493d50b1bdbc72abecd012042e1442f7fb7bb269b23346bbd2c229850e44f4e9b87850faa3ab0a4e1e52e07537e52040eedbb9d9d135f918e03567546
+  metadata.gz: 063fef30610b2bb1ec3002a57cd122a3a3da1fd3c75bd81669c5e3a4558642ab90c05f7da5120d4855a37aef7043f37b80d7e11a1259dfc2fb979817eb3b4772
+  data.tar.gz: 1f58707ce398a963e7d41217a0ff24b66f0d9a200d0d88d0e664d9cfd155e1456c24682bf3787cb5c7081a3c06f13d6e6e2293c10031bad09b0117f363500efa

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## [v0.3.0](https://github.com/linjunpop/blast_off/tree/v0.3.0)
+
+* Set correct file mime-types.
+* Also include App short version on web page.
+
 ## [v0.2.0](https://github.com/linjunpop/blast_off/tree/v0.2.0)
 
 * Let services' `generate` method return URL address.

data/README.md

@@ -69,6 +69,10 @@ Example:
 
 ## [Changelog](CHANGELOG.md)
 
+## Similar projects:
+
+* https://github.com/lexrus/ios-makefile
+
 ## Contributing
 
 1. Fork it

data/blast_off.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", '~> 2.14'
+  spec.add_development_dependency "nokogiri", '~> 1.6'
 
   spec.add_runtime_dependency 'gli','~> 2.8.1'
   spec.add_runtime_dependency 'qiniu-rs', '~> 3.4.6'
   spec.add_runtime_dependency 'rainbow', '~> 1.1.4'
   spec.add_runtime_dependency 'ipa_reader', '~> 0.7.1'
+  spec.add_runtime_dependency 'CFPropertyList'
 end

data/lib/blast_off.rb

@@ -2,6 +2,7 @@ require 'ipa_reader'
 
 require "blast_off/version"
 require "blast_off/services"
+require "blast_off/template"
 
 module BlastOff
 end

data/lib/blast_off/services/qiniu.rb

@@ -9,37 +9,32 @@ module BlastOff
       def initialize(ipa_file_path:nil, access_key:'', secret_key:'', bucket:'')
         @ipa_file_path = ipa_file_path
         @ipa_file = ::IpaReader::IpaFile.new(ipa_file_path)
-        @qiniu_bucket = bucket
+        @bucket = bucket
 
         ::Qiniu::RS.establish_connection!(
           enable_debug: false,
           access_key: access_key,
           secret_key: secret_key
         )
+        @upload_token = ::Qiniu::RS.generate_upload_token(scope: @bucket)
       end
 
       def distribute
-        manifest_file = Tempfile.new('manifest')
-        begin
-          manifest_file.write(manifest_template)
-          manifest_file.rewind
-          upload(manifest_file.path, 'manifest.plist')
-        ensure
-          manifest_file.close
-          manifest_file.unlink
-        end
-
-        html_file = Tempfile.new('html')
-        begin
-          html_file.write(html_template)
-          html_file.rewind
-          upload(html_file.path, 'index.html')
-        ensure
-          html_file.close
-          html_file.unlink
-        end
-
-        upload(@ipa_file_path, "#{@ipa_file.name}.ipa")
+        upload_string(
+          template.manifest_plist("#{base_url}/#{@ipa_file.name}.ipa"),
+          'manifest.plist',
+          'application/octet-stream'
+        )
+        upload_string(
+          template.html("#{base_url}/manifest.plist"),
+          'index.html',
+          'text/html'
+        )
+        upload_file(
+          @ipa_file_path,
+          "#{@ipa_file.name}.ipa",
+          'application/octet-stream'
+        )
 
         "#{base_url}/index.html"
       end
@@ -51,48 +46,34 @@ module BlastOff
       end
 
       def base_url
-        "http://#{@qiniu_bucket}.qiniudn.com/#{base_path}"
+        "http://#{@bucket}.qiniudn.com/#{base_path}"
       end
 
-      def upload(file, key)
-        upload_token = ::Qiniu::RS.generate_upload_token scope: @qiniu_bucket
-
-        ::Qiniu::RS.upload_file uptoken: upload_token,
-          file: file,
-          bucket: @qiniu_bucket,
-          key: "#{base_path}/#{key}"
+      def upload_string(string, key, mime_type)
+        file = Tempfile.new(key)
+        begin
+          file.write(string)
+          file.rewind
+          upload_file(file.path, key, mime_type)
+        ensure
+          file.close
+          file.unlink
+        end
       end
 
-      def manifest_template
-        {
-          items: [
-            assets: [
-              {
-                kind: 'software-package',
-                url: "#{base_url}/#{@ipa_file.name}.ipa"
-              }
-            ],
-            metadata: {
-              'bundle-identifier' => @ipa_file.bundle_identifier,
-              'bundle-version' => @ipa_file.version,
-              kind: 'software',
-              title: @ipa_file.name
-            }
-          ]
-        }.to_plist
+      def upload_file(filepath, key, mime_type)
+        ::Qiniu::RS.upload_file(
+          uptoken: @upload_token,
+          file: filepath,
+          mime_type: mime_type,
+          bucket: @bucket,
+          key: "#{base_path}/#{key}"
+        )
       end
 
-      def html_template
-        opts = OpenStruct.new({
-          app_name:  @ipa_file.name,
-          app_version: @ipa_file.version,
-          base_url: base_url
-        })
-        template_file = File.join(File.dirname(File.expand_path(__FILE__)), '../template/index.html.erb')
-
-        ::ERB.new(File.read(template_file)).result(opts.instance_eval {binding})
+      def template
+        @template ||= Template.new(@ipa_file)
       end
-
     end
   end
 end

data/lib/blast_off/template.rb

@@ -0,0 +1,41 @@
+require 'cfpropertylist'
+require 'uri'
+
+module BlastOff
+  class Template
+    def initialize(ipa_file)
+      @ipa = ipa_file
+    end
+
+    def manifest_plist(ipa_file_url)
+      {
+        items: [
+          assets: [
+            {
+              kind: 'software-package',
+              url: ipa_file_url
+            }
+          ],
+          metadata: {
+            'bundle-identifier' => @ipa.bundle_identifier,
+            'bundle-version' => @ipa.version,
+            kind: 'software',
+            title: @ipa.name
+          }
+        ]
+      }.to_plist(plist_format: CFPropertyList::List::FORMAT_XML)
+    end
+
+    def html(manifest_plist_url)
+      opts = OpenStruct.new({
+        ipa: @ipa,
+        install_url: URI.escape(
+          "itms-services://?action=download-manifest&url=#{manifest_plist_url}"
+        )
+      })
+      template_file = File.join(File.dirname(File.expand_path(__FILE__)), 'template/index.html.erb')
+
+      ::ERB.new(File.read(template_file)).result(opts.instance_eval {binding})
+    end
+  end
+end

data/lib/blast_off/template/index.html.erb

@@ -33,18 +33,24 @@
       }
     </style>
 
-    <title><%= app_name %></title>
+    <title><%= ipa.name %> | <%= ipa.short_version %> (<%= ipa.version %>)</title>
   </head>
 
   <body>
     <div class="container">
-      <h1><%= app_name %></h1>
-      <img src="http://api.qrserver.com/v1/create-qr-code/?size=250x250&data=<%= base_url %>/index.html" alt="" />
-      <h2>Version: <%= app_version %></h2>
+      <h1><%= ipa.name %></h1>
+      <div class="qr-image"></div>
+      <h2>Version: <%= ipa.short_version %> (<%= ipa.version %>)</h2>
       <p>
-        <a class="button" href="itms-services://?action=download-manifest&url=<%= base_url %>/manifest.plist">Install</a>
+        <a class="button" href="<%= install_url %>">Install</a>
       </p>
     </div>
+    <script type="text/javascript" charset="utf-8">
+      var qrImageUrl = "http://api.qrserver.com/v1/create-qr-code/?size=250x250&data=" + document.URL;
+      var qrImageNode = document.createElement("img");
+      qrImageNode.src = qrImageUrl;
+      document.querySelector('.qr-image').appendChild(qrImageNode);
+    </script>
   </body>
 </html>
 

data/lib/blast_off/version.rb

@@ -1,3 +1,3 @@
 module BlastOff
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/blast_off/template_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+require 'nokogiri'
+
+describe BlastOff::Template do
+  let(:ipa) {
+    double(
+      'IPA',
+      name: 'Foobar',
+      bundle_identifier: 'com.example.Foobar',
+      version: '2013',
+      short_version: '1.0.0'
+    )
+  }
+  let(:template) {
+    BlastOff::Template.new(ipa)
+  }
+
+  describe '#html' do
+    let(:doc) {
+      Nokogiri::HTML(template.html('http://example.com/manifest.plist'))
+    }
+    let(:expected_install_url) {
+      "itms-services://?action=download-manifest&url=http://example.com/manifest.plist"
+    }
+
+    it 'generate correct install button' do
+      doc.at_css('.button')['href'].should eq expected_install_url
+    end
+
+    it 'generate correct version' do
+      doc.at_css('h2').text.should eq 'Version: 1.0.0 (2013)'
+    end
+
+    it 'generate correct title' do
+      doc.at_css('h1').text.should eq 'Foobar'
+    end
+  end
+
+  describe '#manifest_plist' do
+    let(:doc) {
+      Nokogiri::XML(template.manifest_plist('http://example.com/Foobar.ipa'))
+    }
+
+    it 'generate correct bundle-identifier' do
+      element = doc.
+        at_xpath('//key[contains(text(),"bundle-identifier")]').
+        next_element
+      element.text.should eq 'com.example.Foobar'
+    end
+
+    it 'generate correct url' do
+      element = doc.
+        at_xpath('//key[contains(text(),"url")]').
+        next_element
+      element.text.should eq 'http://example.com/Foobar.ipa'
+    end
+
+    it 'generate correct bundle-version' do
+      element = doc.
+        at_xpath('//key[contains(text(),"bundle-version")]').
+        next_element
+      element.text.should eq '2013'
+    end
+
+    it 'generate correct title' do
+      element = doc.
+        at_xpath('//key[contains(text(),"title")]').
+        next_element
+      element.text.should eq 'Foobar'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blast_off
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jun Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An iOS beta distribution tool.
 email:
 - linjunpop@gmail.com
@@ -129,9 +157,11 @@ files:
 - lib/blast_off.rb
 - lib/blast_off/services.rb
 - lib/blast_off/services/qiniu.rb
+- lib/blast_off/template.rb
 - lib/blast_off/template/index.html.erb
 - lib/blast_off/version.rb
 - spec/blast_off/services/qiniu_spec.rb
+- spec/blast_off/template_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/linjunpop/blast_off
 licenses:
@@ -159,5 +189,6 @@ specification_version: 4
 summary: An iOS beta distribution tool.
 test_files:
 - spec/blast_off/services/qiniu_spec.rb
+- spec/blast_off/template_spec.rb
 - spec/spec_helper.rb
 has_rdoc: