p4ruby 2015.2.1313860 → 2017.1.1599185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df8ecb29b0d14fc60e731f2a37e54d488c17c78
-  data.tar.gz: f13fb14baf015b909eca435b20b3e45cb996f5b8
+  metadata.gz: 6c726609fc009f798f611b395f1b73782d33a951
+  data.tar.gz: f40e6deeb256912813dea61449903fe33223aa69
 SHA512:
-  metadata.gz: 9a650207e7bc2f3f5eaf32d04de047b2025d5fa46dfbb1cc244de576b657d8563ae3456b3da97999c47d1339148424919ac93fd047e2719bb9ae58d38f26cddd
-  data.tar.gz: 4fcb7e186fd5c46a2927993e75ceda31ad0a4f917cce9c8b439157462544a3646862e767590f20a188a1f475ba4a9091202f1217f52d9ba82082cba47a553491
+  metadata.gz: 30e137fbe3274e5e80454adbb1c0aa8b6d6515e866b63129750da07048e47110d96f34510766e466ba571b1c26577d75e66135e5e08ad4784ddbaf98815859a7
+  data.tar.gz: f2009d6583e53a4702bc4409be915cb73cb39830c432c174c4a0f623b37d870b4439e2d8789620cd2485fe3edfcf907c34ae0569f00cc67bd2af2937552d363b

data/README.md

@@ -1,15 +1,15 @@
 # Release Notes for P4Ruby, Perforce's script API for Ruby
 
-Version 2015.2
+Version 2017.1
 
 ## Introduction
 
-P4Ruby is a native Ruby gem that allows you to run Perforce commands from 
+P4Ruby is a native Ruby gem that allows you to run Perforce commands from
 Ruby applications, and retrieve the results in a Ruby-friendly format.
 
 P4Ruby is intended to work against a corresponding version of the Perforce
-C++ API, e.g., P4Ruby 2015.2 will be compiled using a 2015.2 version
-of the P4API. You can always install P4Ruby specifying a specific version of 
+C++ API, e.g., P4Ruby 2017.1 will be compiled using a 2017.1 version
+of the P4API. You can always install P4Ruby specifying a specific version of
 the P4API.
 
 To determine the version of your P4Ruby, and which version of the
@@ -21,13 +21,13 @@ P4API it has been built with, issue the following command:
 
 ### Installing P4Ruby
 
-As of 2014.2, the recommended mechanism for installing P4Ruby is via 
+As of 2014.2, the recommended mechanism for installing P4Ruby is via
 rubygems.org.
 
 Before installing, please take care that any older version of P4Ruby that
 may have been installed outside of the Gem process is removed from your
 gempath. The older installation process can not be easily removed and may
