p4_web_api 2014.2.0.pre1 → 2014.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a33dc12a8f5e6304cf6408d9aa711b206173a00
-  data.tar.gz: e9a9c2af51c18f19a22f8267cdade878f69b40e8
+  metadata.gz: 069a887b3fabfbb41e4014f0351e9ad79e699ee9
+  data.tar.gz: 6fc582c57a30740878523f1265eade7bd6d24749
 SHA512:
-  metadata.gz: 2864edc78108d670eaabd5e4b0e868a46950c3b2cffcb62c9920b0e09ba8c4827036359869b70ddddb4fbf1b2f4e4cc8cc7f4fa4627c6d7026897378488564f4
-  data.tar.gz: a1dc0543c17c29071686891eec720d25d0987aa4e5a4e9750b698cd57b8c06c474368720b94e30201de7773449a6fb5898bffb5d0b876ebe3ec18a583b88b4cc
+  metadata.gz: a055d9ca2f41db3f61c9f8d3969d8b5ef506759671437d157eec182af6eb8ff18ff0567704203b4c4755b2deff87806cc2867ac98e0f161de93c52245f3c24e2
+  data.tar.gz: fa442bde271cf8387ac423ae2ba3fc9b8a88d38bd396478998990a8c1c74fb14f37065700acdf0e2276a89562143a25705038a8a85ba95bae5813de9382595da

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.pre1'
+  VERSION = '2014.2.0.pre2'
 end

data/lib/p4_web_api.rb

@@ -54,6 +54,7 @@ module P4WebAPI
     configure do
       set(:p4, 'host' => 'localhost', 'port' => '1666')
       set(:token_path, '/tmp/p4_web_api/tokens')
+      set(:workspace_folder, '/tmp/p4_web_api/workspaces')
 
       set(:run_get_blacklist, %w(add change changelist clean copy cstat
                                  delete diff edit flush have integ integrate
@@ -111,6 +112,65 @@ module P4WebAPI
         P4Util.open(options, &block)
       end
 
+      # Block helper to open a p4 handle with a temporary client workspace.
+      # The client workspace will map the series of depot path expressions
+      # directly into the client workspace.
+      #
+      # The depot_paths are generally expected to be complete file path
+      # expressions, e.g., '//depot/dir1/dir2/file'. They'll be mapped directly
+      # to the temporary working area: '//client/depot/dir/1/dir2/file'
+      #
+      # The block handler here will be called with the arguments (p4, root),
+      # where root is the temporary client's root directory.
+      def open_p4_temp_client(depot_paths, &block)
+        open_p4 do |p4|
+          name = (0...8).map { (65 + rand(26)).chr }.join
+          dir = init_temp_workspace_dir(name)
+          init_temp_client(p4, name, dir, depot_paths)
+
+          ex = nil
+          begin
+            block.call(p4, dir)
+          rescue StandardError => e
+            ex = e
+          end
+
+          delete_temp_client(p4, name, dir)
+
+          fail ex unless ex.nil?
+        end
+      end
+    end
+
+    def init_temp_workspace_dir(name)
+      dir = File.join(settings.workspace_folder, name)
+      unless Dir.exist?(dir)
+        FileUtils.mkpath(dir)
+        FileUtils.chmod(0700, dir)
+      end
+      dir
+    end
+
+    def init_temp_client(p4, name, dir, depot_paths)
+      spec = p4.fetch_client
+      spec._root = dir
+      spec._client = name
+      spec._description = 'p4_web_api temp client'
+
+      spec._view = depot_paths.map do |path|
+        stripped = path.gsub(/^[\/]*/, '')
+        "\"//#{stripped}\" \"//#{name}/#{stripped}\""
+      end
+
+      p4.save_client(spec)
+      p4.client = name
+
+      p4.run_sync('//...')
+    end
+
+    def delete_temp_client(p4, name, dir)
+      p4.run_client('-d', '-f', name)
+      FileUtils.rmtree(dir)
     end
 
     error do
@@ -686,6 +746,100 @@ module P4WebAPI
       ''
     end
 
+    # The print method uses the print command underneath to output file content.
+    #
+    # Unlike most of the other methods, this does not output application/json.
+    # If the type contains 'text' we set the Content-Type to 'text/plain',
+    # otherwise it's 'application/octet-stream'.
+    get '/v1/print/*' do
+      path = params[:splat].join('')
+      path = "//#{path}"
+
+      results = nil
+      open_p4 do |p4|
+        results = p4.run_print(path)
+      end
+
+      file_type = results[0]
+      content = results[1]
+
+      if file_type['type'] =~ /text/
+        content_type 'text/plain'
+      else
+        content_type 'application/octet-stream'
+      end
+
+      content
+    end
+
+    # The upload method adds new file revisions.
+    #
+    # This is a multipart method that accepts and array of files, plus,
+    # a 'mappings' array to indicate the target depot path for each file.
+    # This should be a JSON encoded array of strings.
+    #
+    # An optional 'description' attribute can describe the changes to be made.
+    post '/v1/upload' do
+      # if mappings[] and files[] do not have equivalent lengths, the error
+      # might be kind of lame.
+      mappings = params[:mappings]
+      files = []
+      mappings.each_index { |idx| files << params["file_#{idx}".to_sym] }
+
+      open_p4_temp_client(mappings) do |p4, root|
+        message = params[:description] || 'Uploaded files'
+        change_id = init_changelist(p4, message)
+
+        # Information used to determine if the new rev should be an add or edit
+        files_results = p4.run_files(mappings)
+
+        (0...mappings.length).each do |idx|
+          type = existing_path?(files_results, mappings[idx]) ? 'edit' : 'add'
+
+          if type == 'edit'
+            mark_change('edit', p4, change_id, root, mappings[idx])
+            save_content(root, mappings[idx], files[idx])
+          else
+            save_content(root, mappings[idx], files[idx])
+            mark_change('add', p4, change_id, root, mappings[idx])
+          end
+        end
+
+        p4.run_submit('-c', change_id)
+      end
+    end
+
+    def 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 save_content(root, depot_path, file)
+      local_file = local_path(depot_path, root)
+      dir = File.dirname(local_file)
+      FileUtils.mkpath(dir) unless Dir.exist?(dir)
+
+      IO.write(local_file, file[:tempfile].read)
+    end
+
+    def existing_path?(existing_results, depot_path)
+      existing_results.any? do |result|
+        result['depotFile'] == depot_path
+      end
+    end
+
+    def 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 local_path(depot_path, root)
+      stripped = depot_path.gsub(/^\/+/, '')
+      File.join(root, stripped)
+    end
+
     # Basically a "blacklist" of things we know the frameworks going to add to
     # the params array we don't want to pass on to the p4 command sets for spec
     # input

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4_web_api
 version: !ruby/object:Gem::Version
-  version: 2014.2.0.pre1
+  version: 2014.2.0.pre2
 platform: ruby
 authors:
 - Perforce Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler