p4ruby 2022.1.2368511 → 2023.1.2446234

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66ff1295b013fd7b51f82d0e102c55d2d874537e40104eb630b90bd7192afff
-  data.tar.gz: a234cabdc4c5813eef410723ba84c32e5fa447f72251761e75d4e0bfe2045a29
+  metadata.gz: a87aae6d511b90cf6cd088c8b6d3d412dea04eb512cad610109de79cc27900c0
+  data.tar.gz: 6c9e1736821a434331896232cbd3505fdbbdbbae9d1ad6ffee5dfdf4b178f324
 SHA512:
-  metadata.gz: 247f3de99ae7e8a6cfad31359bc0eb50a4fbcc9e8227ad87dfe5b679b84a355b5a694d84d6e2f498c88d3363d06f30a3d45864503dc28fa2e49694f663b4133d
-  data.tar.gz: aedcdfd621a399d2dcd233ddcc9807f878de9686ff34ed2809b02a802cb13c07351347d88204e1d37a1079b4ed0cf466dc6faf05cf559d6983fef75c9ef8f3f2
+  metadata.gz: 6bbfe519147104faf73f2c152023eae1b33dfeaece629d3fd2fe5e6be6cd79589c0a3e8fdac5710298b5eab31f6e50e048d31149df94bb46a99406da09cc6f54
+  data.tar.gz: 2aa239c4d91a682570a7c77ea6874c09a29f09b513725e3f45eac4f94c005a76f00671482c3a12e0a96946dd22134e2da2170fc1fc4387c1e7fa524ef37ed99c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022, Perforce Software, Inc. All rights reserved.
+Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,7 @@ this program.
 
 P4/P4API License
 -----------------------
-Copyright (c) 1995-2022, Perforce Software, Inc.
+Copyright (c) 1995-2023, Perforce Software, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/P4/extconf.rb

@@ -3,10 +3,10 @@
 $:.push File.expand_path("../../../lib", __FILE__)
 
 require 'mkmf'
-require 'net/ftp'
 require 'P4/version'
 require 'rbconfig'
 require 'openssl'
+require 'net/http'
 
 # 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.
@@ -266,9 +266,9 @@ class P4ApiVersion
     # subdirectory. Look there if we can't find it in the API root
     #
     ver_file = dir + "/Version"
-    unless File.exists?(ver_file)
+    unless File.exist?(ver_file)
       ver_file = dir + "/sample/Version"
-      return nil unless File.exists?(ver_file)
+      return nil unless File.exist?(ver_file)
     end
 
     re = Regexp.new('^RELEASE = (\d+)\s+(\d+)\s+(\w*\S*)\s*;')
@@ -390,7 +390,7 @@ def resolve_p4api_dir
   end
 
   if !p4api_dir && !with_config('p4api-dir') && enable_config('p4api-download', true)
-    download_api_via_ftp
+    download_api_via_https
     unzip_file
     p4api_dir = downloaded_p4api_dir
     dir_config('p4api', "#{p4api_dir}/include", "#{p4api_dir}/lib")
@@ -468,7 +468,7 @@ def platform_dir_name
   "bin.#{p4_platform_label}"
 end
 
-def ftp_download_dir(version)
+def download_dir(version)
   "perforce/#{version}/#{platform_dir_name}"
 end
 
@@ -484,7 +484,9 @@ def filename
                 filename = 'p4api-openssl1.1.1.zip'
             when /1.0/
                 filename = 'p4api-openssl1.0.2.zip'
-             end
+            when /3.0/
+                filename = 'p4api-openssl3.zip'
+        end
     end
   elsif RbConfig::CONFIG['target_os'].downcase =~ /darwin19|darwin[2-9][0-9]/
     filename = 'p4api-openssl1.1.1.tgz'
@@ -496,69 +498,30 @@ def filename
                 filename = 'p4api-glibc2.3-openssl1.1.1.tgz'
             when /1.0/
                 filename = 'p4api-glibc2.3-openssl1.0.2.tgz'
