shenzhen 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ead2fd9d594767a8b28f6da8322a29343015963
-  data.tar.gz: d6795ebc20d030efa593cefbfe1f15f912bf133f
+  metadata.gz: 8fb9c4da2e7420689c509c3effeeff0ef39f02c0
+  data.tar.gz: 813122a2540e9991ef978b600e07bdbc2ae807e8
 SHA512:
-  metadata.gz: 7602a2cf16e4573a76a16ceb1ed97ec53716f353f6509025f65647649afc1bdb0aa4e12abb9eb96c93bf9d30459303d71165757b1b6c8d84d5e63552a62717b5
-  data.tar.gz: 4e0ac10234d64d6f9d3306249bbcf1279c06eaf8f36ccb6d513aa19980a01516dd9d949ef019127037c260ddfe4dad8d7cdc79aab8f3d9a516cfd9f8adffe1f0
+  metadata.gz: 63de5ba58379dbd08736df16a244635b91a0a9fb9a40a59ad6846c67803985cda110f8b4c2a686189b3e9b9f74f5b2051414d5d4fb2fd51e98029dd30b5425bf
+  data.tar.gz: c94593552f7d8b7324ecc60529beb709ef4958312ae6faa32a104d83b90f29dc53d6d8f9b5885480fe364faf289bf6644a5a1a1864aaa1bec484ae4ea1b0d050

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.10.3)
+    shenzhen (0.11.0)
       aws-sdk (~> 1.0)
       commander (~> 4.1)
       dotenv (~> 0.7)

data/lib/shenzhen/commands/build.rb

@@ -17,6 +17,7 @@ command :build do |c|
   c.option '-m', '--embed PROVISION', 'Sign .ipa file with .mobileprovision'
   c.option '-i', '--identity IDENTITY', 'Identity to be used along with --embed'
   c.option '--sdk SDK', 'use SDK as the name or path of the base SDK when building the project'
+  c.option '--ipa IPA', 'specify the name of the .ipa file to generate (including file extension)'
 
   c.action do |args, options|
     validate_xcode_version!
@@ -32,6 +33,7 @@ command :build do |c|
     @xcconfig = options.xcconfig
     @xcargs = options.xcargs
     @destination = options.destination || Dir.pwd
+    @ipa_name_override = options.ipa
     FileUtils.mkdir_p(@destination) unless File.directory?(@destination)
 
     determine_workspace_or_project! unless @workspace || @project
@@ -81,16 +83,45 @@ command :build do |c|
     @app_path = File.join(@xcodebuild_settings['BUILT_PRODUCTS_DIR'], @xcodebuild_settings['WRAPPER_NAME'])
     @dsym_path = @app_path + ".dSYM"
     @dsym_filename = File.expand_path("#{@xcodebuild_settings['WRAPPER_NAME']}.dSYM", @destination)
