xcjobs 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b499b7d8707eaf6a61042e33d345dc207c2697
-  data.tar.gz: a80560d7918206203c7e66647b3ea66640fac2b7
+  metadata.gz: 76f457f4567b683a3bf3a2b6d1242a065319703e
+  data.tar.gz: 5667d8fc64b19fcd08a53d8628374fd1cd88e449
 SHA512:
-  metadata.gz: db219848a537f19c8390a5cc61fed225334137b50d668c44918f40f6f44d312052c6178f497bdb398a54e042e44c72506b4d3cf97c55da84d89de34fb9dd61aa
-  data.tar.gz: 09e96ba95bec3886b4d4b5d9b6c0b041a3ee0d23efa97d293e0ab9f23b584a0c72018b181a7f25f5e61cb2b95dedb419d0fbc369ffdc2d9cde57125a50cbaec0
+  metadata.gz: ad1e183858cf11f23d63c9ea3d4f1a3150935d8b3081cf482d68bf15b593dcd72b76a80faca87d7dfffe8bd1d12f944e8dba96b0c5bd35c7fcb2762bc528a181
+  data.tar.gz: 069934a3bf57309a10d06d440ba305592246a1d3fe9fa7b384ebcf7df2cd48e05e4d6333095fd70266196c524849c265555b214158669cbdf1ae66776ab3a68e

data/README.md

@@ -110,19 +110,19 @@ $ bundle exec rake build:export
 xcodebuild -exportArchive -exportFormat IPA -archivePath build/Example.xcarchive -exportPath build/Example.ipa -exportProvisioningProfile Ad Hoc Provisioning Profile
 ```
 
-### Distribute (Upload to TestFlight/Crittercism)
+### Distribute (Upload to Crittercism/TestFlight/DeployGate/HockeyApp)
 
 ```ruby
 XCJobs::Distribute::Crittercism.new do |t|
   t.app_id = 'xxx...'
-  t.key = 'xxx...'
+  t.key = 'yyy...'
   t.dsym = File.join('build', 'dSYMs.zip')
 end
 
 XCJobs::Distribute::TestFlight.new do |t|
   t.file = File.join('build', "#{Example}.ipa")
   t.api_token = 'xxx...'
-  t.team_token = 'xxx...'
+  t.team_token = 'yyy...'
   t.notify = true
   t.replace = true
   t.distribution_lists = 'Dev'
@@ -131,14 +131,36 @@ end
 
 XCJobs::Distribute::DeployGate.new do |t|
   t.owner_name = 'kishikawakatsumi'
-    t.file = File.join('build', "#{Example}.ipa")
+  t.file = File.join('build', "#{Example}.ipa")
   t.token = 'xxx...'
   t.message = "Uploaded: #{DateTime.now.strftime("%Y/%m/%d %H:%M:%S")}" # optional
-  t.distribution_key = 'xxx...' # optional
+  t.distribution_key = 'yyy...' # optional
   t.release_note = '...' # optional
   t.disable_notify = false # optional
   t.visibility = 'public' # optional
 end
+
+XCJobs::Distribute::Crashlytics.new do |t|
+  t.framework_path = '/path/to/Crashlytics.framework'
+  t.file = File.join('build', "#{Example}.ipa")
+  t.api_key = 'xxx...'
+  t.build_secret = 'yyy...'
+  t.notes = "Uploaded: #{DateTime.now.strftime("%Y/%m/%d %H:%M:%S")}" # optional
+  t.notifications = true # optional
+  t.add_email('TestEmail@crashlytics.com')
+  t.add_email('AmazingTester@twitter.com')
+  t.add_group_alias('GroupAlias')
+  t.add_group_alias('GroupAlias2')
+end
+
+XCJobs::Distribute::HockeyApp.new do |t|
+  t.file = File.join('build', "#{Example}.ipa")
+  t.dsym = File.join('build', 'dSYMs.zip') # optional
+  t.token = 'xxx...'
+  t.identifier = 'xxx...'
+  t.notes = "Uploaded: #{DateTime.now.strftime("%Y/%m/%d %H:%M:%S")}" # optional
+  t.notes_type = 1 # optional
+end
 ```
 
 ```shell
@@ -147,6 +169,7 @@ $ rake -T
 rake distribute:crittercism     # upload dSYMs to Crittercism
 rake distribute:testflight      # upload IPA to TestFlight
 rake distribute:deploygate      # upload IPA to DeployGate
