p4ruby 2015.2.1313860-x86-mingw32 → 2020.1.2056123-x86-mingw32

data/ext/P4/p4clientapi.h

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 /*******************************************************************************
- * P4ClientApi class - where we register our Ruby classes and plumb together 
+ * P4ClientApi class - where we register our Ruby classes and plumb together
  * the components
  ******************************************************************************/
 
@@ -56,11 +56,14 @@ public:
     int SetTrack( int enable );
     int GetTrack()			{ return IsTrackMode() != 0;    }
 
-    // Set streams mode 
-
+    // Set streams mode
     void SetStreams( int enable );
     int IsStreams() 			{ return IsStreamsMode() != 0;    };
 
+    // Set graph mode
+    void SetGraph( int enable );
+    int IsGraph()             { return IsGraphMode() != 0;    };
+
     // Returns bool, but may raise exception
     int  SetCharset( const char *c );
 
@@ -75,13 +78,14 @@ public:
     void SetMaxResults( int v )		{ maxResults = v;		}
     void SetMaxScanRows( int v )	{ maxScanRows = v;		}
     void SetMaxLockTime( int v )	{ maxLockTime = v;		}
-    VALUE SetEnv( const char *var, const char *val ); 
+    VALUE SetEnv( const char *var, const char *val );
     void SetLanguage( const char *l )	{ client.SetLanguage( l );	}
     void SetPassword( const char *p )	{ client.SetPassword( p );	}
     void SetPort( const char *p )	{ client.SetPort( p );		}
     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;			}
 
@@ -99,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;		}
 
@@ -117,7 +122,7 @@ public:
     VALUE Connected();		// Return true if connected and not dropped.
     VALUE Disconnect();
 
-    // Executing commands. 
+    // Executing commands.
     VALUE Run( const char *cmd, int argc, char * const *argv );
     VALUE SetInput( VALUE input );
 
@@ -182,8 +187,9 @@ private:
 	S_CASEFOLDING	= 0x0010,
 	S_TRACK		= 0x0020,
 	S_STREAMS	= 0x0040,
+    S_GRAPH     = 0x0080,
 
-	S_INITIAL_STATE	= 0x0041,
+	S_INITIAL_STATE	= 0x00C1,   // Streams, Graph, and Tagged enabled by default
 	S_RESET_MASK	= 0x001E,
     };
 
@@ -218,6 +224,10 @@ private:
     void	ClearStreamsMode()	{ flags &= ~S_STREAMS;		}
     int		IsStreamsMode()		{ return flags & S_STREAMS;	}
 
+    void    SetGraphMode()    { flags |= S_GRAPH;       }
+    void    ClearGraphMode()  { flags &= ~S_GRAPH;      }
+    int     IsGraphMode()     { return flags & S_GRAPH; }
+
     private:
     ClientApi		client;
     ClientUserRuby	ui;
@@ -226,6 +236,7 @@ private:
     StrBuf		prog;
     StrBuf		version;
     StrBuf		ticketFile;
+    StrBuf      trustFile;
     int			depth;
     int			debug;
     int			exceptionLevel;
@@ -236,4 +247,3 @@ private:
     int			maxScanRows;
     int			maxLockTime;
 };
-

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/ext/P4/p4result.cpp

@@ -57,6 +57,7 @@ P4Result::P4Result()
     VALUE cP4	= rb_const_get_at( rb_cObject, idP4 );
     cP4Msg	= rb_const_get_at( cP4, idP4Msg );
 
+    Reset();
 }
 
 

data/ext/P4/specmgr.cpp

@@ -63,21 +63,6 @@ struct defaultspec {
             "unlocked/locked;;"
         "View;code:311;type:wlist;words:2;len:64;;"
     },