-    @ipa_name = @xcodebuild_settings['WRAPPER_NAME'].gsub(@xcodebuild_settings['WRAPPER_SUFFIX'], "") + ".ipa"
+    @ipa_name = @ipa_name_override || @xcodebuild_settings['WRAPPER_NAME'].gsub(@xcodebuild_settings['WRAPPER_SUFFIX'], "") + ".ipa"
     @ipa_path = File.expand_path(@ipa_name, @destination)
 
     log "xcrun", "PackageApplication"
     abort unless system %{xcrun -sdk #{@sdk} PackageApplication -v "#{@app_path}" -o "#{@ipa_path}" --embed "#{options.embed || @dsym_path}" #{"-s \"#{options.identity}\"" if options.identity} #{'1> /dev/null' unless $verbose}}
 
+    # Determine whether this is a Swift project and, eventually, the list of libraries to copy from
+    # Xcode's toolchain directory since there's no "xcodebuild" target to do just that (it is done
+    # post-build when exporting an archived build from the "Organizer").
+    @ipa_swift_frameworks = Dir["#{@app_path}/Frameworks/libswift*"]
+
+    if not @ipa_swift_frameworks.empty? then
+      Dir.mktmpdir do |tmpdir|
+        # Copy all necessary Swift libraries to a temporary "SwiftSupport" directory so that we can
+        # easily add it to the .ipa later.
+        swift_support = File.join(tmpdir, "SwiftSupport")
+
+        Dir.mkdir(swift_support)
+
+        xcode = `xcode-select --print-path`.strip
+
+        @ipa_swift_frameworks.each do |path|
+          framework = File.basename(path)
+
+          FileUtils.copy_file("#{xcode}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/#{@sdk}/#{framework}", File.join(swift_support, framework))
+        end
+
+        # Add "SwiftSupport" to the .ipa archive
+        Dir.chdir(tmpdir) do
+          abort unless system %{zip --recurse-paths "#{@ipa_path}" "SwiftSupport" #{'> /dev/null' unless $verbose}}
+        end
+      end
+    end
+
     log "zip", @dsym_filename
     abort unless system %{cp -r "#{@dsym_path}" "#{@destination}" && zip -r "#{@dsym_filename}.zip" "#{@dsym_filename}" #{'> /dev/null' unless $verbose} && rm -rf "#{@dsym_filename}"}
 
-    say_ok "#{@ipa_path} successfully built"
+    say_ok "Successfully built:"
+    say_ok @ipa_path
   end
 
   private

data/lib/shenzhen/plugins/deploygate.rb

@@ -10,7 +10,7 @@ module Shenzhen::Plugins
 
       def initialize(api_token, user_name)
         @api_token, @user_name = api_token, user_name
-        @connection = Faraday.new(:url => "http://#{HOSTNAME}", :request => { :timeout => 120 }) do |builder|
+        @connection = Faraday.new(:url => "https://#{HOSTNAME}", :request => { :timeout => 120 }) do |builder|
           builder.request :multipart
           builder.request :json
           builder.response :json, :content_type => /\bjson$/
@@ -45,6 +45,10 @@ command :'distribute:deploygate' do |c|
   c.option '-a', '--api_token TOKEN', "API Token. Available at https://deploygate.com/settings"
   c.option '-u', '--user_name USER_NAME', "User Name. Available at https://deploygate.com/settings"
   c.option '-m', '--message MESSAGE', "Release message for the build"
+  c.option '-d', '--distribution_key DESTRIBUTION_KEY', "distribution key for distribution page"
+  c.option '-n', '--disable_notify', "disable notification"
+  c.option '-r', '--release_note RELEASE_NOTE', "release note for distribution page"
+  c.option '-v', '--visibility (private|public)', "privacy setting ( require public for personal free account)"
 
   c.action do |args, options|
     determine_file! unless @file = options.file
@@ -56,11 +60,20 @@ command :'distribute:deploygate' do |c|
     determine_deploygate_user_name! unless @user_name = options.user_name || ENV['DEPLOYGATE_USER_NAME']
     say_error "Missing User Name" and abort unless @api_token
 
+    @message = options.message
+    @distribution_key = options.distribution_key || ENV['DEPLOYGATE_DESTRIBUTION_KEY']
+    @release_note = options.release_note
+    @disable_notify = ! options.disable_notify.nil? ? "yes" : nil
+    @visibility = options.visibility
     @message = options.message
 
     parameters = {}
     parameters[:file] = @file
     parameters[:message] = @message
+    parameters[:distribution_key] = @distribution_key if @distribution_key
+    parameters[:release_note] = @release_note if  @release_note
+    parameters[:disable_notify] = @disable_notify if @disable_notify
+    parameters[:visibility] = @visibility if @visibility
     parameters[:replace] = "true" if options.replace
 
     client = Shenzhen::Plugins::DeployGate::Client.new(@api_token, @user_name)

data/lib/shenzhen/plugins/fir.rb

@@ -50,7 +50,7 @@ module Shenzhen::Plugins
         end
 
         options = {
-          :key => options['type'],
+          :key => options['key'],
           :token => options['token'],
           :file => Faraday::UploadIO.new(ipa, 'application/octet-stream')
         }
@@ -75,6 +75,8 @@ command :'distribute:fir' do |c|
   c.option '-u', '--user_token TOKEN', "User Token. Available at http://fir.im/user/info"
   c.option '-a', '--app_id APPID', "App Id (iOS Bundle identifier)"
   c.option '-n', '--notes NOTES', "Release notes for the build"
+  c.option '-V', '--app_version VERSION', "App Version"
+  c.option '-S', '--short_version SHORT', "App Short Version"
 
   c.action do |args, options|
     determine_file! unless @file = options.file
@@ -89,6 +91,10 @@ command :'distribute:fir' do |c|
     determine_notes! unless @notes = options.notes
     say_error "Missing release notes" and abort unless @notes
 
+    determine_app_version! unless @app_version = options.app_version
+
+    determine_short_version! unless @short_version = options.short_version
+    
     client = Shenzhen::Plugins::Fir::Client.new(@user_token)
     app_response = client.get_app_info(@app_id)
     if app_response.status == 200
@@ -101,6 +107,8 @@ command :'distribute:fir' do |c|
 
         app_response = client.update_app_info(oid, {
           :changelog => @notes,
+          :version => @app_version,
+          :versionShort => @short_version
         })
 
         if app_response.status == 200

data/lib/shenzhen/plugins/hockeyapp.rb

@@ -51,9 +51,11 @@ command :'distribute:hockeyapp' do |c|
   c.option '-a', '--token TOKEN', "API Token. Available at https://rink.hockeyapp.net/manage/auth_tokens"
   c.option '-i', '--identifier PUBLIC_IDENTIFIER', "Public identifier of the app you are targeting, if not specified HockeyApp will use the bundle identifier to choose the right"
   c.option '-m', '--notes NOTES', "Release notes for the build (Default: Textile)"
-  c.option '-r', '--release RELEASE', [:alpha, :beta, :live], "Release type: 0 - Beta, 1 - Live, 2 - Alpha (Default: alpha)"
+  c.option '-r', '--release RELEASE', [:beta, :store, :alpha, :enterprise], "Release type: 0 - Beta, 1 - Store, 2 - Alpha , 3 - Enterprise"
   c.option '--markdown', 'Notes are written with Markdown'
   c.option '--tags TAGS', "Comma separated list of tags which will receive access to the build"
+  c.option '--teams TEAMS', "Comma separated list of team ID numbers to which this build will be restricted"
+  c.option '--users USERS', "Comma separated list of user ID numbers to which this build will be restricted"
   c.option '--notify', "Notify permitted teammates to install the build"
   c.option '--downloadOff', "Upload but don't allow download of this version just yet"
   c.option '--mandatory', "Make this update mandatory"
@@ -81,15 +83,19 @@ command :'distribute:hockeyapp' do |c|
     parameters[:notify] = "1" if options.notify && !options.downloadOff
     parameters[:status] = options.downloadOff ? "1" : "2"
     parameters[:tags] = options.tags if options.tags
+    parameters[:teams] = options.teams if options.teams
+    parameters[:users] = options.users if options.users
     parameters[:dsym_filename] = @dsym if @dsym
     parameters[:mandatory] = "1" if options.mandatory
     parameters[:release_type] = case options.release
                                 when :beta
                                   "0"
-                                when :live
+                                when :store
                                   "1"
-                                else
+                                when :alpha 
                                   "2"
+                                when :enterprise
+                                  "3"
                                 end
     parameters[:commit_sha] = options.commit_sha if options.commit_sha
     parameters[:build_server_url] = options.build_server_url if options.build_server_url

data/lib/shenzhen/plugins/itunesconnect.rb

@@ -17,7 +17,7 @@ module Shenzhen::Plugins
         @account = account
         @password = password
         @params = params
-        @filename = File.basename(@ipa)
+        @filename = File.basename(@ipa).tr(" ", "_")
       end
 
       def upload_build!
@@ -105,7 +105,7 @@ command :'distribute:itunesconnect' do |c|
     say_error "Missing Apple ID" and abort unless apple_id
 
     @password = options.password || ENV['ITUNES_CONNECT_PASSWORD']
-    if @password ||= Security::GenericPassword.find(:s => Shenzhen::Plugins::ITunesConnect::ITUNES_CONNECT_SERVER, :a => @account)
+    if @password.nil? && @password = Security::GenericPassword.find(:s => Shenzhen::Plugins::ITunesConnect::ITUNES_CONNECT_SERVER, :a => @account)
       @password = @password.password
       say_ok "Found password in keychain for account: #{@account}" if options.verbose
     else

data/lib/shenzhen/version.rb

@@ -1,3 +1,3 @@
 module Shenzhen
-  VERSION = '0.10.3'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -225,6 +225,7 @@ files:
 - ./shenzhen-0.10.0.gem
 - ./shenzhen-0.10.1.gem
 - ./shenzhen-0.10.2.gem
+- ./shenzhen-0.10.3.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://nomad-cli.com