+            when /3.0/
+                filename = 'p4api-glibc2.3-openssl3.tgz'
         end
     end
   end
   return filename
 end
 
-
-def remote_files_matching(ftp, dir, regex)
-  ftp.ls(dir.to_s).map { |entry|
-    if match = entry.match(regex)
-      yield match
-    else
-      nil
-    end
-  }.reject { |entry|
-    entry.nil?
-  }
-end
-
-def find_latest_with_p4api(ftp, versions)
-  versions.reverse_each { |v|
-    begin
-      remote_files_matching(ftp, "r#{v}/#{platform_dir_name}/", /p4api/) do
-        return v
-      end
-    rescue
-      next
-    end
-  }
-end
-
-def find_latest_version_dir(ftp)
-  ftp.chdir('perforce')
-
-  # Capture all versions
-  versions = remote_files_matching(ftp, '.', /r(1\d\.\d)/) { |m| m.captures.first }.sort
-
-  version = find_latest_with_p4api(ftp, versions)
-
-  ftp.chdir('..')
-
-  "r#{version}"
-end
-
-# Downloads the C++ P4API via FTP to the local directory, then 'initializes' it
+#############################################
+# Downloads the C++ P4API via HTTPS to the local directory, then 'initializes' it
 # by unpacking it.
-def download_api_via_ftp
-  ftp = Net::FTP.new('ftp.perforce.com')
-  ftp.passive=true
-  ftp.login
-
-  # At one point, we allowed the gem build to just find the most recent p4api build.
-  # P4Ruby probably shouldn't do that by default.
-  #version_dir = find_latest_version_dir(ftp)
+def download_api_via_https
 
-  dir = ftp_download_dir(p4api_version_dir)
-  ftp.chdir(dir)
+  uri=URI('https://ftp.perforce.com:443')
+  dir = download_dir(p4api_version_dir)
 
-  puts "downloading #{filename} from #{dir} on ftp.perforce.com"
-  ftp.getbinaryfile(filename)
+  puts "Downloading #{filename} from #{dir} on https://ftp.perforce.com"
 
-ensure
-  ftp.close if ftp and !ftp.closed?
+  Net::HTTP.start(uri.host, uri.port, :use_ssl =>true) do |http|
+      resp = http.get("/" + dir + "/" + filename)
+      open(filename, "wb") do |file|
+          file.write(resp.body)
+      end
+  end
 end
 
 def unzip_file

data/ext/P4/p4.cpp

@@ -1502,6 +1502,11 @@ void	Init_P4()
 
     //	P4::Progress class.
     cP4Prog = rb_define_class_under( cP4, "Progress", rb_cObject );
+    
+    rb_undef_alloc_func(cP4);
+    rb_undef_alloc_func(cP4MD);
+    rb_undef_alloc_func(cP4Map);
+    rb_undef_alloc_func(cP4Msg);
 
 };
 

data/ext/P4/specmgr.cpp

@@ -92,7 +92,8 @@ struct defaultspec {
         "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;;"
+            "unlocked/locked,nomodtime/modtime,normdir/rmdir,"
+            "noaltsync/altsync;;"
         "SubmitOptions;code:313;type:select;fmt:L;len:25;val:"
             "submitunchanged/submitunchanged+reopen/revertunchanged/"
             "revertunchanged+reopen/leaveunchanged/leaveunchanged+reopen;;"
@@ -128,6 +129,7 @@ struct defaultspec {
         "MaxScanRows;code:403;type:word;len:12;;"
         "MaxLockTime;code:407;type:word;len:12;;"
         "MaxOpenFiles;code:413;type:word;len:12;;"
+        "MaxMemory;code:NNN;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;;"

data/lib/P4/version.rb

@@ -1,3 +1,3 @@
 class P4
-    Version = VERSION = '2022.1.2368511'
+    Version = VERSION = '2023.1.2446234'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4ruby
 version: !ruby/object:Gem::Version
-  version: 2022.1.2368511
+  version: 2023.1.2446234
 platform: ruby
 authors:
 - Perforce Software, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extensions to the C++ Perforce API.
 email: support@perforce.com