+rake distribute:hockeyapp       # upload IPA & dSYMs to HockeyApp
 ```
 
 ### Install/Remove certificates (For Travis CI)

data/lib/xcjobs/distribute.rb

@@ -3,13 +3,14 @@ require 'open3'
 
 module XCJobs
   module Distribute
-    def upload(url, form_data = {})
+    def upload(url, form_data = {}, header = {})
       @before_action.call if @before_action
 
       curl_options = ['curl', '-sSf', "#{url}"]
       form_fields = form_data.flat_map { |k, v| ['-F', "#{k}=#{v}"] }
-      puts (curl_options + form_fields).join(' ')
-      Open3.popen2e(*(curl_options + form_fields)) do |stdin, stdout_err, wait_thr|
+      header_fields = header.flat_map { |k, v| ['-H', "#{k}:#{v}"] }
+      puts (curl_options + form_fields + header_fields).join(' ')
+      Open3.popen2e(*(curl_options + form_fields + header_fields)) do |stdin, stdout_err, wait_thr|
         output = ''
         while line = stdout_err.gets
           puts line
@@ -107,7 +108,7 @@ module XCJobs
       def form_data
         {}.tap do |fields|
           fields[:token] = token if token
-            fields[:file] = "@#{file}" if file
+          fields[:file] = "@#{file}" if file
           fields[:message] = message if message
           fields[:distribution_key] = distribution_key if distribution_key
           fields[:release_note] = release_note if release_note
@@ -117,6 +118,106 @@ module XCJobs
       end
     end
 
+    class Crashlytics < Rake::TaskLib
+      include Rake::DSL if defined?(Rake::DSL)
+      include Distribute
+
+      attr_accessor :framework_path
+      attr_accessor :file
+      attr_accessor :api_key
+      attr_accessor :build_secret
+      attr_accessor :notes
+      attr_accessor :notifications
+
+      def initialize()
+        @notifications = true
+        @emails = []
+        @group_aliases = []
+        yield self if block_given?
+        define
+      end
+
+      def add_email(email)
+        @emails << email
+      end
+
+      def add_group_alias(group_alias)
+        @group_aliases << group_alias
+      end
+
+      private
+
+      def define
+        namespace :distribute do
+          desc 'upload IPA to Beta by Crashlytics'
+          task :crashlytics do
+            @before_action.call if @before_action
+            sh *(["#{File.join(framework_path, 'submit')}"] + options)
+            @after_action.call('', SystemExit.new) if @after_action
+          end
+        end
+      end
+
+      def options
+        [].tap do |opts|
+          opts << api_key
+          opts << build_secret
+          opts.concat(['-ipaPath', file]) if file
+          opts.concat(['-notifications', 'NO']) unless notifications
+          opts.concat(['-emails', @emails.join(',')]) unless @emails.empty?
+          opts.concat(['-groupAliases', @group_aliases.join(',')]) unless @group_aliases.empty?
+          if notes
+            temp = Tempfile.new('release_notes.txt')
+            temp.puts(notes)
+            opts.concat(['-notesPath', temp.path])
+          end
+        end
+      end
+    end
+
+    class HockeyApp < Rake::TaskLib
+      include Rake::DSL if defined?(Rake::DSL)
+      include Distribute
+
+      attr_accessor :file
+      attr_accessor :dsym
+      attr_accessor :token
+      attr_accessor :identifier
+      attr_accessor :notes
+      attr_accessor :notes_type
+
+      def initialize()
+        yield self if block_given?
+        define
+      end
+
+      private
+
+      def define
+        namespace :distribute do
+          desc 'upload IPA & dSYMs to HockeyApp'
+          task :hockeyapp do
+            upload("https://rink.hockeyapp.net/api/2/apps/#{identifier}/app_versions/upload", form_data, header)
+          end
+        end
+      end
+
+      def form_data
+        {}.tap do |fields|
+          fields[:ipa] = "@#{file}" if file
+          fields[:dsym] = "@#{dsym}" if dsym
+          fields[:notes] = notes if notes
+          fields[:notes_type] = notes_type if notes_type
+        end
+      end
+
+      def header
+        {}.tap do |fields|
+          fields["X-HockeyAppToken"] = token if token
+        end
+      end
+    end
+
     class Crittercism < Rake::TaskLib
       include Rake::DSL if defined?(Rake::DSL)
       include Distribute
@@ -125,7 +226,7 @@ module XCJobs
       attr_accessor :dsym
       attr_accessor :key
 
-      def initialize(name=:export)
+      def initialize()
         yield self if block_given?
         define
       end
@@ -158,7 +259,7 @@ module XCJobs
       attr_accessor :password
       attr_accessor :altool
 
-      def initialize(name=:export)
+      def initialize()
         yield self if block_given?
         define
       end
@@ -173,10 +274,11 @@ module XCJobs
         namespace :distribute do
           desc 'upload ipa to iTunes Connect'
           task :itc do
-            sh %["#{altool}" --upload-app --file "#{file}" --username #{username} --password #{password}]
+            sh *["#{altool}", '--upload-app', '--file', "#{file}", '--username', "#{username}", '--password', "#{password}"]
           end
         end
       end
     end
+
   end
 end

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/distribute_spec.rb

@@ -4,14 +4,18 @@ require 'date'
 describe XCJobs::Distribute do
   before(:each) do
     @commands = []
-
-    allow_any_instance_of(FileUtils).to receive(:sh) do |object, command|
-      @commands << command
+    allow_any_instance_of(FileUtils).to receive(:sh) do |object, command, param1, param2, param3, param4, param5, param6, param7, param8, param9|
+      [object, command, param1, param2, param3, param4, param5, param6, param7, param8, param9].each do |e|
+        if e.kind_of? String
+          @commands << "#{e}"
+        end
+      end
     end
 
-    allow_any_instance_of(XCJobs::Distribute).to receive(:upload) do |object, url, form_data|
+    allow_any_instance_of(XCJobs::Distribute).to receive(:upload) do |object, url, form_data, header|
       @url = url
       @form_data = form_data
+      @header = header
     end
 
     Rake.application = rake
@@ -175,60 +179,68 @@ describe XCJobs::Distribute do
     end
   end
 
-  describe XCJobs::Distribute::Crittercism do
-    describe 'define upload dSYMs task' do
+  describe XCJobs::Distribute::Crashlytics do
+    describe 'define upload ipa task' do
+      let(:framework_path) { '/path/to/Crashlytics.framework' }
+
       let(:credentials) do
-        { app_id: '123456789abcdefg12345678',
-          key: 'abcdefghijklmnopqrstuvwxyz123456',
+        { api_key: 'abcde1234fghij75014d19d07e2a24f02d75e20',
+          build_secret: '12345abcdef1b40d0187e99c7707828419312f6778a2331fedab5bb6ffe',
         }
       end
 
-      let(:dsym_file) do
-        File.join('build', 'dSYMs.zip')
-      end
+      let(:file) { File.join('build', 'Example.ipa') }
+
+      let(:notes) { "Uploaded: #{DateTime.now.strftime("%Y/%m/%d %H:%M:%S")}" }
 
       let!(:task) do
-        XCJobs::Distribute::Crittercism.new do |t|
-          t.app_id = credentials[:app_id]
-          t.key = credentials[:key]
-          t.dsym = dsym_file
+        XCJobs::Distribute::Crashlytics.new do |t|
+          t.framework_path = framework_path
+          t.file = file
+          t.api_key = credentials[:api_key]
+          t.build_secret = credentials[:build_secret]
+          t.notifications = true # optional
         end
       end
 
-      it 'configures the app_id' do
-        expect(task.app_id).to eq credentials[:app_id]
+      it 'configures the framework path' do
+        expect(task.framework_path).to eq framework_path
       end
 
-      it 'configures the key' do
-        expect(task.key).to eq credentials[:key]
+      it 'configures the ipa file path' do
+        expect(task.file).to eq file
       end
 
-      it 'configures the dsym file path' do
-        expect(task.dsym).to eq dsym_file
+      it 'configures the api_key' do
+        expect(task.api_key).to eq credentials[:api_key]
+      end
+
+      it 'configures the build_secret' do
+        expect(task.build_secret).to eq credentials[:build_secret]
+      end
+
+      it 'configures the notifications' do
+        expect(task.notifications).to eq true
       end
 
       describe 'tasks' do
-        describe 'distribute:crittercism' do
-          subject { Rake.application['distribute:crittercism'] }
+        describe 'distribute:crashlytics' do
+          subject { Rake.application['distribute:crashlytics'] }
 
           it 'executes the appropriate commands' do
             subject.invoke
-            expect(@url).to eq "https://api.crittercism.com/api_beta/dsym/#{credentials[:app_id]}"
-            expect(@form_data).to eq({
-              dsym: "@#{dsym_file}",
-              key: credentials[:key],
-            })
+            expect(@commands).to eq ["#{File.join(framework_path, 'submit')}", credentials[:api_key], credentials[:build_secret], '-ipaPath', "#{file}"]
           end
         end
       end
     end
   end
 
-  describe XCJobs::Distribute::ITC do
-    describe 'define upload ipa task' do
+  describe XCJobs::Distribute::HockeyApp do
+    describe 'define upload dSYMs task' do
       let(:credentials) do
-        { username: 'kishikawakatsumi',
-          password: 'password1234',
+        { token: '123456789abcdefg12345678',
+          identifier: 'abcdefghijklmnopqrstuvwxyz123456',
         }
       end
 
@@ -236,38 +248,163 @@ describe XCJobs::Distribute do
         File.join('build', 'Example.ipa')
       end
 
-      let(:altool) { '/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool' }
+      let(:dsym_file) do
+        File.join('build', 'dSYMs.zip')
+      end
+
+      let(:notes) { "Uploaded: #{DateTime.now.strftime("%Y/%m/%d %H:%M:%S")}" }
 
       let!(:task) do
-        XCJobs::Distribute::ITC.new do |t|
-          t.username = credentials[:username]
-          t.password = credentials[:password]
+        XCJobs::Distribute::HockeyApp.new do |t|
           t.file = file
+          t.dsym = dsym_file
+          t.token = credentials[:token]
+          t.identifier = credentials[:identifier]
+          t.notes = notes
+          t.notes_type = 1
         end
       end
 
-      it 'configures the username' do
-        expect(task.username).to eq credentials[:username]
+      it 'configures the file path' do
+        expect(task.file).to eq file
       end
 
-      it 'configures the password' do
-        expect(task.password).to eq credentials[:password]
+      it 'configures the dsym file path' do
+        expect(task.dsym).to eq dsym_file
       end
 
-      it 'configures the file path' do
-        expect(task.file).to eq file
+      it 'configures the token' do
+        expect(task.token).to eq credentials[:token]
+      end
+
+      it 'configures the identifier' do
+        expect(task.identifier).to eq credentials[:identifier]
+      end
+
+      it 'configures the notes' do
+        expect(task.notes).to eq notes
+      end
+
+      it 'configures the notes_type' do
+        expect(task.notes_type).to eq 1
       end
 
       describe 'tasks' do
-        describe 'distribute:itc' do
-          subject { Rake.application['distribute:itc'] }
+        describe 'distribute:hockeyapp' do
+          subject { Rake.application['distribute:hockeyapp'] }
 
           it 'executes the appropriate commands' do
             subject.invoke
-            expect(@commands).to eq [%["#{altool}" --upload-app --file "#{file}" --username #{credentials[:username]} --password #{credentials[:password]}]]
+            expect(@url).to eq "https://rink.hockeyapp.net/api/2/apps/#{credentials[:identifier]}/app_versions/upload"
+            expect(@form_data).to eq({
+              ipa: "@#{file}",
+              dsym: "@#{dsym_file}",
+              notes: notes,
+              notes_type: 1,
+            })
+            expect(@header).to eq({
+              "X-HockeyAppToken" => credentials[:token]
+            })
           end
         end
       end
     end
+
+    describe XCJobs::Distribute::Crittercism do
+      describe 'define upload dSYMs task' do
+        let(:credentials) do
+          { app_id: '123456789abcdefg12345678',
+            key: 'abcdefghijklmnopqrstuvwxyz123456',
+          }
+        end
+
+        let(:dsym_file) do
+          File.join('build', 'dSYMs.zip')
+        end
+
+        let!(:task) do
+          XCJobs::Distribute::Crittercism.new do |t|
+            t.app_id = credentials[:app_id]
+            t.key = credentials[:key]
+            t.dsym = dsym_file
+          end
+        end
+
+        it 'configures the app_id' do
+          expect(task.app_id).to eq credentials[:app_id]
+        end
+
+        it 'configures the key' do
+          expect(task.key).to eq credentials[:key]
+        end
+
+        it 'configures the dsym file path' do
+          expect(task.dsym).to eq dsym_file
+        end
+
+        describe 'tasks' do
+          describe 'distribute:crittercism' do
+            subject { Rake.application['distribute:crittercism'] }
+
+            it 'executes the appropriate commands' do
+              subject.invoke
+              expect(@url).to eq "https://api.crittercism.com/api_beta/dsym/#{credentials[:app_id]}"
+              expect(@form_data).to eq({
+                dsym: "@#{dsym_file}",
+                key: credentials[:key],
+              })
+            end
+          end
+        end
+      end
+    end
+
+    describe XCJobs::Distribute::ITC do
+      describe 'define upload ipa task' do
+        let(:credentials) do
+          { username: 'kishikawakatsumi',
+            password: 'password1234',
+          }
+        end
+
+        let(:file) do
+          File.join('build', 'Example.ipa')
+        end
+
+        let(:altool) { '/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool' }
+
+        let!(:task) do
+          XCJobs::Distribute::ITC.new do |t|
+            t.username = credentials[:username]
+            t.password = credentials[:password]
+            t.file = file
+          end
+        end
+
+        it 'configures the username' do
+          expect(task.username).to eq credentials[:username]
+        end
+
+        it 'configures the password' do
+          expect(task.password).to eq credentials[:password]
+        end
+
+        it 'configures the file path' do
+          expect(task.file).to eq file
+        end
+
+        describe 'tasks' do
+          describe 'distribute:itc' do
+            subject { Rake.application['distribute:itc'] }
+
+            it 'executes the appropriate commands' do
+              subject.invoke
+              expect(@commands).to eq ["#{altool}", '--upload-app', '--file', "#{file}", '--username', "#{credentials[:username]}", '--password', "#{credentials[:password]}"]
+            end
+          end
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler