xcjobs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091108d90cf5ed6a1cec28b8bec082b7aab8ccfd
-  data.tar.gz: 919b0dae45768817875b8450ab5a2546f1af9048
+  metadata.gz: b5962d4c76d0cc02c6c62f205d5b1a23afca67f5
+  data.tar.gz: d6e04486413d5516d1ea83d91f225651a9a26c97
 SHA512:
-  metadata.gz: 7372e441dbdf4f86b2eddc7a49bb985d260c008b23cf108ed1b3bdd07af32288c545eb132b6f49bfc7c93193bb20f1e3c5bd3ea2ba75a5abc1e326262e1097bc
-  data.tar.gz: a8a54a041606803fbe4f5f685ec9ef8c5ce3a023660376242ec06938003e6d42741867475138e68444ab0c0b14dec9fd8a709254397308be59b6363be745028f
+  metadata.gz: 151273faa341ac14b9810a399bd865b7215ffddd95310610c1a6c29deb229e16e9bd1367aeb15c2098ea80c7c524332e76022d52394793b663cb54399a0e2983
+  data.tar.gz: 87b7bcd910a8f5edf3899912883e3736a002f3356ca72034b68cd40cc84fdeda28e6d93650ad13eaf6c6839e5ade97ca9c73bf4f55ca9699253378e32a7443f0

data/README.md

@@ -1,4 +1,6 @@
-# XCJobs [![Build Status](https://travis-ci.org/kishikawakatsumi/xcjobs.svg?branch=master)](https://travis-ci.org/kishikawakatsumi/xcjobs) [![Coverage Status](https://img.shields.io/coveralls/kishikawakatsumi/xcjobs.svg)](https://coveralls.io/r/kishikawakatsumi/xcjobs?branch=master)
+# XCJobs
+[![Gem Version](https://badge.fury.io/rb/xcjobs.svg)](http://badge.fury.io/rb/xcjobs) [![Build Status](https://travis-ci.org/kishikawakatsumi/xcjobs.svg?branch=master)](https://travis-ci.org/kishikawakatsumi/xcjobs) [![Coverage Status](https://img.shields.io/coveralls/kishikawakatsumi/xcjobs.svg)](https://coveralls.io/r/kishikawakatsumi/xcjobs?branch=master) [![Code Climate](https://codeclimate.com/github/kishikawakatsumi/xcjobs/badges/gpa.svg)](https://codeclimate.com/github/kishikawakatsumi/xcjobs) [![Dependency Status](https://gemnasium.com/kishikawakatsumi/xcjobs.svg)](https://gemnasium.com/kishikawakatsumi/xcjobs)
+
 
 Support the automation of release process of iOS/OSX apps with CI
 
@@ -191,7 +193,7 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'cocoapods'
 gem 'xcpretty'
-gem 'xcjobs', :github => 'kishikawakatsumi/xcjobs'
+gem 'xcjobs'
 ```
 
 ```yaml

data/lib/xcjobs/distribute.rb

@@ -104,5 +104,35 @@ module XCJobs
         end
       end
     end
+
+    class ITC < Rake::TaskLib
+      include Rake::DSL if defined?(Rake::DSL)
+      include Distribute
+
+      attr_accessor :file
+      attr_accessor :username
+      attr_accessor :password
+      attr_accessor :altool
+
+      def initialize(name=:export)
+        yield self if block_given?
+        define
+      end
+
+      def altool
+        @altool || '/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool'
+      end
+
+      private
+
+      def define
+        namespace :distribute do
+          desc 'upload ipa to iTunes Connect'
+          task :itc do
+            sh %["#{altool}" --upload-app --file "#{file}" --username #{username} --password #{password}]
+          end
+        end
+      end
+    end
   end
 end

data/lib/xcjobs/{infoplist.rb → info_plist.rb}

@@ -1,4 +1,4 @@
-require "rake/tasklib"
+require 'rake/tasklib'
 
 module XCJobs
   module InfoPlist
@@ -19,14 +19,6 @@ module XCJobs
       set(key, value)
     end
 
-    def build_version
-      self['CFBundleVersion']
-    end
-
-    def build_version=(revision)
-      self['CFBundleVersion'] = revision
-    end
-
     def marketing_version
       self['CFBundleShortVersionString']
     end
@@ -35,6 +27,14 @@ module XCJobs
       self['CFBundleShortVersionString'] = version
     end
 
+    def build_version
+      self['CFBundleVersion']
+    end
+
+    def build_version=(revision)
+      self['CFBundleVersion'] = revision
+    end
+
     def bump_marketing_version_segment(segment_index)
       segments = Gem::Version.new(marketing_version).segments
       segments[segment_index] = segments[segment_index].to_i + 1
@@ -53,6 +53,7 @@ module XCJobs
   module InfoPlist
     class Version < Rake::TaskLib
       include Rake::DSL if defined?(Rake::DSL)
+      include InfoPlist
 
       def initialize()
         yield self if block_given?
@@ -69,45 +70,45 @@ module XCJobs
 
       def define
         namespace :version do
-          desc "Print the current version"
+          desc 'Print the current version'
           task :current do
             puts InfoPlist.marketing_and_build_version
           end
 
-          desc "Sets build version to last git commit hash"
+          desc 'Sets build version to last git commit hash'
           task :set_build_version do
-            rev = `git rev-parse --short HEAD`.strip
+            rev = %x[git rev-parse --short HEAD].strip
             puts "Setting build version to: #{rev}"
             InfoPlist.build_version = rev
           end
 
-          desc "Sets build version to number of commits"
+          desc 'Sets build version to number of commits'
           task :set_build_number do
-            rev = `git rev-list --count HEAD`.strip
+            rev = %x[git rev-list --count HEAD].strip
             puts "Setting build version to: #{rev}"
             InfoPlist.build_version = rev
           end
 
           namespace :bump do
-            desc "Bump patch version (0.0.X)"
+            desc 'Bump patch version (0.0.X)'
             task :patch do
               InfoPlist.bump_marketing_version_segment(2)
             end
 
-            desc "Bump minor version (0.X.0)"
+            desc 'Bump minor version (0.X.0)'
             task :minor do
               InfoPlist.bump_marketing_version_segment(1)
             end
 
-            desc "Bump major version (X.0.0)"
+            desc 'Bump major version (X.0.0)'
             task :major do
               InfoPlist.bump_marketing_version_segment(0)
             end
           end
         end
 
-        desc "Print the current version"
-        task :version => "version:current"
+        desc 'Print the current version'
+        task :version => 'version:current'
       end
     end
   end

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -1,5 +1,6 @@
 require 'rake/tasklib'
 require 'rake/clean'
+require 'open3'
 
 module XCJobs
   class Xcodebuild < Rake::TaskLib
@@ -70,7 +71,11 @@ module XCJobs
     def run(cmd)
       @before_action.call if @before_action
 
-      puts cmd.join(" ")
+      if @formatter
+        puts (cmd + ['|', @formatter]).join(" ")
+      else
+        puts cmd.join(" ")
+      end
 
       if @formatter
         Open3.pipeline_r(cmd, [@formatter]) do |stdout, wait_thrs|
@@ -184,7 +189,7 @@ module XCJobs
   end
 
   class Archive < Xcodebuild
-    attr_accessor :archivePath
+    attr_accessor :archive_path
 
     def initialize(name = :archive)
       super
@@ -216,25 +221,25 @@ module XCJobs
       end
     end
 
-    def archivePath
-      @archivePath || (build_dir && scheme ? File.join(build_dir, scheme) : nil)
+    def archive_path
+      @archive_path || (build_dir && scheme ? File.join(build_dir, scheme) : nil)
     end
 
     def options
       super.tap do |opts|
-        opts.concat(['-archivePath', archivePath]) if archivePath
+        opts.concat(['-archivePath', archive_path]) if archive_path
       end
     end
   end
 
   class Export < Xcodebuild
-    attr_accessor :archivePath
-    attr_accessor :exportFormat
-    attr_accessor :exportPath
-    attr_accessor :exportProvisioningProfile
-    attr_accessor :exportSigningIdentity
-    attr_accessor :exportInstallerIdentity
-    attr_accessor :exportWithOriginalSigningIdentity
+    attr_accessor :archive_path
+    attr_accessor :export_format
+    attr_accessor :export_path
+    attr_accessor :export_provisioning_profile
+    attr_accessor :export_signing_identity
+    attr_accessor :export_installer_identity
+    attr_accessor :export_with_original_signing_identity
 
     def initialize(name = :export)
       super
@@ -253,23 +258,23 @@ module XCJobs
       end
     end
 
-    def archivePath
-      @archivePath || (build_dir && scheme ? File.join(build_dir, scheme) : nil)
+    def archive_path
+      @archive_path || (build_dir && scheme ? File.join(build_dir, scheme) : nil)
     end
 
-    def exportFormat
-      @exportFormat || 'IPA'
+    def export_format
+      @export_format || 'IPA'
     end
 
     def options
       [].tap do |opts|
-        opts.concat(['-archivePath', archivePath]) if archivePath
-        opts.concat(['-exportFormat', exportFormat])  if exportFormat
-        opts.concat(['-exportPath', exportPath]) if exportPath
-        opts.concat(['-exportProvisioningProfile', exportProvisioningProfile]) if exportProvisioningProfile
-        opts.concat(['-exportSigningIdentity', exportSigningIdentity]) if exportSigningIdentity
-        opts.concat(['-exportInstallerIdentity', exportInstallerIdentity]) if exportInstallerIdentity
-        opts.concat(['-exportWithOriginalSigningIdentity']) if exportWithOriginalSigningIdentity
+        opts.concat(['-archivePath', archive_path]) if archive_path
+        opts.concat(['-exportFormat', export_format])  if export_format
+        opts.concat(['-exportPath', export_path]) if export_path
+        opts.concat(['-exportProvisioningProfile', export_provisioning_profile]) if export_provisioning_profile
+        opts.concat(['-exportSigningIdentity', export_signing_identity]) if export_signing_identity
+        opts.concat(['-exportInstallerIdentity', export_installer_identity]) if export_installer_identity
+        opts.concat(['-exportWithOriginalSigningIdentity']) if export_with_original_signing_identity
       end
     end
   end

data/lib/xcjobs.rb

@@ -2,4 +2,4 @@ require "xcjobs/version"
 require "xcjobs/xcodebuild"
 require "xcjobs/certificate"
 require "xcjobs/distribute"
-require "xcjobs/infoplist"
+require "xcjobs/info_plist"

data/spec/Info.plist

@@ -0,0 +1,47 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.kishikawakatsumi.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>3.2.6</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>5413</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

data/spec/distribute_spec.rb

@@ -1,7 +1,14 @@
 require 'spec_helper'
+require 'date'
 
 describe XCJobs::Distribute do
   before(:each) do
+    @commands = []
+
+    allow_any_instance_of(FileUtils).to receive(:sh) do |object, command|
+      @commands << command
+    end
+
     allow_any_instance_of(XCJobs::Distribute).to receive(:upload) do |object, url, form_data|
       @url = url
       @form_data = form_data
@@ -131,4 +138,51 @@ describe XCJobs::Distribute do
       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

data/spec/info_plist_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe XCJobs::InfoPlist do
+  before(:each) do
+    if ENV['CI']
+      allow_any_instance_of(XCJobs::InfoPlist).to receive(:marketing_version).and_return('3.2.6')
+      allow_any_instance_of(XCJobs::InfoPlist).to receive(:build_version).and_return('5413')
+    end
+
+    allow_any_instance_of(XCJobs::InfoPlist).to receive(:marketing_version=) do |object, arg|
+      @marketing_version = arg
+    end
+
+    allow_any_instance_of(XCJobs::InfoPlist).to receive(:build_version=) do |object, arg|
+      @build_version = arg
+    end
+
+    Rake.application = rake
+  end
+
+  let(:rake) { Rake::Application.new }
+
+  describe 'test reading Info.plist' do
+    let(:path) do
+      File.join('spec', 'Info.plist')
+    end
+
+    let(:marketing_version) { '3.2.6' }
+    let(:build_version) { '5413' }
+
+    let!(:task) do
+      XCJobs::InfoPlist::Version.new do |t|
+        t.path = path
+      end
+    end
+
+    it 'configures the Info.plist file path' do
+      expect(task.path).to eq path
+    end
+
+    it 'configures the marketing_version' do
+      expect(task.marketing_version).to eq marketing_version
+    end
+
+    it 'configures the build_version' do
+      expect(task.build_version).to eq build_version
+    end
+
+    describe 'test bumping patch' do
+      subject { Rake.application['version:bump:patch'] }
+
+      it 'executes the appropriate commands' do
+        subject.invoke
+        expect(@marketing_version).to eq '3.2.7'
+      end
+    end
+
+    describe 'test bumping minor' do
+      subject { Rake.application['version:bump:minor'] }
+
+      it 'executes the appropriate commands' do
+        subject.invoke
+        expect(@marketing_version).to eq '3.3.0'
+      end
+    end
+
+    describe 'test bumping major' do
+      subject { Rake.application['version:bump:major'] }
+
+      it 'executes the appropriate commands' do
+        subject.invoke
+        expect(@marketing_version).to eq '4.0.0'
+      end
+    end
+
+    describe 'test update build number' do
+      subject { Rake.application['version:set_build_version'] }
+
+      it 'executes the appropriate commands' do
+        subject.invoke
+        expect(@build_version).to eq %x[git rev-parse --short HEAD].strip
+      end
+    end
+
+    describe 'test update build number' do
+      subject { Rake.application['version:set_build_number'] }
+
+      it 'executes the appropriate commands' do
+        subject.invoke
+        expect(@build_version).to eq %x[git rev-list --count HEAD].strip
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,11 +83,13 @@ files:
 - lib/xcjobs.rb
 - lib/xcjobs/certificate.rb
 - lib/xcjobs/distribute.rb
-- lib/xcjobs/infoplist.rb
+- lib/xcjobs/info_plist.rb
 - lib/xcjobs/version.rb
 - lib/xcjobs/xcodebuild.rb
+- spec/Info.plist
 - spec/certificate_spec.rb
 - spec/distribute_spec.rb
+- spec/info_plist_spec.rb
 - spec/profiles/adhoc.mobileprovision
 - spec/profiles/development.mobileprovision
 - spec/profiles/distribution.mobileprovision
@@ -120,8 +122,10 @@ signing_key:
 specification_version: 4
 summary: Support the automation of release process of iOS/OSX apps with CI
 test_files:
+- spec/Info.plist
 - spec/certificate_spec.rb
 - spec/distribute_spec.rb
+- spec/info_plist_spec.rb
 - spec/profiles/adhoc.mobileprovision
 - spec/profiles/development.mobileprovision
 - spec/profiles/distribution.mobileprovision