shenzhen 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb28a156e7d7ae587fd7111136ad03abcadbb2b0
-  data.tar.gz: 36b8b8fd8718548b6e2cc815fc7724297f4a639d
+  metadata.gz: 662c8d1d475e2f3439b2d0a2c14f7bf5ff1b5418
+  data.tar.gz: aa47a3775e5be5b25467221bf76c841fee055ffd
 SHA512:
-  metadata.gz: 5c18315a884e2e44e4c0630fcbdda1b23d8a31e762b26380766e48d4a47319f39d5f775d233ee5499170238bd3b86b4981b8b5f4caca90bb1fd98a022cece0f2
-  data.tar.gz: ef91e63e346f9b012a8d236e1a0cc9a17a90c04203094d7ddeedb731074b0f5500dfac8ab727210eb3880dbeddacc86ea30c2102fad47aa17a114114bab2d600
+  metadata.gz: e56f40210167d925c100c5dde26272f19231c586fadeb0a34d9b71d54e4396d189ab13a7e53c00318f2c5c6bfe4506cfb5375115a43cd3251dffa1c89f075722
+  data.tar.gz: d6e3936ecbb5be845f25600a77e4e1c7932b0b568cfddeb548157b257dce0fcda61cdf1c96ce1a85916e09353b8fa95cc814f4e549d183f804801859186a3379

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.5.0)
+    shenzhen (0.5.1)
       aws-sdk (~> 1.0)
       commander (~> 4.1)
       dotenv (~> 0.7)
@@ -25,7 +25,7 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     highline (1.6.19)
-    json (1.8.0)
+    json (1.8.1)
     multipart-post (1.2.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)

data/lib/shenzhen.rb

@@ -1,7 +1,4 @@
-module Shenzhen
-  VERSION = '0.5.0'
-end
-
+require 'shenzhen/version'
 require 'shenzhen/agvtool'
 require 'shenzhen/xcodebuild'
 require 'shenzhen/plistbuddy'

data/lib/shenzhen/commands/build.rb

@@ -13,6 +13,7 @@ command :build do |c|
   c.option '--[no-]archive', 'Archive project after building'
   c.option '-d', '--destination DESTINATION', 'Destination. Defaults to current directory'
   c.option '-m', '--embed PROVISION', 'Sign .ipa file with .mobileprovision'
+  c.option '-sdk', '--sdk SDK', 'use SDK as the name or path of the base SDK when building the project'
 
   c.action do |args, options|
     validate_xcode_version!
@@ -23,6 +24,7 @@ command :build do |c|
     @xcodebuild_info = Shenzhen::XcodeBuild.info(:workspace => @workspace, :project => @project)
 
     @scheme = options.scheme
+    @sdk = options.sdk || 'iphoneos'
     @configuration = options.configuration
     @destination = options.destination || Dir.pwd
     FileUtils.mkdir_p(@destination) unless File.directory?(@destination)
@@ -35,14 +37,10 @@ command :build do |c|
     determine_scheme! unless @scheme
     say_error "Scheme #{@scheme} not found" and abort unless (@xcodebuild_info.schemes.include?(@scheme) rescue false)
 
-    say_warning "Building \"#{@workspace || @project}\" with Scheme \"#{@scheme}\" and Configuration \"#{@configuration}\"\n" unless options.quiet
-
-    log "xcodebuild", (@workspace || @project)
-
     @configuration = options.configuration
     
     flags = []
-    flags << "-sdk iphoneos"
+    flags << "-sdk #{@sdk}"
     flags << "-workspace '#{@workspace}'" if @workspace
     flags << "-project '#{@project}'" if @project
     flags << "-scheme '#{@scheme}'" if @scheme
@@ -57,6 +55,7 @@ command :build do |c|
     end
     
     say_warning "Building \"#{@workspace || @project}\" with Scheme \"#{@scheme}\" and Configuration \"#{@configuration}\"\n" unless options.quiet
+    log "xcodebuild", (@workspace || @project)
 
     actions = []
     actions << :clean unless options.clean == false
@@ -76,7 +75,7 @@ command :build do |c|
     @ipa_path = File.expand_path(@ipa_name, @destination)
 
     log "xcrun", "PackageApplication"
