p4_web_api_client 2014.2.0.pre1 → 2014.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199bda143441561260c895321ab9c1c57d42a4ef
-  data.tar.gz: 30f094cc9402abdbc2b60707b4f16f03db187c57
+  metadata.gz: 7b8e4e28235231bd2413b64682c44d6bdd6d5bbb
+  data.tar.gz: 2ccbe57364a8ec3a59442786a5da4dde61b90286
 SHA512:
-  metadata.gz: d91a36aad1d32dc268db168db220f0d5951cc3aabc28d53fe6b3ed6789c1c0ea30e9d07717bc458191df98870f9788dfa9d2b08e93b096ccc2335ee4e9bdc280
-  data.tar.gz: 3500061dd4dd4084729653a53ad1a4bc269dec65d2761727d110691f6673e5860a256d0e3ad80a5da736d4e83025949c340ba5ae156e5eb1c379374edd3dc1cf
+  metadata.gz: 790388c690229c7ec5c2b7415b46de0cfded8c46225e7b2aec1f807541a30754ff81bf1bbc17617780df5f5c2cb43307008421b201edbf53430718f34d0b3a66
+  data.tar.gz: e37faaf0d997fd72505dc0cbf685bb396d8303db31fc73eae3921c48fb6943ffb62d77cb80647ba4df9fb3660b48266674d9314821648462cb5e94dec7e9c858

data/lib/p4_web_api_client/client/files.rb

@@ -2,6 +2,7 @@ require 'open-uri'
 require 'p4_web_api_client/models/dir'
 require 'p4_web_api_client/models/depot'
 require 'p4_web_api_client/models/file'
+require 'p4_web_api_client/models/upload_file'
 
 module P4WebApiClient
   class Client
@@ -26,5 +27,64 @@ module P4WebApiClient
         end
       end
     end
+
+    # Returns the content of the path.
+    #
+    # The path should be a depot path, we'll basically just print out the
+    # latest version of the file.
+    def print(path)
+      return unless path
+
+      path = path.gsub(/^[\/]*/, '') # Strip leading slashes
+
+      path = "/print/#{path}"
+      response = connection.run_method_no_body(:get, path)
+      response.body
+    end
+
+    # Uploads file contents to the server.
+    #
+    # Takes an array of P4WebApiClient::Models::UploadFile definitions, or
+    # hashes that will be turned into those UploadFile definitions. Which means
+    # that each hash should include the following properties:
+    #
+    # - `depot_path`
+    # - `content`: If this is a string, we'll assume it's a local file path,
+    #              or it can be an IO handle, which we'll just read
+    # - `content_type`: If not set, we'll assume `application/octet-stream`
+    #
+    # You can optionally send in a description, which will be used as the
+    # changelist message.
+    def upload(files, description = nil)
+      file_models = init_upload_files(files)
+
+      post_body = {
+        mappings: file_models.map(&:depot_path)
+      }
+
+      file_models.each_index do |idx|
+        key = "file_#{idx}"
+        post_body[key.to_sym] = file_models[idx].upload_io
+      end
+
+      post_body[:description] = description if description
+
+      connection.run_method_with_body(:post, '/upload', nil, post_body)
+
+      true
+    end
+
+    private
+
+    def init_upload_files(files)
+      file_models = []
+      files.each do |file|
+        unless file.is_a?(Models::UploadFile)
+          file = Models::UploadFile.new(file)
+        end
+        file_models << file
+      end
+      file_models
+    end
   end
 end

data/lib/p4_web_api_client/client/run.rb

@@ -8,7 +8,7 @@ module P4WebApiClient
     # arguments.
     #
     # Expect to always have an array of hashes as output.
-    def run(cmd, args = [])
+    def run(cmd, *args)
       params = arg_params(args)
       params[:cmd] = cmd
       execute_method_no_body(:get, '/run', params)
@@ -20,7 +20,7 @@ module P4WebApiClient
     # then followed by additional command line arguments.
     #
     # Expect the output to always be an array of hashes.
-    def run_input(cmd, input, args = [])
+    def run_input(cmd, input, *args)
       params = arg_params(args)
       params[:cmd] = cmd
       execute_method_with_body(:post, '/run', params, input)

data/lib/p4_web_api_client/connection.rb

@@ -16,7 +16,11 @@ module P4WebApiClient
       local_opts = [:login, :password, :prefix]
       conn_options = options.select { |k| !local_opts.include?(k) }
 
-      @conn = Faraday.new(conn_options)
+      @conn = Faraday.new(conn_options) do |conn|
+        conn.request :multipart
+        conn.request :url_encoded
+        conn.adapter :net_http
+      end
 
       @session_token = nil
       @login = options[:login]

