p4ruby 2017.1.1653916 → 2017.1.1699426

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7ef1db8588d07ebaaddf51952a2d10e66609ae
-  data.tar.gz: 2aac13755ff1f38366dd07c0b897eebb6f936b00
+  metadata.gz: 6b823b2820c19f394899dcc7e5b853a0ea90003a
+  data.tar.gz: 13f0eed9d3d303728d198fdb7831fe940dae055e
 SHA512:
-  metadata.gz: 16af3d80bf612148a7d36a1ef51be24f97c93dcc0eef4fed9457c2ae6b70db1497050a68bbddb531209a98741e68b51aed442e039333eecfd09d14cde60b908b
-  data.tar.gz: af3387c0529cc2a800246dc380c7df337fed57badd7795664a527bbd0931cb0c4185eabc369b61ab8e3d634373f84937a31ea3b612d1530e1f98635f69d8a4cd
+  metadata.gz: 9026dd4c25121947241dc0b31c1d3f306153a8827f40d1b7e4348e2101655e0dd07fb808439141c0513d568f7a69320317f3e9a8267d10437536867e7920befb
+  data.tar.gz: 4783f0c749b9b4d54c0401169c1f4d7ebc008500ce3d4d0440ff396d990a0a5ed5faefe7d3a72c1d435bb82a85430e3acd66f4b0150d2bd6649a76e238c63452

data/README.md

@@ -290,6 +290,9 @@ release up to the bug fix change level.
 
 New functionality in 2017.1
 
+- (SIR#96305/ P4RUBY-214)
+    Add get/set trust file location to api
+
 - (SIR#93993 / P4RUBY-206)
 
     Add a reset() method for resetting p4 client data (messages, output, etc.)

data/ext/P4/p4.cpp

@@ -489,6 +489,21 @@ static VALUE p4_set_ticket_file( VALUE self, VALUE path )
     return Qtrue;
 }
 
+static VALUE p4_get_trust_file( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return P4Utils::ruby_string( p4->GetTrustFile().Text() );
+}
+
+static VALUE p4_set_trust_file( VALUE self, VALUE path )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    p4->SetTrustFile( StringValuePtr( path ) );
+    return Qtrue;
+}
+
 static VALUE p4_get_user( VALUE self )
 {
     P4ClientApi	*p4;
@@ -1188,6 +1203,14 @@ static VALUE p4msg_get_text( VALUE self )
     return e->GetText();
 }
 
+static VALUE p4msg_get_dict( VALUE self )
+{
+    P4Error *   e = 0;
+
+    Data_Get_Struct( self, P4Error, e );
+    return e->GetDict();
+}
+
 static VALUE p4msg_get_id( VALUE self )
 {
     P4Error *	e = 0;
@@ -1263,6 +1286,8 @@ void	Init_P4()
     rb_define_method( cP4, "protocol", 	RUBY_METHOD_FUNC(p4_set_protocol), 2 );
     rb_define_method( cP4, "ticket_file", RUBY_METHOD_FUNC(p4_get_ticket_file), 0 );
     rb_define_method( cP4, "ticket_file=", RUBY_METHOD_FUNC(p4_set_ticket_file), 1 );
+    rb_define_method( cP4, "trust_file", RUBY_METHOD_FUNC(p4_get_trust_file), 0 );
+    rb_define_method( cP4, "trust_file=", RUBY_METHOD_FUNC(p4_set_trust_file), 1 );
     rb_define_method( cP4, "user", 	RUBY_METHOD_FUNC(p4_get_user)    , 0 );
     rb_define_method( cP4, "user=", 	RUBY_METHOD_FUNC(p4_set_user)    , 1 );
     rb_define_method( cP4, "version", 	RUBY_METHOD_FUNC(p4_get_version) , 0 );
@@ -1363,6 +1388,7 @@ void	Init_P4()
     rb_define_method( cP4Msg, "msgid", RUBY_METHOD_FUNC(p4msg_get_id), 0);
     rb_define_method( cP4Msg, "severity", RUBY_METHOD_FUNC(p4msg_get_severity), 0);
     rb_define_method( cP4Msg, "generic", RUBY_METHOD_FUNC(p4msg_get_generic), 0);
+    rb_define_method( cP4Msg, "dictionary", RUBY_METHOD_FUNC(p4msg_get_dict), 0);
     rb_define_method( cP4Msg, "to_s", RUBY_METHOD_FUNC(p4msg_get_text), 0);
 
     //	P4::Progress class.

data/ext/P4/p4clientapi.cpp

@@ -94,7 +94,17 @@ P4ClientApi::P4ClientApi() : ui( &specMgr )
     henv.GetTicketFile( ticketFile );
 
     if( (t = enviro->Get("P4TICKETS")) )
-	ticketFile = t;
+	   ticketFile = t;
+
+    //
+    // Load the current trust file. Start with the default, and then
+    // override it if P4TRUST is set.
+    //
+
+    henv.GetTrustFile( trustFile );
+
+    if( (t = enviro->Get("P4TICKETS")) )
+        trustFile = t;
 
     //
     // Load the current P4CHARSET if set.
@@ -192,6 +202,13 @@ P4ClientApi::SetTicketFile( const char *p )
     ticketFile = p;
 }
 