-    abort unless system %{xcrun -sdk iphoneos PackageApplication -v "#{@app_path}" -o "#{@ipa_path}" --embed "#{options.embed || @dsym_path}" 1> /dev/null}
+    abort unless system %{xcrun -sdk #{@sdk} PackageApplication -v "#{@app_path}" -o "#{@ipa_path}" --embed "#{options.embed || @dsym_path}" 1> /dev/null}
 
     log "zip", @dsym_filename
     abort unless system %{cp -r "#{@dsym_path}" "#{@destination}" && zip -r "#{@dsym_filename}.zip" "#{@dsym_filename}" >/dev/null && rm -rf "#{@dsym_filename}"}
@@ -114,6 +113,8 @@ command :build do |c|
   end
 
   def determine_scheme!
+    say_error "No schemes found in Xcode project or workspace" and abort unless @xcodebuild_info.schemes
+
     if @xcodebuild_info.schemes.length == 1
       @scheme = @xcodebuild_info.schemes.first
     else

data/lib/shenzhen/plugins/hockeyapp.rb

@@ -51,6 +51,7 @@ command :'distribute:hockeyapp' do |c|
   c.option '-t', '--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 '--markdown', 'Notes are written with Markdown'
   c.option '--tags TAGS', "Comma separated list of tags which will receive access to the build"
   c.option '--notify', "Notify permitted teammates to install the build"
@@ -79,6 +80,14 @@ command :'distribute:hockeyapp' do |c|
     parameters[:tags] = options.tags if options.tags
     parameters[:dsym_filename] = @dsym if @dsym
     parameters[:mandatory] = "1" if options.mandatory
+    parameters[:release_type] = case options.release
+                                when "beta", "0"
+                                  "0"
+                                when "live", "1"
+                                  "1" 
+                                else
+                                  "2"
+                                end
 
     client = Shenzhen::Plugins::HockeyApp::Client.new(@api_token)
     response = client.upload_build(@file, parameters)

data/lib/shenzhen/plugins/s3.rb

@@ -21,7 +21,9 @@ module Shenzhen::Plugins
         files << options[:dsym]
         files.each do |file|
           key = File.join(path, File.basename(file))
-          bucket.objects.create(key, File.open(file), :acl => options[:acl])
+          File.open(file) do |descriptor|
+            bucket.objects.create(key, descriptor, :acl => options[:acl])
+          end
         end
       end
 
@@ -36,7 +38,7 @@ module Shenzhen::Plugins
         Dir.mktmpdir do |dir|
           system "unzip -q #{ipa} -d #{dir} 2> /dev/null"
 
-          plist = Dir["#{dir}/**/Info.plist"].last
+          plist = Dir["#{dir}/**/*.app/Info.plist"].last
 
           substitutions.uniq.each do |substitution|
             key = substitution[1...-1]
@@ -115,7 +117,7 @@ command :'distribute:s3' do |c|
 
   def determine_secret_access_key!
     @secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
-    @secret_access_key ||= secret_access_key "Secret Access Key:"
+    @secret_access_key ||= ask "Secret Access Key:"
   end
 
   def determine_bucket!

data/lib/shenzhen/plugins/testflight.rb

@@ -10,7 +10,7 @@ module Shenzhen::Plugins
 
       def initialize(api_token, team_token)
         @api_token, @team_token = api_token, team_token
-        @connection = Faraday.new(:url => "http://#{HOSTNAME}") do |builder|
+        @connection = Faraday.new(:url => "http://#{HOSTNAME}", :request => { :timeout => 120 }) do |builder|
           builder.request :multipart
           builder.request :json
           builder.response :json, :content_type => /\bjson$/
@@ -33,6 +33,9 @@ module Shenzhen::Plugins
         @connection.post("/api/builds.json", options).on_complete do |env|
           yield env[:status], env[:body] if block_given?
         end
+
+      rescue Faraday::Error::TimeoutError
+        say_error "Timed out while uploading build. Check https://testflightapp.com/dashboard/applications/ to see if the upload was completed." and abort
       end
     end
   end

data/lib/shenzhen/version.rb

@@ -0,0 +1,3 @@
+module Shenzhen
+  VERSION = '0.5.1'
+end

data/shenzhen.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
-require "shenzhen"
+require "shenzhen/version"
 
 Gem::Specification.new do |s|
   s.name        = "shenzhen"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -154,10 +154,10 @@ files:
 - ./lib/shenzhen/plugins/hockeyapp.rb
 - ./lib/shenzhen/plugins/s3.rb
 - ./lib/shenzhen/plugins/testflight.rb
+- ./lib/shenzhen/version.rb
 - ./lib/shenzhen/xcodebuild.rb
 - ./lib/shenzhen.rb
 - ./LICENSE
-- ./nada.ipa
 - ./Rakefile
 - ./README.md
 - ./shenzhen.gemspec