-    {
-        "changeX",
-        "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
-        "Date;code:202;type:date;ro;fmt:R;seq:3;len:20;;"
-        "Client;code:203;ro;fmt:L;seq:2;len:32;;"
-        "User;code:204;ro;fmt:L;seq:4;len:32;;"
-        "Status;code:205;ro;fmt:R;seq:5;len:10;;"
-        "Type;code:211;seq:6;type:select;fmt:L;len:10;"
-            "val:public/restricted;;"
-        "ImportedBy;code:212;type:line;ro;fmt:L;len:32;;"
-        "Identity;code:213;type:line;;"
-        "Description;code:206;type:text;rq;;"
-        "Jobs;code:209;type:wlist;words:2;len:32;;"
-        "Files;code:210;type:llist;len:64;;"
-    },
     {
         "change",
         "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
@@ -92,6 +77,7 @@ struct defaultspec {
         "Description;code:206;type:text;rq;seq:7;;"
         "JobStatus;code:207;fmt:I;type:select;seq:9;;"
         "Jobs;code:208;type:wlist;seq:8;len:32;;"
+        "Stream;code:214;type:line;len:64;;"
         "Files;code:210;type:llist;len:64;;"
     },
     {
@@ -115,47 +101,12 @@ struct defaultspec {
         "Stream;code:314;type:line;len:64;;"
         "StreamAtChange;code:316;type:line;len:64;;"
         "ServerID;code:315;type:line;ro;len:64;;"
-        "Type;code:318;type:select;len:10;val:writeable/readonly;;"
+        "Type;code:318;type:select;len:10;val:"
+            "writeable/readonly/graph/partitioned;;"
         "Backup;code:319;type:select;len:10;val:enable/disable;;"
         "View;code:311;type:wlist;words:2;len:64;;"
         "ChangeView;code:317;type:llist;len:64;;"
     },
-    {
-        "clientX",
-        "Client;code:301;rq;ro;seq:1;len:32;;"
-        "Update;code:302;type:date;ro;seq:2;fmt:L;len:20;;"
-        "Access;code:303;type:date;ro;seq:4;fmt:L;len:20;;"
-        "Owner;code:304;seq:3;fmt:R;len:32;;"
-        "Host;code:305;seq:5;fmt:R;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:llist;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "SubmitOptions;code:313;type:select;fmt:L;len:25;val:"
-            "submitunchanged/submitunchanged+reopen/revertunchanged/"
-            "revertunchanged+reopen/leaveunchanged/leaveunchanged+reopen;;"
-        "LineEnd;code:310;type:select;fmt:L;len:12;val:"
-            "local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
-    {
-        "clientSpecing021",
-        "Client;code:301;rq;ro;len:32;;"
-        "Update;code:302;type:date;ro;len:20;;"
-        "Access;code:303;type:date;ro;len:20;;"
-        "Owner;code:304;len:32;;"
-        "Host;code:305;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:text;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "LineEnd;code:310;type:select;len:12;val:local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
     {
         "depot",
         "Depot;code:251;rq;ro;len:32;;"
@@ -175,11 +126,13 @@ struct defaultspec {
         "MaxResults;code:402;type:word;len:12;;"
         "MaxScanRows;code:403;type:word;len:12;;"
         "MaxLockTime;code:407;type:word;len:12;;"
+	"MaxOpenFiles;code:413;type:word;len:12;;"
         "Timeout;code:406;type:word;len:12;;"
         "PasswordTimeout;code:409;type:word;len:12;;"
         "LdapConfig;code:410;type:line;len:128;;"
         "LdapSearchQuery;code:411;type:line;len:128;;"
         "LdapUserAttribute;code:412;type:line;len:128;;"
+	"LdapUserDNAttribute;code:414;type:line;len:128;;"
         "Subgroups;code:404;type:wlist;len:32;opt:default;;"
         "Owners;code:408;type:wlist;len:32;opt:default;;"
         "Users;code:405;type:wlist;len:32;opt:default;;"
@@ -247,36 +200,62 @@ struct defaultspec {
         "Clients;code:458;len:8;;"
         "Users;code:459;len:8;;"
         "Files;code:460;len:8;;"
+	"Repos;code:462;len:8;;"
     },
     {
         "protect",
-        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;len:64;;"
+	"SubPath;code:502;ro;len:64;;"
+	"Update;code:503;type:date;ro;fmt:L;len:20;;"
+        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;z;len:64;;"
     },
     {
         "remote",
-        "RemoteID;code:851;rq;ro;len:32;;"
+        "RemoteID;code:851;rq;ro;fmt:L;len:32;;"
         "Address;code:852;rq;type:line;len:32;;"
         "Owner;code:853;fmt:R;len:32;;"
         "RemoteUser;code:861;fmt:R;len:32;;"
         "Options;code:854;type:line;len:32;val:"
-            "unlocked/lockednocompress/compress;;"
+            "unlocked/locked,nocompress/compress,copyrcs/nocopyrcs;;"
         "Update;code:855;type:date;ro;fmt:L;len:20;;"
         "Access;code:856;type:date;ro;fmt:L;len:20;;"
         "Description;code:857;type:text;len:128;;"
         "LastFetch;code:858;fmt:L;len:10;;"
         "LastPush;code:859;fmt:L;len:10;;"
         "DepotMap;code:860;type:wlist;words:2;len:64;;"
+        "ArchiveLimits;code:862;type:wlist;words:2;len:64;;"
     },
     {
-        "specW",
-        "Fields;code:351;type:wlist;words:5;rq;;"
-        "Required;code:357;type:wlist;;"
-        "Readonly;code:358;type:wlist;;"
-        "Words;code:352;type:wlist;words:2;;"
-        "Formats;code:353;type:wlist;words:3;;"
-        "Values;code:354;type:wlist;words:2;;"
-        "Presets;code:355;type:wlist;words:2;;"
-        "Comments;code:356;type:text;;"
+        "repo",
+	"Repo;code:1001;rq;ro;len:128;;"
+	"Owner;code:1002;len:32;;"
+	"Created;code:1003;type:date;ro;fmt:L;len:20;;"
+	"Pushed;code:1004;type:date;ro;fmt:L;len:20;;"
+	"ForkedFrom;code:1005;ro;len:128;;"
+	"Description;code:1006;type:text;len:128;;"
+	"DefaultBranch;code:1007;len:32;;"
+	"MirroredFrom;code:1008;len:32;;"
+	"Options;code:1009;type:select;len:10;val:lfs/nolfs;;"
+	"GconnMirrorServerId;code:1010;len:32;;"
+    },
+    {
+        "server",
+        "ServerID;code:751;rq;ro;len:32;;"
+	"Type;code:752;rq;len:32;;"
+	"Name;code:753;type:line;len:32;;"
+	"Address;code:754;type:line;len:32;;"
+	"ExternalAddress;code:755;type:line;len:32;;"
+	"Services;code:756;rq;len:128;;"
+	"Options;code:764;type:line;len:32;val:"
+	    "nomandatory/mandatory;;"
+	"ReplicatingFrom;code:765;type:line;len:32;;"
+	"Description;code:757;type:text;len:128;;"
+	"User;code:761;type:line;len:64;;"
+	"AllowedAddresses;code:763;type:wlist;len:64;;"
+	"UpdateCachedRepos;code:766;type:wlist;len:64;;"
+	"ClientDataFilter;code:758;type:wlist;len:64;;"
+	"RevisionDataFilter;code:759;type:wlist;len:64;;"
+	"ArchiveDataFilter;code:760;type:wlist;len:64;;"
+	"DistributedConfig;code:762;type:text;len:128;;"
     },
     {
         "spec",
@@ -293,28 +272,28 @@ struct defaultspec {
         "Stream;code:701;rq;ro;len:64;;"
         "Update;code:705;type:date;ro;fmt:L;len:20;;"
         "Access;code:706;type:date;ro;fmt:L;len:20;;"
-        "Owner;code:704;len:32;;"
-        "Name;code:703;rq;type:line;len:32;;"
+        "Owner;code:704;len:32;open:isolate;;"
+        "Name;code:703;rq;type:line;len:32;open:isolate;;"
         "Parent;code:702;rq;len:64;open:isolate;;"
         "Type;code:708;rq;len:32;open:isolate;;"
-        "Description;code:709;type:text;len:128;;"
+        "Description;code:709;type:text;len:128;open:isolate;;"
         "Options;code:707;type:line;len:64;val:"
             "allsubmit/ownersubmit,unlocked/locked,"
             "toparent/notoparent,fromparent/nofromparent,"
-            "mergedown/mergeany;;"
-        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:isolate;;"
-        "Remapped;code:711;type:wlist;words:2;len:64;open:isolate;;"
-        "Ignored;code:712;type:wlist;words:1;len:64;open:isolate;;"
+            "mergedown/mergeany;open:isolate;;"
+        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:propagate;;"
+        "Remapped;code:711;type:wlist;words:2;len:64;open:propagate;;"
+        "Ignored;code:712;type:wlist;words:1;len:64;open:propagate;;"
         "View;code:713;type:wlist;words:2;len:64;;"
         "ChangeView;code:714;type:llist;ro;len:64;;"
     },
     {
         "triggers",
-        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;"
+        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;z;;"
     },
     {
        "typemap",
-        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;"
+        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;z;;"
     },
     {
         "user",
@@ -326,23 +305,10 @@ struct defaultspec {
         "FullName;code:655;fmt:R;type:line;rq;len:32;;"
         "JobView;code:656;type:line;len:64;;"
         "Password;code:657;len:32;;"
-        "AuthMethod;code:662;fmt:L;len:10;val:perforce/ldap;;"
+        "AuthMethod;code:662;fmt:L;len:10;val:"
+            "perforce/perforce+2fa/ldap/ldap+2fa;;"
         "Reviews;code:658;type:wlist;len:64;;"
     },
-    {
-        "server",
-        "ServerID;code:751;rq;ro;len:32;;"
-        "Type;code:752;rq;len:32;;"
-        "Name;code:753;type:line;len:32;;"
-        "Address;code:754;type:line;len:32;;"
-        "ExternalAddress;code:755;type:line;len:32;;"
-        "Services;code:756;rq;len:128;;"
-        "Description;code:757;type:text;len:128;;"
-        "User;code:761;type:line;len:64;;"
-        "ClientDataFilter;code:758;type:wlist;len:64;;"
-        "RevisionDataFilter;code:759;type:wlist;len:64;;"
-        "ArchiveDataFilter;code:760;type:wlist;len:64;;"
-    },
     { 0, 0 }
 };
 

data/lib/P4.rb

@@ -557,7 +557,7 @@ class P4
 
     def set_attribute( name, value )
       name = name.downcase
-      if( value =~ /^\d+$/ )
+      if( value.to_s =~ /^\d+$/ )
         @attributes[ name ] = value.to_i
       else
         @attributes[ name ] = value

data/lib/P4/version.rb

@@ -1,3 +1,3 @@
-class P4
-  Version = VERSION = '2015.2.1313860'
-end
+class P4
+    Version = VERSION = '2020.1.2056123'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4ruby
 version: !ruby/object:Gem::Version
-  version: 2015.2.1313860
+  version: 2020.1.2056123
 platform: x86-mingw32
 authors:
 - Perforce Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extensions to the C++ Perforce API.
 email: support@perforce.com
@@ -43,32 +43,32 @@ files:
 - ext/P4/specmgr.cpp
 - ext/P4/specmgr.h
 - ext/P4/undefdups.h
-- lib/2.0/P4.so
-- lib/2.1/P4.so
-- lib/2.2/P4.so
+- lib/2.6/P4.so
+- lib/2.7/P4.so
 - lib/P4.rb
+- lib/P4.so
 - lib/P4/version.rb
-homepage: https://swarm.workshop.perforce.com/projects/perforce-software-p4ruby/
+homepage: https://github.com/perforce/p4ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://www.perforce.com/manuals/p4ruby/Content/P4Ruby/Home-p4ruby.html
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby extensions to the C++ Perforce API