+void
+P4ClientApi::SetTrustFile( const char *p )
+{
+    client.SetTrustFile( p );
+    trustFile = p;
+}
+
 void
 P4ClientApi::SetDebug( int d )
 {

data/ext/P4/p4clientapi.h

@@ -85,6 +85,7 @@ public:
     void SetProg( const char *p )	{ prog = p;			}
     void SetProtocol( const char *var, const char *val );
     void SetTicketFile( const char *p );
+    void SetTrustFile( const char *p );
     void SetUser( const char *u )	{ client.SetUser( u );		}
     void SetVersion( const char *v )	{ version = v;			}
 
@@ -102,6 +103,7 @@ public:
     const StrPtr &GetPort()		{ return client.GetPort();	}
     const StrPtr &GetProg()		{ return prog;			}
     const StrPtr &GetTicketFile()	{ return ticketFile;		}
+    const StrPtr &GetTrustFile()   { return trustFile;        }
     const StrPtr &GetUser()		{ return client.GetUser();	}
     const StrPtr &GetVersion()		{ return version;		}
 
@@ -235,6 +237,7 @@ private:
     StrBuf		prog;
     StrBuf		version;
     StrBuf		ticketFile;
+    StrBuf      trustFile;
     int			depth;
     int			debug;
     int			exceptionLevel;

data/ext/P4/p4error.cpp

@@ -88,6 +88,21 @@ P4Error::GetText()
     return P4Utils::ruby_string( t.Text(), t.Length() );
 }
 
+VALUE
+P4Error::GetDict()
+{
+    VALUE dictHash = rb_hash_new();
+    StrDict* pDict = error.GetDict();
+    StrRef key, val;
+    // suppress -Wpointer-arith
+    for (int i=0;pDict->GetVar(i,key,val) != 0;i++) {
+      rb_hash_aset( dictHash,
+        P4Utils::ruby_string(key.Text(), key.Length()),
+        P4Utils::ruby_string(val.Text(), val.Length()));
+    }
+    return dictHash;
+}
+
 VALUE
 P4Error::Inspect()
 {

data/ext/P4/p4error.h

@@ -46,6 +46,7 @@ class P4Error
     VALUE	GetGeneric();
     VALUE	GetSeverity();
     VALUE	GetText();
+    VALUE   GetDict();
     VALUE	Inspect();
 
     // Wrap as Ruby object of class pClass

data/lib/P4/version.rb

@@ -1,3 +1,3 @@
 class P4
-  Version = VERSION = '2017.1.1653916'
+  Version = VERSION = '2017.1.1699426'
 end

metadata

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