shenzhen 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a21292d93e5d9f84968aa673f6a1de23981f66
-  data.tar.gz: faac39ff132a922848cf03d0760ab7f8f543b604
+  metadata.gz: 6b1e9afd67a7e0daf11f13f0140c2d4bae5a471d
+  data.tar.gz: 4a841f8932528bc3c265b8008243e4b78045cdf6
 SHA512:
-  metadata.gz: f3e4f0dd6d6d78be3e9fd14514f4287a6a11f3ce56730cf9bc87b04b14549cdae74c8cd8a808500fac1c8b000406c253af2ea3086f9736efebfc3d7c7112e342
-  data.tar.gz: 7eaf374e7e1e0ee295b854d6ab68caa1fc47f9caf874aed112fd973b3701d41a957a4baceff5fab247d59f6bd0c69dbf5acaef31bb301fb0da695ddb7a2df040
+  metadata.gz: 8c1220461c1d3f6106a9fd7e9e4639dab72f77cca682ad44b63132add081fcea6b044863edcb7b018e8d155131bde764ca2cb63b7ff37fb2a45454a5e7dfd354
+  data.tar.gz: e296e21dcd6beb2222d21761c15a8d599ae8fbb7f0c292efb3914bb8e1aed9ae1c4ec38e2654175234cd3c90a18b16861f67d44e00832246edc2dfed24822ae5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.12.1)
+    shenzhen (0.13.0)
       aws-sdk (~> 1.0)
       commander (~> 4.3)
       dotenv (~> 0.7)

data/lib/shenzhen/commands/build.rb

@@ -75,9 +75,9 @@ command :build do |c|
     actions << :archive unless options.archive == false
 
     ENV['CC'] = nil # Fix for RVM
-    cmd = %{xcodebuild #{flags.join(' ')} #{actions.join(' ')} #{'1> /dev/null' unless $verbose}}
-    say_warning cmd
-    abort unless system cmd
+    command = %{xcodebuild #{flags.join(' ')} #{actions.join(' ')} #{'1> /dev/null' unless $verbose}}
+    puts command if $verbose
+    abort unless system command
 
     @target, @xcodebuild_settings = Shenzhen::XcodeBuild.settings(*flags).detect{|target, settings| settings['WRAPPER_EXTENSION'] == "app"}
     say_error "App settings could not be found." and abort unless @xcodebuild_settings
@@ -89,7 +89,9 @@ command :build do |c|
     @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}}
+    command = %{xcrun -sdk #{@sdk} PackageApplication -v "#{@app_path}" -o "#{@ipa_path}" --embed "#{options.embed || @dsym_path}" #{"-s \"#{options.identity}\"" if options.identity} #{'--verbose' if $verbose} #{'1> /dev/null' unless $verbose}}
+    puts command if $verbose
+    abort unless system command
 
     # 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

data/lib/shenzhen/plugins/fir.rb

@@ -94,7 +94,7 @@ command :'distribute:fir' do |c|
     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

data/lib/shenzhen/plugins/itunesconnect.rb

@@ -24,17 +24,19 @@ module Shenzhen::Plugins
         size = File.size(@ipa)
         checksum = Digest::MD5.file(@ipa)
 
-        FileUtils.mkdir_p("Package.itmsp")
-        FileUtils.copy_entry(@ipa, "Package.itmsp/#{@filename}")
-
-        File.write("Package.itmsp/metadata.xml", metadata(@apple_id, checksum, size))
-
-        case transport
-        when /(error)|(fail)/i
-          say_error "An error occurred when trying to upload the build to iTunesConnect.\nRun with --verbose for more info." and abort
+        begin
+          FileUtils.mkdir_p("Package.itmsp")
+          FileUtils.copy_entry(@ipa, "Package.itmsp/#{@filename}")
+
+          File.write("Package.itmsp/metadata.xml", metadata(@apple_id, checksum, size))
+
+          case transport
+          when /(error)|(fail)/i
+            say_error "An error occurred when trying to upload the build to iTunesConnect.\nRun with --verbose for more info." and abort
+          end
+        ensure
+          FileUtils.rm_rf("Package.itmsp", :secure => true)
         end
-
-        FileUtils.rmdir("Package.itmsp")
       end
 
       private
@@ -46,18 +48,14 @@ module Shenzhen::Plugins
         args = [tool, "-m upload", "-f Package.itmsp", "-u #{Shellwords.escape(@account)}", "-p #{Shellwords.escape(@password)}"]
         command = args.join(' ')
 
-        say "#{command}" if verbose?
+        puts "#{command}" if $verbose
 
         output = `#{command} 2> /dev/null`
-        say output.chomp if verbose?
+        puts output.chomp if $verbose
 
         output
       end
 
-      def verbose?
-        @params.collect(&:to_sym).include?(:verbose)
-      end
-
       def metadata(apple_id, checksum, size)
         %{<?xml version="1.0" encoding="UTF-8"?>
           <package version="software4.7" xmlns="http://apple.com/itunes/importer">
@@ -88,7 +86,6 @@ command :'distribute:itunesconnect' do |c|
   c.option '-w', '--warnings', "Check for warnings when validating the ipa"
   c.option '-e', '--errors', "Check for errors when validating the ipa"
   c.option '-i', '--apple-id STRING', "Apple ID from iTunes Connect"
-  c.option '--verbose', "Run commands verbosely"
   c.option '--sdk SDK', "SDK to use when validating the ipa. Defaults to 'iphoneos'"
   c.option '--save-keychain', "Save the provided account in the keychain for future use"
 
@@ -115,15 +112,19 @@ command :'distribute:itunesconnect' do |c|
       Security::GenericPassword.add(Shenzhen::Plugins::ITunesConnect::ITUNES_CONNECT_SERVER, @account, @password, {:U => nil}) if options.save_keychain
     end
 
+    unless /^[0-9a-zA-Z]*$/ === @password
+      say_warning "Password contains special characters, which may not be handled properly by iTMSTransporter. If you experience problems uploading to iTunes Connect, please consider changing your password to something with only alphanumeric characters."
+    end
+
     parameters = []
-    parameters << :verbose if options.verbose
     parameters << :warnings if options.warnings
     parameters << :errors if options.errors
 
     client = Shenzhen::Plugins::ITunesConnect::Client.new(@file, apple_id, options.sdk, @account, @password, parameters)
 
     client.upload_build!
-    say_ok "Upload complete. You may want to double check iTunes Connect to make sure it was received correctly."
+    say_ok "Upload complete."
+    say_warning "You may want to double check iTunes Connect to make sure it was received correctly."
   end
 
   private

data/lib/shenzhen/plugins/s3.rb

@@ -16,6 +16,8 @@ module Shenzhen::Plugins
 
         bucket = @s3.buckets[options[:bucket]]
 
+        uploaded_urls = []
+
         files = []
         files << ipa
         files << options[:dsym] if options[:dsym]
@@ -23,9 +25,12 @@ module Shenzhen::Plugins
           basename = File.basename(file)
           key = path ? File.join(path, basename) : basename
           File.open(file) do |descriptor|
-            bucket.objects.create(key, descriptor, :acl => options[:acl])
+            obj = bucket.objects.create(key, descriptor, :acl => options[:acl])
+            uploaded_urls << obj.public_url.to_s
           end
         end
+
+        uploaded_urls
       end
 
       private
@@ -99,7 +104,8 @@ command :'distribute:s3' do |c|
     client = Shenzhen::Plugins::S3::Client.new(@access_key_id, @secret_access_key, @region)
 
     begin
-      client.upload_build @file, {:bucket => @bucket, :create => !!options.create, :acl => @acl, :dsym => @dsym, :path => @path}
+      urls = client.upload_build @file, {:bucket => @bucket, :create => !!options.create, :acl => @acl, :dsym => @dsym, :path => @path}
+      urls.each { |url| say_ok url}
       say_ok "Build successfully uploaded to S3"
     rescue => exception
       say_error "Error while uploading to S3: #{exception}"

data/lib/shenzhen/version.rb

@@ -1,3 +1,3 @@
 module Shenzhen
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -229,6 +229,7 @@ files:
 - ./shenzhen-0.11.1.gem
 - ./shenzhen-0.11.2.gem
 - ./shenzhen-0.12.0.gem
+- ./shenzhen-0.12.1.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://nomad-cli.com