Merge pull request #4 from gnachman/master

update from upstream

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSFTP.h

 #import "NMSSH.h"
+@class NMSSHSession, NMSFTPFile;
+
 /**
  NMSFTP provides functionality for working with SFTP servers.
  */
@@ -11,6 +13,9 @@
 /** Property that keeps track of connection status to the server */
 @property (nonatomic, readonly, getter = isConnected) BOOL connected;
+/** Property that set/get read buffer size */
+@property (nonatomic) NSUInteger bufferSize;
+
 ///-----------------------------------------------------------------------------
 /// @name Initializer
 /// ----------------------------------------------------------------------------

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSH.h

+#import <Foundation/Foundation.h>
+
+#ifndef _NMSSH_
+#define _NMSSH_
+
 #import "libssh2.h"
 #import "libssh2_sftp.h"
-@class NMSSHSession, NMSSHChannel, NMSFTP, NMSFTPFile;
-
 #import "NMSSHSessionDelegate.h"
 #import "NMSSHChannelDelegate.h"
@@ -10,5 +13,9 @@
 #import "NMSSHChannel.h"
 #import "NMSFTP.h"
 #import "NMSFTPFile.h"
-#import "NMSSHLogger.h"
+#import "NMSSHConfig.h"
+#import "NMSSHHostConfig.h"
+
+#import "NMSSHLogger.h"
\ No newline at end of file
+#endif
\ No newline at end of file

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSHChannel.h

 #import "NMSSH.h"
+@class NMSSHSession;
+@protocol NMSSHChannelDelegate;
+
 typedef NS_ENUM(NSInteger, NMSSHChannelError) {
     NMSSHChannelExecutionError,
     NMSSHChannelExecutionResponseError,

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSHChannelDelegate.h

 #import "NMSSH.h"
+@class NMSSHChannel;
+
 /**
  Protocol for registering to receive messages from an active NMSSHChannel.
  */

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSHLogger.h

+#import "NMSSH.h"
+
 typedef NS_OPTIONS(NSUInteger, NMSSHLogLevel) {
     NMSSHLogLevelVerbose = (1 << 0 | 1 << 1 | 1 << 2 | 1 << 3),
     NMSSHLogLevelInfo    = (1 << 1 | 1 << 2 | 1 << 3),

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSHSession.h

 #import "NMSSH.h"
-@class NMSSHHostConfig;
+@class NMSSHHostConfig, NMSFTP;
+@protocol NMSSHSessionDelegate;
 typedef NS_ENUM(NSInteger, NMSSHSessionHash) {
     NMSSHSessionHashMD5,

ThirdParty/NMSSH.framework/Versions/A/Headers/NMSSHSessionDelegate.h

 #import "NMSSH.h"
+@class NMSSHSession;
+
 /**
  Protocol for registering to receive messages from an active NMSSHSession.
  */

ThirdParty/NMSSH.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14C109</string>
+	<string>15B42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -20,22 +20,26 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6D570</string>
+	<string>7B91b</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14D125</string>
+	<string>15A278</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10</string>
+	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0630</string>
+	<string>0710</string>
 	<key>DTXcodeBuild</key>
-	<string>6D570</string>
+	<string>7B91b</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2012 Nine Muses AB. All rights reserved.</string>
 </dict>

sources/NSBezierPath+iTerm.m

@@ -17,7 +17,7 @@
     float height = frame.size.height - 1;
     float width = frame.size.width - 1;
     float x = 0.5;
-    float y = 0;
+    float y = MIN(0, height - 2*radius);
     float nx, ny;
     [path moveToPoint:NSMakePoint(x, y)];
     nx = x+radius;
@@ -26,7 +26,7 @@
          controlPoint1:NSMakePoint((nx+x)/2, y)
          controlPoint2:NSMakePoint(nx, (ny+y)/2)];
     y = ny;
-    ny = y + height - 2*radius;
+    ny = y + MAX(0, height - 2*radius);
     [path lineToPoint:NSMakePoint(nx, ny)];
     x = nx; y = ny;
     nx = x + radius;
@@ -44,7 +44,7 @@
          controlPoint1:NSMakePoint((nx+x)/2, y)
          controlPoint2:NSMakePoint(nx, (ny+y)/2)];
     y = ny;
-    ny = y - height + 2*radius;
+    ny = y - MAX(0, height - 2*radius);
     [path lineToPoint:NSMakePoint(nx, ny)];
     x = nx; y = ny;
     nx = x + radius;

sources/SCPFile.m

@@ -356,6 +356,12 @@ static NSError *SCPFileError(NSString *description) {
                                               andPassword:password];
                 
                     if (self.session.isAuthorized) {
+                        NSLog(@"Authorized!");
+                        break;
+                    }
+
+                    if (!self.session.session) {
+                        NSLog(@"Disconnected!");
                         break;
                     }
                 }

tools/release.sh

@@ -61,8 +61,9 @@ function Build {
   test -f $SVNDIR/downloads/beta/iTerm2-${NAME}.description || (echo "$DESCRIPTION" > $SVNDIR/downloads/beta/iTerm2-${NAME}.description)
   vi $SVNDIR/downloads/beta/iTerm2-${NAME}.description
   vi $SVNDIR/downloads/beta/iTerm2-${NAME}.changelog
-  echo cd $SVNDIR
-  echo git add "downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.changelog downloads/beta/iTerm2-${NAME}.zip source/appcasts/testing3.xml source/appcasts/testing_changes3.txt"
+  pushd $SVNDIR
+  git add downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.changelog downloads/beta/iTerm2-${NAME}.zip source/appcasts/testing3.xml source/appcasts/testing_changes3.txt
+  popd
   # Prepare the sparkle xml file
   SparkleSign ${SPARKLE_PREFIX}testing3.xml ${SPARKLE_PREFIX}template3.xml
@@ -74,20 +75,18 @@ COMPACTDATE=$(date +"%Y%m%d")
 VERSION=$(cat version.txt | sed -e "s/%(extra)s/$COMPACTDATE/")
 SVNDIR=~/iterm2-website
 ORIG_DIR=`pwd`
-NEWFILES=""
 echo "Build deployment release"
 make clean
 make release
-Build Deployment "" "OS 10.7+, Intel-only" "This is the recommended beta build for most users. It contains a bunch of bug fixes, including fixes for some crashers, plus some minor performance improvements." "" "--deep"
+Build Deployment "" "OS 10.8+" "This is the recommended beta build for most users. It contains a bunch of bug fixes, including fixes for some crashers." "" "--deep"
 #set -x
-echo "git tag v${VERSION}"
-echo "git commit -am ${VERSION}"
-echo "git push origin v2"
-echo "git push --tags"
-echo "cd "$SVNDIR
-echo "git add "$NEWFILES
-echo "git commit -am v${VERSION}"
-echo "git push origin master"
+git tag v${VERSION}
+git commit -am ${VERSION}
+git push origin master
+git push --tags
+cd $SVNDIR
+git commit -am v${VERSION}
+git push origin master