shenzhen 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb54f48748da28b11064014eb594646d3e09c1a
-  data.tar.gz: b5f1fdd3849095b29285d766fa1aca0bc9ca7471
+  metadata.gz: 2de2ca4689c9602ec72a27711e71c8ed3c722336
+  data.tar.gz: 5424ace41fc9543662373c6fc141c9903772d667
 SHA512:
-  metadata.gz: 25175719aa35e00ffab3de7ef8c7c84b357628535d1d8832b7cc703d18faff2a1591b3aabf7e21c194ed32af16ba9fc28e2eb6d362226dc4122abff5da01d5c1
-  data.tar.gz: b8dcd3af4cd8cbb2220fadc731a6dc893426686c98ceca1502646f12534f1b2eebddf20def526ce3f9c1dfd4a114a23e66c649352c71ffa3b30a0d6cb62d1d1a
+  metadata.gz: e444b6f0051c69282896ebc51f1e1ff8884f98b3a6cac0f959a08a51a7c309269c20be2a4faff6bfa596aaf14d18af09c342affd7d5055b55358cdd82df9a66f
+  data.tar.gz: fd070ef5e7bd8fc534b048857fd12ff2280beae9a47b3ae578f8dc0151f9dd11e76affce1cb8e6a5bfafb0d0db73e8390b79a62adba0a9f379dd5d1135fcfe43

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.14.0)
+    shenzhen (0.14.1)
       aws-sdk (~> 1.0)
       commander (~> 4.3)
-      dotenv (~> 0.7)
+      dotenv (>= 0.7)
       faraday (~> 0.8.9)
       faraday_middleware (~> 0.9)
-      highline (>= 1.7.1)
+      highline (>= 1.7.2)
       json (~> 1.8)
       net-sftp (~> 2.1.2)
       plist (~> 3.1.0)