-conflict with a gem-based install. Make sure that both P4.rb and P4.so (or 
+conflict with a gem-based install. Make sure that both P4.rb and P4.so (or
 P4.bundle on OS X) are not available within the load path of Ruby. You can
 use the `puts $:` command in `irb` to determine your current load path.
 
@@ -36,8 +36,8 @@ your installation of Ruby. If you can build the core Ruby distribution
 locally, you likely can install P4Ruby without incident. On Windows,
 precompiled gems are available, which already include the P4API and OpenSSL.
 
-The main command to install p4ruby is via gem or bundler. (When using the 
-default system rubies from OS X or the CentOS Software Collections Library, 
+The main command to install p4ruby is via gem or bundler. (When using the
+default system rubies from OS X or the CentOS Software Collections Library,
 see 'Problems Specifying P4API' below.)
 
     gem install p4ruby
@@ -58,15 +58,15 @@ API itself from ftp.perforce.com.
 Alternatively, you can use Bundler (http://bundler.io). In your Gemfile,
 specify
 
-    gem 'p4ruby', '~> 2015.2'
+    gem 'p4ruby', '~> 2017.1'
 
 And then execute:
 
     bundle --with-p4api-dir=DIR
 
 #### Problems Specifying P4API
- 
-On older Ruby platforms, such as the default OS X or ruby193 CentOS 
+
+On older Ruby platforms, such as the default OS X or ruby193 CentOS
 distributions, issues can arise when specifying the P4API directly via
 the command line.
 
@@ -77,7 +77,7 @@ directly:
        --with-p4-api-include=DIR/include \
        --with-p4-api-lib=DIR/lib
 
-An alternative is to specify the P4API directory using the `p4api_dir` 
+An alternative is to specify the P4API directory using the `p4api_dir`
 environment variable.
 
 
@@ -89,16 +89,16 @@ environment variable.
    "ftp://ftp.perforce.com/perforce". The API archive is located
    in release and platform-specific subdirectories and is named
    "p4api.tgz".
-   
+
    __IMPORTANT__: Mac OS X users MUST use the 'darwin' variant
    of the Perforce API. Using the 'macos' variant
    does not work.
-   
+
    Note: 32-bit builds of P4Ruby require a 32-bit version of the
    C++ API and a 32-bit version of Ruby. 64-bit builds of
    P4Ruby require a 64-bit version of the C++ API and a
    64-bit version of Ruby.
-   
+
    Unzip the archive into an empty directory.
 
 2. Extract the P4Ruby API archive into a new, empty directory.
@@ -106,16 +106,16 @@ environment variable.
 3. In the p4ruby source directory, install dependencies:
 
         bundle install
-        
+
 3. In the p4ruby source directory, build the gem:
 
-        p4api_dir=<absolute path to Perforce C++ API> rake compile 
+        p4api_dir=<absolute path to Perforce C++ API> rake compile
 
 4. Test your distribution, which relies on a locally installed p4d.
 
         rake test
-    
-    If `p4d` is not available on your path, indicate it via the `P4D_BIN` 
+
+    If `p4d` is not available on your path, indicate it via the `P4D_BIN`
     environment variable before running `rake test`.
 
 5. Install P4Ruby into your local gem cache:
@@ -147,30 +147,29 @@ Perforce server later than 2001.1
 You should use a version of P4Ruby built against a corresponding version
 of the P4API that matches your Perforce server version. Since 2014.2,
 you should try to use the same major and minor variation of P4Ruby as
-used by the Perforce server. Ergo, against Perforce server version 2015.2,
-you would want a P4Ruby version that starts with 2015.2.
+used by the Perforce server. Ergo, against Perforce server version 2017.1,
+you would want a P4Ruby version that starts with 2017.1.
 
 #### API Compatibility
 
-The 2015.2 release of P4Ruby supports the 2015.2 Perforce API.
+The 2017.1 release of P4Ruby supports the 2017.1 Perforce API.
 Older releases might work but are not supported.
 
 #### Ruby Compatibility
 
-The 2015.2 release of P4Ruby is supported by installing the gem
-with Ruby MRI releases 2.0, 2.1, and 2.2 with shared library
+The 2017.1 release of P4Ruby is supported by installing the gem
+with Ruby MRI releases 2.0, 2.1, 2.2, and 2.3, with shared library
 support.
 
 For detailed compatibility, please check the following table:
 
     Ruby Release | P4Ruby Release
     ===================================
-         1.6     | up to 2009.2 (unsupported)
-         1.8     | 2007.3 or later (unsupported)
-         1.9     | 2011.1 or later
+         <2.0    | 2011.1 or later (unsupported)
          2.0     | 2014.1 or later
          2.1     | 2014.2 or later
          2.2     | 2014.2 or later
+         2.3     | 2017.1 or later
 
 It is recommended that you use a Ruby distribution that can deploy
 native gems easily, which, outside of Windows means obtaining a source
@@ -183,12 +182,12 @@ have shared library support configured, which is needed for Ruby
 extensions.
 
 In general, Ruby VMs installed via package managers are not officially
-coordinated with the MRI releases available on ruby-lang.org. 
-  
+coordinated with the MRI releases available on ruby-lang.org.
+
 We do verify that p4ruby works with Ruby 1.9 on Debian (and Ubuntu), and
-on CentOS 6 using the Software Collections Library. These are considered 
+on CentOS 6 using the Software Collections Library. These are considered
 "stable" distributions, and do receive security updates.
-  
+
 Other versions of Ruby, such as the default distribution of OS X may not
 work. The default OS X Ruby is infrequently updated by Apple, and is known
 to contain issues that do not seem to be patched.
@@ -202,7 +201,7 @@ fail with the error:
 
     "SSL library must be at least version 1.0.1."
 
-The 2015.2 release of P4Ruby is supported with OpenSSL 1.0.1
+The 2017.1 release of P4Ruby is supported with OpenSSL 1.0.2
 
 For detailed compatibility, please check the following table:
 
@@ -214,6 +213,7 @@ For detailed compatibility, please check the following table:
          2014.2                | 	1.0.1i+
          2015.1                | 	1.0.1i+
          2015.2                | 	1.0.1i+
+         2017.1                |  1.0.2l+
 
 
 #### Platform Compatibility
@@ -237,7 +237,7 @@ handling between compilers.
 
 #### Compatibility with Previous Releases
 
-Unless otherwise stated below, the 2015.2 release of P4Ruby is
+Unless otherwise stated below, the 2017.1 release of P4Ruby is
 compatible with previous releases from Perforce Software.
 
 #### Known Limitations
@@ -288,6 +288,12 @@ release up to the bug fix change level.
 
 --------------------------------------------------------------------------
 
+New functionality in 2017.1
+
+- (SIR#92235 / P4RUBY-204)
+
+    Support graph depot commands
+
 New functionality in 2015.2
 
 - (SIR#78548 / P4RUBY-193)
@@ -302,7 +308,7 @@ Changes in both 2015.2.0.pre0 and 2015.1.0
 - Applied change to P4ClientApi::SetCharset, that if it is set to "none", then
   we will ignore the setting. The P4API enviro file handling seems to always
   create this setting and apply it in various circumstances.
-  
+
 Changes in 2015.1.0
 
 - Updated spec mappings in specmgr.cpp to be up to date with the 2015.1 P4API
@@ -375,7 +381,7 @@ Bugs fixed in 2014.2.0.pre2
 
 New functionality in 2014.1
 
-- 807216 (SIR#70070) 
+- 807216 (SIR#70070)
 
     P4Ruby now supports the P4IGNORE file feature introduced
     in the 2013.2 server. Three new methods have been added
@@ -398,7 +404,7 @@ Bugs fixed in 2013.1
 
     P4Ruby no longer crashes when an exception is raised from
     the block passed to P4#run_resolve.
-		
+
 --------------------------------------------------------------------------
 
 New functionality in 2012.2
@@ -544,11 +550,11 @@ New functionality in 2011.1
 
     P4Ruby supports setting values in the registry (on those
     platforms that support it).
-    
+
     The command P4#set_env( var, val ) will set a registry
     variable on platforms that support this action or raise
     a P4Exception for those that don't.
-    
+
     The command P4#set_env( var, "" ) unsets a registry variable.
 
 - 333292 (Bug #36121)
@@ -717,7 +723,7 @@ New functionality in 2010.1
 
      It's now unnecessary to run a command before calling the
      following methods:
-    
+
            P4#server_level
            P4#server_case_sensitive?
            P4#server_unicode?

data/ext/P4/extconf.rb

@@ -9,7 +9,7 @@ require 'rbconfig'
 
 # Set this to the main version directory we look up in ftp.perforce.com for the P4API
 # This is ignored if you specify the version on the command line.
-P4API_VERSION_DIR = 'r15.2'
+P4API_VERSION_DIR = 'r17.2'
 
 #==============================================================================
 # Provide platform variables in P4-specific format

data/ext/P4/p4.cpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Author	: Tony Smith <tony@perforce.com> or <tony@smee.org>
  *
- * Description	: Ruby bindings for the Perforce API. 
+ * Description	: Ruby bindings for the Perforce API.
  *
  * vim:ts=8:sw=4
  ******************************************************************************/
@@ -160,7 +160,7 @@ static VALUE p4_run_tagged( VALUE self, VALUE tagged )
 	flag = 0;
     else
 	flag = NUM2INT( tagged ) ? 1 : 0;
-    
+
     int old_value = p4->IsTagged();
     p4->Tagged( flag );
 
@@ -196,7 +196,7 @@ static VALUE p4_set_tagged( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->Tagged( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
@@ -541,7 +541,7 @@ static VALUE p4_set_track( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->SetTrack( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
@@ -567,11 +567,37 @@ static VALUE p4_set_streams( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->SetStreams( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
 
+static VALUE p4_get_graph( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return p4->IsGraph() ? Qtrue : Qfalse;
+}
+
+static VALUE p4_set_graph( VALUE self, VALUE toggle )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+
+    // The user might have passed an integer, or it might be a boolean,
+    // we convert to int for consistency.
+    int     flag = 0;
+    if( toggle == Qtrue )
+    flag = 1;
+    else if( toggle == Qfalse )
+    flag = 0;
+    else
+    flag = NUM2INT( toggle ) ? 1 : 0;
+
+    p4->SetGraph( flag );
+    return flag ? Qtrue : Qfalse;   // Seems to be ignored...
+}
+
 /*******************************************************************************
  * Running commands.  General purpose Run method and method for supplying
  * input to "p4 xxx -i" commands
@@ -599,7 +625,7 @@ static VALUE p4_run( VALUE self, VALUE args )
     char *cmd = StringValuePtr( v );
     argc = NUM2INT( rb_funcall( flatArgs, idLength, 0 ) );
 
-    // Allocate storage on the stack so it's automatically reclaimed 
+    // Allocate storage on the stack so it's automatically reclaimed
     // when we exit.
     char **p4args = ALLOCA_N( char *, argc + 1 );
 
@@ -917,7 +943,7 @@ static VALUE p4map_new( int argc, VALUE *argv, VALUE pClass )
 
     // First arg is the class
     // pClass = argv[ 0 ];
- 
+
     // Now instantiate the new object.
     self = Data_Wrap_Struct( pClass, 0, p4map_free, m );
     rb_obj_call_init( self, 0, argv );
@@ -1066,7 +1092,7 @@ static VALUE p4map_reverse( VALUE self )
     return rval;
 }
 
-// 
+//
 // P4::Map#translate( string, fwd=true )
 //
 static VALUE p4map_trans( int argc, VALUE *argv, VALUE self )
@@ -1076,7 +1102,7 @@ static VALUE p4map_trans( int argc, VALUE *argv, VALUE self )
     VALUE		string;
 
     if( argc < 1 || argc > 2 )
-	rb_raise( rb_eArgError, 
+	rb_raise( rb_eArgError,
 		"Invalid arguments to P4::Map#translate. "
 		"Pass the string you wish to translate, and an optional "
 		"boolean to indicate whether translation should be in "
@@ -1197,6 +1223,8 @@ void	Init_P4()
     rb_define_method( cP4, "tagged=",	RUBY_METHOD_FUNC(p4_set_tagged), 1 );
     rb_define_method( cP4, "track?", 	RUBY_METHOD_FUNC(p4_get_track)   , 0 );
     rb_define_method( cP4, "track=", 	RUBY_METHOD_FUNC(p4_set_track)   , 1 );
+    rb_define_method( cP4, "graph?",  RUBY_METHOD_FUNC(p4_get_graph) , 0 );
+    rb_define_method( cP4, "graph=",  RUBY_METHOD_FUNC(p4_set_graph) , 1 );
 
 
     // Perforce client settings.

data/ext/P4/p4clientapi.cpp

@@ -359,6 +359,14 @@ void P4ClientApi::SetStreams( int enable )
        ClearStreamsMode();
 }
 
+void P4ClientApi::SetGraph( int enable )
+{
+    if ( enable )
+       SetGraphMode();
+    else
+       ClearGraphMode();
+}
+
 int
 P4ClientApi::GetServerLevel()
 {
@@ -480,6 +488,9 @@ P4ClientApi::RunCmd( const char *cmd, ClientUser *ui, int argc, char * const *ar
     if ( IsStreams() && apiLevel > 69 )
 	client.SetVar( "enableStreams", "" );
 
+    if ( IsGraph() && apiLevel > 81 )
+    client.SetVar( "enableGraph", "" );
+
     // If maxresults or maxscanrows is set, enforce them now
     if( maxResults  )	client.SetVar( "maxResults",  maxResults  );
     if( maxScanRows )	client.SetVar( "maxScanRows", maxScanRows );

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,7 +78,7 @@ 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 );		}
@@ -117,7 +120,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 +185,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 +222,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;

data/lib/P4/version.rb

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

metadata

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