shenzhen 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f833044608f4fcd81227646a34176daaeb1c6d08
-  data.tar.gz: 8443853a16209f5259cd2461d3d33a656a892a27
+  metadata.gz: 9ebfc5a3bdab8ba1bccc7c1d93ff4c146dc66020
+  data.tar.gz: 8cb8638db47c593660ab11b0f325deed53ea858c
 SHA512:
-  metadata.gz: b27879288458c6b3290b277e2f2c5b2dfe24d9d871d58319a1a5e0b24b7753a94684ce7ce8192273f839ba807bf8e2ce49d67f178c99f8afd032ead997ef7860
-  data.tar.gz: a5067c805286831ceb0df9eabae770ea8aa0ceaf1ac86d190c7db62eebcb3b9610b26dc0fcbeff7c0509a76d035ff728744f14e5436f265f4776c8fe17caa411
+  metadata.gz: b853584db4fc708b4b2c834c031a50280af62e42370568b1286f1c6a59908e4feeb798bb273f0ff24b414e24c880a958378b6d5525ab9d1235ef4729aa13b354
+  data.tar.gz: 235d5a50b1cdddac4eefa5da37325a3deff3aea99abdfcac3054ae6a8ccc654c9a758ca945c3167ac1d5f5bdb7cd7720e1c94c0d54e0c425362baeb0ead84640

data/Gemfile.lock

@@ -1,46 +1,54 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.5.4)
+    shenzhen (0.6.0)
       aws-sdk (~> 1.0)
       commander (~> 4.1)
       dotenv (~> 0.7)
-      faraday (~> 0.8)
+      faraday (~> 0.8.9)
       faraday_middleware (~> 0.9)
       json (~> 1.8)
       net-sftp (~> 2.1.2)
+      plist (~> 3.1.0)
+      rubyzip (~> 1.1)
+      terminal-table (~> 1.4.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.26.0)
+    aws-sdk (1.38.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4, < 1.6.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    commander (4.1.5)
+    commander (4.1.6)
       highline (~> 1.6.11)
     diff-lcs (1.2.5)
-    dotenv (0.9.0)
-    faraday (0.8.8)
+    dotenv (0.10.0)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    highline (1.6.20)
+    highline (1.6.21)
     json (1.8.1)
+    mini_portile (0.5.3)
     multipart-post (1.2.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    nokogiri (1.5.10)
-    rake (10.1.0)
+    net-ssh (2.8.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    plist (3.1.0)
+    rake (10.2.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
+    rubyzip (1.1.2)
+    terminal-table (1.4.5)
     uuidtools (2.1.4)
 
 PLATFORMS

data/README.md

@@ -49,7 +49,7 @@ Shenzhen adds the `ipa` command to your PATH:
 
 #### HockeyApp Distribution
 
-    $ ipa distribute:hockeyapp -t API_TOKEN
+    $ ipa distribute:hockeyapp --token API_TOKEN
 
 > Shenzhen will load credentials from the environment variable `HOCKEYAPP_API_TOKEN` unless otherwise specified.
 

data/bin/ipa

@@ -4,6 +4,7 @@ require 'dotenv'
 Dotenv.load
 
 require 'commander/import'
+require 'terminal-table'
 
 $:.push File.expand_path("../../lib", __FILE__)
 require 'shenzhen'

data/lib/shenzhen/commands.rb

@@ -7,4 +7,4 @@ require 'plugins/s3'
 
 require 'commands/build'
 require 'commands/distribute'
-
+require 'commands/info'

data/lib/shenzhen/commands/info.rb

@@ -0,0 +1,63 @@
+require 'plist'
+require 'tempfile'
+require 'zip'
+
+command :info do |c|
+  c.syntax = 'ipa info [options]'
+  c.summary = 'Show mobile provisioning information about an .ipa file'
+  c.description = ''
+
+  c.action do |args, options|
+    say_error "`security` command not found in $PATH" and abort if `which security` == ""
+
+    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)}.app/embedded.mobileprovision")
+      say_error "Embedded mobile provisioning file not found in #{@file}" and abort unless entry
+
+      tempfile = Tempfile.new(::File.basename(entry.name))
+      begin
+        zipfile.extract(entry, tempfile.path)
+        plist = Plist::parse_xml(`security cms -D -i #{tempfile.path}`)
+
+        table = Terminal::Table.new do |t|
+          plist.each do |key, value|
+            next if key == "DeveloperCertificates"
+
+            columns = []
+            columns << key
+            columns << case value
+                       when Hash
+                         value.collect{|k, v| "#{k}: #{v}"}.join("\n")
+                       else
+                         value.to_s
+                       end
+
+            t << columns
+          end
+        end
+
+        puts table
+
+      rescue => e
+        say_error e.message
+      ensure
+        tempfile.close and tempfile.unlink
+      end
+    end
+  end
+
+  private
+
+  def determine_file!
+    files = Dir['*.ipa']
+    @file ||= case files.length
+              when 0 then nil
+              when 1 then files.first
+              else
+                @file = choose "Select an .ipa File:", *files
+              end
+  end
+end

data/lib/shenzhen/plugins/ftp.rb

@@ -5,14 +5,14 @@ module Shenzhen::Plugins
   module FTP
     class Client
 
-      def initialize(host, user, password)
-        @host, @user, @password = host, user, password
+      def initialize(host, port, user, password)
+        @host, @port, @user, @password = host, port, user, password
       end
 
       def upload(ipa, options = {})
         connection = Net::FTP.new
         connection.passive = true
-        connection.connect(@host)
+        connection.connect(@host, @port)
 
         path = expand_path_with_substitutions_from_ipa_plist(ipa, options[:path])
 
@@ -43,15 +43,13 @@ module Shenzhen::Plugins
       private
 
       def expand_path_with_substitutions_from_ipa_plist(ipa, path)
-        components = []
-
         substitutions = path.scan(/\{CFBundle[^}]+\}/)
         return path if substitutions.empty?
 
         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]
