p4ruby 2017.1.1599185 → 2017.1.1609394

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c726609fc009f798f611b395f1b73782d33a951
-  data.tar.gz: f40e6deeb256912813dea61449903fe33223aa69
+  metadata.gz: ab4de4ec29badd93efa2dda82673a85e0a911383
+  data.tar.gz: 1c3e8ce22d36a1a842f7e41e9818e9edf9a36be1
 SHA512:
-  metadata.gz: 30e137fbe3274e5e80454adbb1c0aa8b6d6515e866b63129750da07048e47110d96f34510766e466ba571b1c26577d75e66135e5e08ad4784ddbaf98815859a7
-  data.tar.gz: f2009d6583e53a4702bc4409be915cb73cb39830c432c174c4a0f623b37d870b4439e2d8789620cd2485fe3edfcf907c34ae0569f00cc67bd2af2937552d363b
+  metadata.gz: eb1ff6ad9fe56ee19482daeebe76eea35418699d9e7d2412afede429f7ad4c960e64036f880c2341507e460cc7d6b94ad345afe668ef6687f482ffa9028ed4ec
+  data.tar.gz: 0fb948e569e0fb5707a8b53a28412831c9ffaaf42384f543ee865f6e981b5267ead68e390824b5d7b14f88ad93842ea7afd788e53fc334225cd8eea2068d0529

data/README.md

@@ -290,6 +290,11 @@ release up to the bug fix change level.
 
 New functionality in 2017.1
 
+- (SIR#93993 / P4RUBY-206)
+
+    Add a reset() method for resetting p4 client data (messages, output, etc.)
+    between calls to run
+
 - (SIR#92235 / P4RUBY-204)
 
     Support graph depot commands

data/ext/P4/p4.cpp

@@ -664,6 +664,13 @@ static VALUE p4_get_messages( VALUE self )
     return p4->GetMessages();
 }
 
+static VALUE p4_reset( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return p4->Reset();
+}
+
 static VALUE p4_get_warnings( VALUE self )
 {
     P4ClientApi	*p4;
@@ -1273,6 +1280,7 @@ void	Init_P4()
     rb_define_method( cP4, "connect", 	RUBY_METHOD_FUNC(p4_connect)     , 0 );
     rb_define_method( cP4, "connected?",RUBY_METHOD_FUNC(p4_connected)   , 0 );
     rb_define_method( cP4, "disconnect", RUBY_METHOD_FUNC(p4_disconnect) , 0 );
+    rb_define_method( cP4, "reset",  RUBY_METHOD_FUNC(p4_reset), 0 );
 
     // Running commands - general purpose commands
     rb_define_method( cP4, "run", 	RUBY_METHOD_FUNC(p4_run)         ,-2 );

data/ext/P4/p4clientapi.cpp

@@ -92,7 +92,7 @@ P4ClientApi::P4ClientApi() : ui( &specMgr )
     const char *t;
 
     henv.GetTicketFile( ticketFile );
-    
+
     if( (t = enviro->Get("P4TICKETS")) )
 	ticketFile = t;
 
@@ -132,7 +132,7 @@ P4ClientApi::GetEnviroFile()
     return enviro->GetEnviroFile();
 }
 
-void 
+void
 P4ClientApi::SetApiLevel( int level )
 {
     StrBuf	b;
@@ -192,7 +192,7 @@ P4ClientApi::SetTicketFile( const char *p )
     ticketFile = p;
 }
 
-void 
+void
 P4ClientApi::SetDebug( int d )
 {
     debug = d;
@@ -241,7 +241,7 @@ P4ClientApi::SetEnv( const char *var, const char *val )
 // connect to the Perforce server.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Connect()
 {
     if ( P4RDB_COMMANDS )
@@ -288,7 +288,7 @@ P4ClientApi::ConnectOrReconnect()
 //
 // Disconnect session
 //
-VALUE 
+VALUE
 P4ClientApi::Disconnect()
 {
     if ( P4RDB_COMMANDS )
@@ -322,7 +322,7 @@ P4ClientApi::Connected()
     return Qfalse;
 }
 
-void 
+void
 P4ClientApi::Tagged( int enable )
 {
     if( enable )
@@ -409,6 +409,12 @@ P4ClientApi::IsIgnored( const char *path )
     return ignore->Reject( p, client.GetIgnoreFile() );
 }
 
+VALUE
+P4ClientApi::Reset()
+{
+    ui.Reset();
+}
+
 //
 // Run returns the results of the command. If the client has not been
 // connected, then an exception is raised but errors from Perforce
@@ -418,7 +424,7 @@ P4ClientApi::IsIgnored( const char *path )
 // is raised.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Run( const char *cmd, int argc, char * const *argv )
 {
     // Save the entire command string for our error messages. Makes it
@@ -523,7 +529,7 @@ P4ClientApi::RunCmd( const char *cmd, ClientUser *ui, int argc, char * const *ar
 
 //
 // Parses a string supplied by the user into a hash. To do this we need
-// the specstring from the server. We try to cache those as we see them, 
+// the specstring from the server. We try to cache those as we see them,
 // but the user may not have executed any commands to allow us to cache
 // them so we may have to fetch the spec first.
 //
@@ -551,7 +557,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
     Error e;
     VALUE v;
     v = specMgr.StringToSpec( type, form, &e );
-    
+
     if ( e.Test() )
     {
 	if( exceptionLevel )
@@ -562,7 +568,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
 
     return v;
 }
-    
+
 
 //
 // Converts a hash supplied by the user into a string using the specstring
@@ -588,14 +594,14 @@ P4ClientApi::FormatSpec( const char * type, VALUE hash )
 	}
     }
 
-    // Got a specdef so now we can attempt to convert. 
+    // Got a specdef so now we can attempt to convert.
     StrBuf	buf;
     Error	e;
 
     specMgr.SpecToString( type, hash, buf, &e );
     if( !e.Test() )
 	return P4Utils::ruby_string( buf.Text() );
-    
+
     if( exceptionLevel )
     {
 	StrBuf m;
@@ -631,7 +637,7 @@ P4ClientApi::SpecFields( const char * type )
 
     return specMgr.SpecFields( type );
 }
-    
+
 //
 // Raises an exception or returns Qfalse on bad input
 //
@@ -697,13 +703,13 @@ P4ClientApi::Except( const char *func, const char *msg )
     StrBuf	errors;
     StrBuf	warnings;
     int		terminate = 0;
-    
+
     m << "[" << func << "] " << msg;
 
     // Now append any errors and warnings to the text
     ui.GetResults().FmtErrors( errors );
     ui.GetResults().FmtWarnings( warnings );
-    
+
     if( errors.Length() )
     {
 	m << "\n" << errors;

data/ext/P4/p4clientapi.h

@@ -119,6 +119,7 @@ public:
     VALUE Connect();		// P4Exception on error
     VALUE Connected();		// Return true if connected and not dropped.
     VALUE Disconnect();
+    VALUE Reset();          // Clear out any results from the previous command
 
     // Executing commands.
     VALUE Run( const char *cmd, int argc, char * const *argv );

data/lib/P4/version.rb

@@ -1,3 +1,3 @@
 class P4
-  Version = VERSION = '2017.1.1599185'
+  Version = VERSION = '2017.1.1609394'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4ruby
 version: !ruby/object:Gem::Version
-  version: 2017.1.1599185
+  version: 2017.1.1609394
 platform: ruby
 authors:
 - Perforce Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extensions to the C++ Perforce API.
 email: support@perforce.com