data/lib/p4_web_api_client/models/upload_file.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2014 Perforce Software, Inc.  All rights reserved.
+
+require 'faraday'
+
+module P4WebApiClient
+  module Models
+    # Models each argument sent into the `client.upload` method. In general,
+    # you'll create hashes instead of these instances directly, so this class
+    # is 'hidden' in usage.
+    class UploadFile
+      # Where the file should go in the Perforce server.
+      attr_accessor :depot_path
+
+      # The IO handle to file data. Note that the initializer will open up
+      # 'content' properties as local files if specified as strings.
+      attr_accessor :content
+
+      # The MIME type we send the data as, defaults to
+      # `application/octet-stream`
+      attr_accessor :content_type
+
+      def initialize(obj = {})
+        @depot_path = obj[:depot_path]
+
+        @content = obj[:content]
+        @content = ::File.open(@content, 'r') if @content.is_a?(String)
+
+        @content_type = obj[:content_type]
+        @content_type = 'application/octet-stream' unless @content_type
+      end
+
+      def unique_file_name
+        random = (0...8).map { (65 + rand(26)).chr }.join
+        "#{random}_#{::File.basename(depot_path)}"
+      end
+
+      def upload_io
+        Faraday::UploadIO.new(content, content_type, unique_file_name)
+      end
+    end
+  end
+end

data/lib/p4_web_api_client/version.rb

@@ -1,3 +1,3 @@
 module P4WebApiClient
-  VERSION = '2014.2.0.pre1'
+  VERSION = '2014.2.0.pre2'
 end

data/spec/files_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rspec'
 require 'p4_web_api_client'
-
+require 'tempfile'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#files' do
@@ -34,3 +34,60 @@ RSpec.describe P4WebApiClient::Client, '#files' do
     end
   end
 end
+
+RSpec.describe P4WebApiClient::Client, '#print' do
+
+  it 'should print the content of //depot/dev/Experimental/README' do
+    client_as_jdoe do |c|
+      content = c.print('//depot/dev/Experimental/README')
+      expect(content.strip).to eq('This is an experimental project README.')
+    end
+  end
+end
+
+RSpec.describe P4WebApiClient::Client, '#upload' do
+
+  it 'should be able to edit and add files' do
+    client_as_jdoe do |c|
+
+      exists_up = Tempfile.new('exists')
+      new_up = Tempfile.new('new')
+
+      begin
+        exists_up.write('existing file content')
+        new_up.write('new file content')
+
+        exists_up.rewind
+        new_up.rewind
+
+        c.upload(
+          [
+            {
+              depot_path: '//depot/dev/Experimental/README',
+              content: exists_up.path
+            },
+            {
+              depot_path: '//depot/dev/Experimental/a.txt',
+              content: new_up.path,
+              content_type: 'text/plain'
+            }
+          ]
+        )
+
+      ensure
+        exists_up.close
+        exists_up.unlink
+
+        new_up.close
+        new_up.unlink
+      end
+
+      exists_content = c.print('//depot/dev/Experimental/README')
+      expect(exists_content.strip).to eq('existing file content')
+
+      new_content = c.print('//depot/dev/Experimental/a.txt')
+      expect(new_content.strip).to eq('new file content')
+
+    end
+  end
+end

data/spec/run_input_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe P4WebApiClient::Client, '#run_input' do
         'FullName' => 'Joe User',
         'Email' => 'joeuser@example.com'
       }
-      results = c.run_input('user', input, ['-i', '-f'])
+      results = c.run_input('user', input, '-i', '-f')
       expect(results.length).to eq(1)
     end
   end

data/spec/run_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe P4WebApiClient::Client, '#run' do
 
   it "should allow us to run 'user -o' for our known user" do
     client_as_super do |c|
-      results = c.run('user', ['-o'])
+      results = c.run('user', '-o')
       expect(results.length).to eq(1)
       expect(results[0]['User']).to eq('super')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4_web_api_client
 version: !ruby/object:Gem::Version
-  version: 2014.2.0.pre1
+  version: 2014.2.0.pre2
 platform: ruby
 authors:
 - Tristan Juricek
 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
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2014.2.0.pre1
+        version: 2014.2.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2014.2.0.pre1
+        version: 2014.2.0.pre2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +221,7 @@ files:
 - lib/p4_web_api_client/models/server.rb
 - lib/p4_web_api_client/models/stream.rb
 - lib/p4_web_api_client/models/triggers.rb
+- lib/p4_web_api_client/models/upload_file.rb
 - lib/p4_web_api_client/models/user.rb
 - lib/p4_web_api_client/version.rb
 - spec/branches_spec.rb