@@ -69,20 +67,31 @@ module Shenzhen::Plugins
   module SFTP
     class Client < Shenzhen::Plugins::FTP::Client
       def upload(ipa, options = {})
-        session = Net::SSH.start(@host, @user, :password => @password)
+        session = Net::SSH.start(@host, @user, :password => @password, :port => @port)
         connection = Net::SFTP::Session.new(session).connect!
 
         path = expand_path_with_substitutions_from_ipa_plist(ipa, options[:path])
 
         begin
-          connection.mkdir! path if options[:mkdir]
-          connection.upload! ipa, "#{path}/#{File.basename(ipa)}"
-          connection.upload! options[:dsym], "#{path}/#{File.basename(options[:dsym])}" if options[:dsym]
+          connection.stat!(path) do |response|
+            connection.mkdir! path if options[:mkdir] and not response.ok?
+
+            connection.upload! ipa, determine_file_path(File.basename(ipa), path)
+            connection.upload! options[:dsym], determine_file_path(File.basename(options[:dsym]), path) if options[:dsym]
+          end
         ensure
           connection.close_channel
           session.shutdown!
         end
       end
+
+      def determine_file_path(file_name, path)
+        if path.empty?
+          file_name
+        else
+          "#{path}/#{file_name}"
+        end
+      end
     end
   end
 end
@@ -99,7 +108,8 @@ command :'distribute:ftp' do |c|
   c.option '-h', '--host HOST', "FTP host"
   c.option '-u', '--user USER', "FTP user"
   c.option '-p', '--password PASS', "FTP password"
-  c.option '-P', '--path PATH', "FTP path. Values from Info.plist will be substituded for keys wrapped in {}  \n\t\t eg. \"/path/to/folder/{CFBundleVersion}/\" could be evaluated as \"/path/to/folder/1.0.0/\""
+  c.option '-P', '--path PATH', "FTP path. Values from Info.plist will be substituted for keys wrapped in {}  \n\t\t e.g. \"/path/to/folder/{CFBundleVersion}/\" would be evaluated as \"/path/to/folder/1.0.0/\""
+  c.option '--port PORT', "FTP port"
   c.option '--protocol [PROTOCOL]', [:ftp, :sftp], "Protocol to use (ftp, sftp)"
   c.option '--[no-]mkdir', "Create directories on FTP if they don't already exist"
 