@@ -23,17 +23,15 @@ GEM
     aws-sdk-v1 (1.64.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    commander (4.3.2)
-      highline (~> 1.7.1)
+    commander (4.3.4)
+      highline (~> 1.7.2)
     diff-lcs (1.2.5)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
+    dotenv (2.0.1)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    highline (1.7.1)
+    highline (1.7.2)
     json (1.8.2)
     mini_portile (0.6.2)
     multipart-post (1.2.0)

data/lib/shenzhen/commands/build.rb

@@ -69,6 +69,8 @@ command :build do |c|
 
     log "xcodebuild", (@workspace || @project)
 
+    xcode = `xcode-select --print-path`.strip
+
     actions = []
     actions << :clean unless options.clean == false
     actions << :build
@@ -93,12 +95,13 @@ command :build do |c|
     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
     # 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
+    if not @ipa_swift_frameworks.empty?
       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.
@@ -106,8 +109,6 @@ command :build do |c|
 
         Dir.mkdir(swift_support)
 
-        xcode = `xcode-select --print-path`.strip
-
         @ipa_swift_frameworks.each do |path|
           framework = File.basename(path)
 
@@ -121,6 +122,21 @@ command :build do |c|
       end
     end
 
+    log "Adding WatchKit support files", "#{xcode}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/Library/Application Support/WatchKit/WK"
+    Dir.mktmpdir do |tmpdir|
+      # Make watchkit support directory
+      watchkit_support = File.join(tmpdir, "WatchKitSupport")
+      Dir.mkdir(watchkit_support)
+
+      # Copy WK from Xcode into WatchKitSupport
+      FileUtils.copy_file("#{xcode}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/Library/Application Support/WatchKit/WK", File.join(watchkit_support, "WK"))
+
+      # Add "WatchKitSupport" to the .ipa archive
+      Dir.chdir(tmpdir) do
+        abort unless system %{zip --recurse-paths "#{@ipa_path}" "WatchKitSupport" #{'> /dev/null' unless $verbose}}
+      end
+    end
+
     log "zip", @dsym_filename
     abort unless system %{cp -r "#{@dsym_path}" "#{@destination}" && pushd "#{File.dirname(@dsym_filename)}" && zip -r "#{@dsym_filename}.zip" "#{File.basename(@dsym_filename)}" #{'> /dev/null' unless $verbose} && popd && rm -rf "#{@dsym_filename}"}
 

data/lib/shenzhen/commands/info.rb

@@ -10,29 +10,44 @@ command :info do |c|
 
   c.action do |args, options|
     say_error "`security` command not found in $PATH" and abort if `which security` == ""
+    say_error "`codesign` command not found in $PATH" and abort if `which codesign` == ""
 
     determine_file! unless @file = args.pop
     say_error "Missing or unspecified .ipa file" and abort unless @file and ::File.exist?(@file)
 
     Zip::File.open(@file) do |zipfile|
-      entry = zipfile.find_entry("Payload/#{File.basename(@file, File.extname(@file))}.app/embedded.mobileprovision")
+      app_entry = zipfile.find_entry("Payload/#{File.basename(@file, File.extname(@file))}.app")
+      provisioning_profile_entry = zipfile.find_entry("#{app_entry.name}embedded.mobileprovision") if app_entry
       
-      if (!entry)
+      if (!provisioning_profile_entry)
         zipfile.dir.entries("Payload").each do |dir_entry|
           if dir_entry =~ /.app$/
             say "Using .app: #{dir_entry}"
-            entry = zipfile.find_entry("Payload/#{dir_entry}/embedded.mobileprovision")
+            app_entry = zipfile.find_entry("Payload/#{dir_entry}")
+            provisioning_profile_entry = zipfile.find_entry("#{app_entry.name}embedded.mobileprovision") if app_entry
             break
           end
         end
       end
 
-      say_error "Embedded mobile provisioning file not found in #{@file}" and abort unless entry
+      say_error "Embedded mobile provisioning file not found in #{@file}" and abort unless provisioning_profile_entry
 
-      tempfile = Tempfile.new(::File.basename(entry.name))
+      tempdir = ::File.new(Dir.mktmpdir)
       begin
-        zipfile.extract(entry, tempfile.path){ override = true }
-        plist = Plist::parse_xml(`security cms -D -i #{tempfile.path}`)
+        zipfile.each do |zip_entry|
+          temp_entry_path = ::File.join(tempdir.path, zip_entry.name)
+
+          FileUtils.mkdir_p(::File.dirname(temp_entry_path))
+          zipfile.extract(zip_entry, temp_entry_path) unless ::File.exist?(temp_entry_path)
+        end
+
+        temp_provisioning_profile = ::File.new(::File.join(tempdir.path, provisioning_profile_entry.name))
+        temp_app_directory = ::File.new(::File.join(tempdir.path, app_entry.name))
+
+        plist = Plist::parse_xml(`security cms -D -i #{temp_provisioning_profile.path}`)
+
+        codesign = `codesign -dv "#{temp_app_directory.path}" 2>&1`
+        codesigned = /Signed Time/ === codesign
 
         table = Terminal::Table.new do |t|
           plist.each do |key, value|
@@ -51,6 +66,8 @@ command :info do |c|
 
             t << columns
           end
+
+          t << ["Codesigned", codesigned.to_s.capitalize]
         end
 
         puts table
@@ -58,7 +75,7 @@ command :info do |c|
       rescue => e
         say_error e.message
       ensure
-        tempfile.close and tempfile.unlink
+        FileUtils.remove_entry_secure tempdir
       end
     end
   end

data/lib/shenzhen/plugins/deploygate.rb

@@ -78,11 +78,10 @@ command :'distribute:deploygate' do |c|
 
     client = Shenzhen::Plugins::DeployGate::Client.new(@api_token, @user_name)
     response = client.upload_build(@file, parameters)
-    case response.status
-    when 200...300
+    if (200...300) === response.status and not response.body["error"]
       say_ok "Build successfully uploaded to DeployGate"
     else
-      say_error "Error uploading to DeployGate: #{response.body}" and abort
+      say_error "Error uploading to DeployGate: #{response.body["error"] || "(Unknown Error)"}" and abort
     end
   end
 

data/lib/shenzhen/plugins/itunesconnect.rb

@@ -45,10 +45,11 @@ module Shenzhen::Plugins
         tool = File.join(File.dirname(xcode), "Applications/Application Loader.app/Contents/MacOS/itms/bin/iTMSTransporter").gsub(/\s/, '\ ')
         tool = File.join(File.dirname(xcode), "Applications/Application Loader.app/Contents/itms/bin/iTMSTransporter").gsub(/\s/, '\ ') if !File.exist?(tool)
 
-        args = [tool, "-m upload", "-f Package.itmsp", "-u #{Shellwords.escape(@account)}", "-p #{Shellwords.escape(@password)}"]
+        escaped_password = Shellwords.escape(@password)
+        args = [tool, "-m upload", "-f Package.itmsp", "-u #{Shellwords.escape(@account)}", "-p #{escaped_password}"]
         command = args.join(' ')
 
-        puts "#{command}" if $verbose
+        puts command.sub("-p #{escaped_password}", "-p ******") if $verbose
 
         output = `#{command} 2> /dev/null`
         puts output.chomp if $verbose

data/lib/shenzhen/version.rb

@@ -1,3 +1,3 @@
 module Shenzhen
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

data/lib/shenzhen/xcodebuild.rb

@@ -29,7 +29,7 @@ module Shenzhen::XcodeBuild
   class << self
     def info(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      output = `xcodebuild -list #{(args + args_from_options(options)).join(" ")} 2>&1`
+      output = `xcrun xcodebuild -list #{(args + args_from_options(options)).join(" ")} 2>&1`
 
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
 
@@ -62,7 +62,7 @@ module Shenzhen::XcodeBuild
 
     def settings(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      output = `xcodebuild #{(args + args_from_options(options)).join(" ")} -showBuildSettings 2> /dev/null`
+      output = `xcrun xcodebuild #{(args + args_from_options(options)).join(" ")} -showBuildSettings 2> /dev/null`
 
       return nil unless /\S/ === output
 
@@ -86,7 +86,7 @@ module Shenzhen::XcodeBuild
     end
 
     def version
-      output = `xcodebuild -version`
+      output = `xcrun xcodebuild -version`
       output.scan(/([\d+\.?]+)/).flatten.first rescue nil
     end
 

data/shenzhen.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
   s.description = "CLI for Building & Distributing iOS Apps (.ipa Files)"
 
   s.add_dependency "commander", "~> 4.3"
-  s.add_dependency "highline", ">= 1.7.1"
+  s.add_dependency "highline", ">= 1.7.2"
   s.add_dependency "terminal-table", "~> 1.4.5"
   s.add_dependency "json", "~> 1.8"
   s.add_dependency "faraday", "~> 0.8.9"
   s.add_dependency "faraday_middleware", "~> 0.9"
-  s.add_dependency "dotenv", "~> 0.7"
+  s.add_dependency "dotenv", ">= 0.7"
   s.add_dependency "aws-sdk", "~> 1.0"
   s.add_dependency "net-sftp", "~> 2.1.2"
   s.add_dependency "plist", "~> 3.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -238,6 +238,7 @@ files:
 - ./Rakefile
 - ./README.md
 - ./shenzhen-0.13.2.gem
+- ./shenzhen-0.14.0.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://nomad-cli.com