p4_web_api 2014.2.0.pre2 → 2014.2.0.pre4

data/lib/p4_web_api/p4_util.rb

@@ -71,6 +71,37 @@ module P4WebAPI
         .match(str)
     end
 
+    def self.init_changelist(p4, description)
+      change_spec = p4.fetch_change
+      change_spec._description = description
+      results = p4.save_change(change_spec)
+      results[0].gsub(/^Change (\d+) created./, '\1')
+    end
+
+    def self.save_content(root, depot_path, content)
+      local_file = local_path(depot_path, root)
+      dir = File.dirname(local_file)
+      FileUtils.mkpath(dir) unless Dir.exist?(dir)
+
+      IO.write(local_file, content)
+    end
+
+    def self.existing_path?(existing_results, depot_path)
+      existing_results.any? do |result|
+        result['depotFile'] == depot_path
+      end
+    end
+
+    def self.mark_change(type, p4, change_id, root, depot_path)
+      local_file = local_path(depot_path, root)
+      p4.run(type, '-c', change_id, local_file)
+    end
+
+    def self.local_path(depot_path, root)
+      stripped = depot_path.gsub(/^\/+/, '')
+      File.join(root, stripped)
+    end
+
     def self.singular(plural)
       matches = {
         branches: 'branch',
@@ -110,7 +141,6 @@ module P4WebAPI
       'changeType' => 'Type',
       'desc' => 'Description'
     }
-    DESCRIBES_MAP = CHANGES_MAP
     CHANGES_DATES = ['Date']
 
     CLIENTS_MAP = {
@@ -127,6 +157,11 @@ module P4WebAPI
     }
     DEPOTS_DATES = ['Date']
 
+    # Note that individual files are handled differently, since the keys are
+    # prefixed
+    DESCRIBE_MAP = CHANGES_MAP
+    DESCRIBE_DATES = CHANGES_DATES
+
     DIRS_MAP = {
       'dir' => 'Dir'
     }
@@ -199,6 +234,14 @@ module P4WebAPI
         make_normalizer(CLIENTS_MAP, offset, CLIENTS_DATES)
       when 'depots'
         make_normalizer(DEPOTS_MAP, offset, DEPOTS_DATES)
+      when 'describe'
+        # This only affects 'base' fields, not fields related to each file
+        base_normalize = make_normalizer(DESCRIBE_MAP, offset, DESCRIBE_DATES)
+        lambda do |results|
+          results = base_normalize.call(results)
+          P4Util.normalize_describe_files(results)
+          results
+        end
       when 'dirs'
         make_normalizer(DIRS_MAP, offset)
       when 'files'
@@ -292,6 +335,52 @@ module P4WebAPI
       end
     end
 
+    FILE_KEYS = %w(depotFile action type rev digest fileSize)
+
+    # Each file entry in the base describe tagged output contains several
+    # fields, suffixed with an index value.
+    #
+    # P4 Ruby returns the individual 'index fields' already collated by the
+    # key type.
+    def self.normalize_describe_files(results)
+      results.each do |r|
+        # We have to collect each index we discover as we iterate over the keys
+        idx_2_file = {}
+
+        FILE_KEYS.each do |key|
+          if r.key?(key)
+            r[key].each_index do |idx|
+              mapped_key = P4Util.map_describe_file_key(key)
+
+              idx_2_file[idx] = {} unless idx_2_file.key?(idx)
+              idx_2_file[idx][mapped_key] = r[key][idx]
+            end
+            r.delete(key)
+          end
+        end
+
+        r['Files'] = idx_2_file.values
+      end
+      results
+    end
+
+    def self.map_describe_file_key(key)
+      case key
+      when /^depotFile$/
+        return 'DepotFile'
+      when /^action$/
+        return 'Action'
+      when /^type$/
+        return 'Type'
+      when /^rev$/
+        return 'Revision'
+      when /^fileSize$/
+        return 'FileSize'
+      when /^digest$/
+        return 'Digest'
+      end
+    end
+
     # Returns true if .to_i will actually convert this string to an integer
     def self.i?(str)
       (str =~ /\A[-+]?\d+\z/)

data/lib/p4_web_api/version.rb

@@ -2,5 +2,5 @@
 # format, with a RubyGems-style suffix for 'prereleases'. Please use your branch
 # as the prerelease label.
 module P4WebAPI
-  VERSION = '2014.2.0.pre2'
+  VERSION = '2014.2.0.pre4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4_web_api
 version: !ruby/object:Gem::Version
-  version: 2014.2.0.pre2
+  version: 2014.2.0.pre4
 platform: ruby
 authors:
 - Perforce Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,18 @@ extra_rdoc_files: []
 files:
 - bin/p4_web_api
 - lib/p4_web_api.rb
+- lib/p4_web_api/app/changes.rb
+- lib/p4_web_api/app/commands.rb
+- lib/p4_web_api/app/files.rb
+- lib/p4_web_api/app/protections.rb
+- lib/p4_web_api/app/sessions.rb
+- lib/p4_web_api/app/specs.rb
+- lib/p4_web_api/app/streams.rb
+- lib/p4_web_api/app/triggers.rb
+- lib/p4_web_api/app/users.rb
 - lib/p4_web_api/auth.rb
+- lib/p4_web_api/change_helper.rb
+- lib/p4_web_api/helpers.rb
 - lib/p4_web_api/p4_error.rb
 - lib/p4_web_api/p4_util.rb
 - lib/p4_web_api/version.rb