@@ -115,6 +125,8 @@ command :'distribute:ftp' do |c|
     determine_host! unless @host = options.host
     say_error "Missing FTP host" and abort unless @host
 
+    determine_port!(options.protocol) unless @port = options.port
+
     determine_user! unless @user = options.user
     say_error "Missing FTP user" and abort unless @user
 
@@ -125,9 +137,9 @@ command :'distribute:ftp' do |c|
 
     client = case options.protocol
              when :sftp
-              Shenzhen::Plugins::SFTP::Client.new(@host, @user, @password)
+              Shenzhen::Plugins::SFTP::Client.new(@host, @port, @user, @password)
              else
-              Shenzhen::Plugins::FTP::Client.new(@host, @user, @password)
+              Shenzhen::Plugins::FTP::Client.new(@host, @port, @user, @password)
              end
 
     begin
@@ -144,6 +156,15 @@ command :'distribute:ftp' do |c|
     @host ||= ask "FTP Host:"
   end
 
+  def determine_port!(protocol)
+    @port = case protocol
+            when :sftp
+              Net::SSH::Transport::Session::DEFAULT_PORT
+            else
+              Net::FTP::FTP_PORT
+            end
+  end
+
   def determine_user!
     @user ||= ask "Username:"
   end

data/lib/shenzhen/plugins/hockeyapp.rb

@@ -81,9 +81,9 @@ command :'distribute:hockeyapp' do |c|
     parameters[:dsym_filename] = @dsym if @dsym
     parameters[:mandatory] = "1" if options.mandatory
     parameters[:release_type] = case options.release
-                                when "beta", "0"
+                                when :beta
                                   "0"
-                                when "live", "1"
+                                when :live
                                   "1"
                                 else
                                   "2"

data/lib/shenzhen/plugins/s3.rb

@@ -30,8 +30,6 @@ module Shenzhen::Plugins
       private
 
       def expand_path_with_substitutions_from_ipa_plist(ipa, path)
-        components = []
-
         substitutions = path.scan(/\{CFBundle[^}]+\}/)
         return path if substitutions.empty?
 

data/lib/shenzhen/plugins/testflight.rb

@@ -83,7 +83,7 @@ command :'distribute:testflight' do |c|
     when 200...300
       say_ok "Build successfully uploaded to TestFlight"
     else
-      say_error "Error uploading to TestFlight: #{response.body}"
+      say_error "Error uploading to TestFlight: #{response.body}" and abort
     end
   end
 

data/lib/shenzhen/version.rb

@@ -1,3 +1,3 @@
 module Shenzhen
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

data/shenzhen.gemspec

@@ -7,19 +7,22 @@ Gem::Specification.new do |s|
   s.name        = "shenzhen"
   s.authors     = ["Mattt Thompson"]
   s.email       = "m@mattt.me"
-  s.homepage    = "http://github.com/mattt/shenzhen"
+  s.homepage    = "http://nomad-cli.com"
   s.version     = Shenzhen::VERSION
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Shenzhen"
   s.description = "CLI for Building & Distributing iOS Apps (.ipa Files)"
 
   s.add_dependency "commander", "~> 4.1"
+  s.add_dependency "terminal-table", "~> 1.4.5"
   s.add_dependency "json", "~> 1.8"
-  s.add_dependency "faraday", "~> 0.8"
+  s.add_dependency "faraday", "~> 0.8.9"
   s.add_dependency "faraday_middleware", "~> 0.9"
   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"
+  s.add_dependency "rubyzip", "~> 1.1"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +190,7 @@ files:
 - ./lib/shenzhen/agvtool.rb
 - ./lib/shenzhen/commands/build.rb
 - ./lib/shenzhen/commands/distribute.rb
+- ./lib/shenzhen/commands/info.rb
 - ./lib/shenzhen/commands.rb
 - ./lib/shenzhen/plistbuddy.rb
 - ./lib/shenzhen/plugins/ftp.rb
@@ -162,7 +205,7 @@ files:
 - ./README.md
 - ./shenzhen.gemspec
 - bin/ipa
-homepage: http://github.com/mattt/shenzhen
+homepage: http://nomad-cli.com
 licenses: []
 metadata: {}
 post_install_message: