p4_web_api_client 2014.2.0.pre2 → 2014.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b8e4e28235231bd2413b64682c44d6bdd6d5bbb
-  data.tar.gz: 2ccbe57364a8ec3a59442786a5da4dde61b90286
+  metadata.gz: 60acdd9017591dd155ba2281a6988ccf8361883c
+  data.tar.gz: f80d7306763682389c7f2cafbcaf1ba7f6ff14ae
 SHA512:
-  metadata.gz: 790388c690229c7ec5c2b7415b46de0cfded8c46225e7b2aec1f807541a30754ff81bf1bbc17617780df5f5c2cb43307008421b201edbf53430718f34d0b3a66
-  data.tar.gz: e37faaf0d997fd72505dc0cbf685bb396d8303db31fc73eae3921c48fb6943ffb62d77cb80647ba4df9fb3660b48266674d9314821648462cb5e94dec7e9c858
+  metadata.gz: addb3741478456b6d31c3b4781adc19aff205586b871c9482097a024ce8e4d54d2831904fd0d0d61697f18d0f83b12e9ab68307e2cadcc5de513a1654921717a
+  data.tar.gz: 6c7e932d2b9faab856624505fc5a478f89860fb516464343374dff3c39c0638adf606b04f3e9b833dae815081530461bdd83e8f4cf85044cb971aeeeb9d2600f

data/lib/p4_web_api_client/client.rb

@@ -1,6 +1,7 @@
 
 require 'json'
 require 'open-uri'
+require 'p4_web_api_client/connection'
 require 'p4_web_api_client/version'
 require 'p4_web_api_client/errors'
 require 'p4_web_api_client/models'
@@ -17,8 +18,6 @@ module P4WebApiClient
   # i.e., editing models will not make edits to the Perforce system. All
   # modifying methods lie within this Client object, which typically binds to
   # a single RPC call.
-  #
-  # TODO: URL to online documentation
   class Client
     # This is an instance of P4WebApiClient::Connection
     attr_accessor :connection
@@ -30,8 +29,9 @@ module P4WebApiClient
     #
     # Any client created via Client.new should take care to call close().
     #
-    def initialize(connection)
-      @connection = connection
+    def initialize(conn)
+      conn = Connection.new(conn) unless conn.is_a?(Connection)
+      @connection = conn
     end
 
     def close
@@ -73,13 +73,13 @@ end
 require 'p4_web_api_client/client/branches'
 require 'p4_web_api_client/client/changes'
 require 'p4_web_api_client/client/clients'
+require 'p4_web_api_client/client/commands'
 require 'p4_web_api_client/client/depots'
 require 'p4_web_api_client/client/files'
 require 'p4_web_api_client/client/groups'
 require 'p4_web_api_client/client/jobs'
 require 'p4_web_api_client/client/labels'
 require 'p4_web_api_client/client/protections'
-require 'p4_web_api_client/client/run'
 require 'p4_web_api_client/client/servers'
 require 'p4_web_api_client/client/streams'
 require 'p4_web_api_client/client/triggers'

data/lib/p4_web_api_client/client/branches.rb

@@ -26,7 +26,7 @@ module P4WebApiClient
 
     # Updates the branch specification.
     def update_branch(branch)
-      execute_method_with_body(:put, "/branches/#{URI.encode(branch.branch)}",
+      execute_method_with_body(:patch, "/branches/#{URI.encode(branch.branch)}",
                                branch.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/changes.rb

@@ -13,5 +13,20 @@ module P4WebApiClient
       arr = execute_method_no_body(:get, '/changes', options)
       arr.map { |obj| Models::Change.new(obj) }
     end
+
+    # Returns the Change indicated by the change number or model.
+    #
+    # If there are files submitted with the change, the change.files field
+    # should be filled out.
+    def change(change)
+      change_id = change.is_a?(Models::Change) ? change.change : change
+      arr = execute_method_no_body(:get, "/changes/#{change_id}")
+      Models::Change.new(arr.first)
+    end
+
+    def create_change(change)
+      change = Models::Change.new(change) unless change.is_a?(Models::Change)
+      execute_method_with_body(:post, '/changes', nil, change.to_internal_hash)
+    end
   end
 end

data/lib/p4_web_api_client/client/clients.rb

@@ -25,7 +25,7 @@ module P4WebApiClient
 
     # Updates the client specification.
     def update_client(client)
-      execute_method_with_body(:put, "/clients/#{URI.encode(client.client)}",
+      execute_method_with_body(:patch, "/clients/#{URI.encode(client.client)}",
                                client.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/{run.rb → commands.rb}

@@ -1,17 +1,21 @@
 require 'json'
+require 'open-uri'
 
 module P4WebApiClient
   class Client
-    # Generic run command.
+    # Execute a Perforce command.
     #
     # First argument should always be the command, followed by command line
     # arguments.
     #
     # Expect to always have an array of hashes as output.
-    def run(cmd, *args)
+    #
+    # Not all commands are allowed, since the command will be executed on the
+    # web server. In general, if your command requires a client workspace, it
+    # will likely fail, or be blocked.
+    def exec(cmd, *args)
       params = arg_params(args)
-      params[:cmd] = cmd
-      execute_method_no_body(:get, '/run', params)
+      execute_method_no_body(:get, "/commands/#{URI.encode(cmd)}", params)
     end
 
     # Generic run command with and input body.
@@ -20,10 +24,15 @@ 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)
+    #
+    # Not all commands are allowed, since the command will be executed on the
+    # web server. In general, if your command requires a client workspace, it
+    # will likely fail, or be blocked.
+    def execi(cmd, input, *args)
       params = arg_params(args)
       params[:cmd] = cmd
-      execute_method_with_body(:post, '/run', params, input)
+      path = "/commands/#{URI.encode(cmd)}"
+      execute_method_with_body(:post, path, params, input)
     end
 
     # Creates a hash and creates keys 'arg1', 'arg2', etc that points to

data/lib/p4_web_api_client/client/depots.rb

@@ -27,7 +27,7 @@ module P4WebApiClient
 
     # Updates the depot specification.
     def update_depot(depot)
-      execute_method_with_body(:put, "/depots/#{URI.encode(depot.depot)}",
+      execute_method_with_body(:patch, "/depots/#{URI.encode(depot.depot)}",
                                depot.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/files.rb

@@ -2,7 +2,6 @@ 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
@@ -12,79 +11,85 @@ module P4WebApiClient
     # depot location, e.g., `my_depot/dir1`.
     #
     # When path is empty, will return the list of depots.
+    #
+    # Note: if path happens to be a file, instead of a directory, this is
+    # a synonym with the file() method.
     def files(path = '')
       unless path.empty?
         path = path.split('/').map { |p| URI.encode(p) }.join('/')
       end
       arr = execute_method_no_body(:get, "/files/#{path}")
-      arr.map do |obj|
-        if obj.key?('DepotFile')
-          Models::File.new(obj)
-        elsif obj.key?('Dir')
-          Models::Dir.new(obj)
-        elsif obj.key?('Depot')
-          Models::Depot.new(obj)
+      if arr.is_a?(Array)
+        arr.map do |obj|
+          if obj.key?('DepotFile')
+            Models::File.new(obj)
+          elsif obj.key?('Dir')
+            Models::Dir.new(obj)
+          elsif obj.key?('Depot')
+            Models::Depot.new(obj)
+          end
         end
+      else
+        Models::File.new(arr)
       end
     end
 
-    # Returns the content of the path.
+    # Returns the file metadata at this location, with the `content` field
+    # filled out.
     #
-    # 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
+    # If path happens to be a directory, this method is synonymous with the
+    # files() method.
+    def file(path)
+      files(path)
+    end
 
-      path = "/print/#{path}"
-      response = connection.run_method_no_body(:get, path)
-      response.body
+    # Upload a single file's content.
+    #
+    # file should contain the following fields:
+    #
+    # - `depot_file`: target depot path
+    # - `content`: file content
+    def upload_file(file)
+      file = Models::File.new(file) unless file.is_a?(Models::File)
+      path = encode_path(file.depot_file)
+      execute_method_with_body(:patch,
+                               "/files/#{path}",
+                               nil,
+                               file.to_internal_hash)
     end
 
-    # Uploads file contents to the server.
+    # Upload multiple files
     #
-    # 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:
+    # Each file in the files array should have two fields
     #
-    # - `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`
+    # - `depot_file`: target path, can be relative if `path` is indicated
+    # - `content`: File content
     #
-    # 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
+    # The optional `path` parameter can indicate the root directory for all
+    # files.
+    def upload_files(files: [], path: nil)
+      files = files.map do |f|
+        Models::File.new(f) unless f.is_a?(Models::File)
       end
 
-      post_body[:description] = description if description
+      path = path ? encode_path(path) : ''
+
+      obj = {
+        'Files' => files.map(&:to_internal_hash)
+      }
 
-      connection.run_method_with_body(:post, '/upload', nil, post_body)
+      execute_method_with_body(:patch, "/files/#{path}", nil, obj)
+    end
 
-      true
+    def delete_file(path)
+      path = encode_path(path)
+      execute_method_no_body(:delete, "/files/#{path}")
     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
+    def encode_path(path)
+      path.split('/').map { |p| URI.encode(p) }.join('/')
     end
   end
 end

data/lib/p4_web_api_client/client/groups.rb

@@ -26,7 +26,7 @@ module P4WebApiClient
 
     # Updates the group specification.
     def update_group(group)
-      execute_method_with_body(:put, "/groups/#{URI.encode(group.group)}",
+      execute_method_with_body(:patch, "/groups/#{URI.encode(group.group)}",
                                group.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/jobs.rb

@@ -23,7 +23,7 @@ module P4WebApiClient
 
     # Updates the job specification.
     def update_job(job)
-      execute_method_with_body(:put, "/jobs/#{URI.encode(job['Job'])}", job)
+      execute_method_with_body(:patch, "/jobs/#{URI.encode(job['Job'])}", job)
       true
     end
 

data/lib/p4_web_api_client/client/labels.rb

@@ -26,7 +26,7 @@ module P4WebApiClient
 
     # Updates the label specification.
     def update_label(label)
-      execute_method_with_body(:put, "/labels/#{URI.encode(label.label)}",
+      execute_method_with_body(:patch, "/labels/#{URI.encode(label.label)}",
                                label.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/servers.rb

@@ -24,7 +24,8 @@ module P4WebApiClient
     end
 
     def update_server(server)
-      execute_method_with_body(:put, "/servers/#{URI.encode(server.server_id)}",
+      execute_method_with_body(:patch,
+                               "/servers/#{URI.encode(server.server_id)}",
                                server.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/streams.rb

@@ -24,7 +24,7 @@ module P4WebApiClient
     end
 
     def update_stream(stream)
-      execute_method_with_body(:put, "/streams/#{URI.encode(stream.stream)}",
+      execute_method_with_body(:patch, "/streams/#{URI.encode(stream.stream)}",
                                stream.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/client/users.rb

@@ -24,7 +24,7 @@ module P4WebApiClient
     end
 
     def update_user(user)
-      execute_method_with_body(:put, "/users/#{URI.encode(user.user)}",
+      execute_method_with_body(:patch, "/users/#{URI.encode(user.user)}",
                                user.to_internal_hash)
       true
     end

data/lib/p4_web_api_client/connection.rb

@@ -6,14 +6,14 @@ module P4WebApiClient
   # Adds common configuration to the Faraday connection, like, the host name,
   # version, and context prefixes.
   class Connection
-    attr_accessor :login, :prefix, :session_token
+    attr_accessor :user, :prefix, :session_token
 
     # See the options for Faraday.new, plus, the following fields:
-    # - :login
+    # - :user
     # - :password
     # - :prefix - defaults to '/v1'
-    def initialize(options = {})
-      local_opts = [:login, :password, :prefix]
+    def initialize(options)
+      local_opts = [:user, :password, :prefix]
       conn_options = options.select { |k| !local_opts.include?(k) }
 
       @conn = Faraday.new(conn_options) do |conn|
@@ -23,14 +23,14 @@ module P4WebApiClient
       end
 
       @session_token = nil
-      @login = options[:login]
+      @user = options[:user]
       @prefix = options.key?(:prefix) ? options[:prefix] : '/v1'
 
       # When we're not initialized with a password, we may be on a insecure
       # server, so don't even log in.
       if options[:password] && !Connection.p4_ticket?(options[:password])
         response = @conn.post(path_for('/sessions'),
-                              login: @login,
+                              user: @user,
                               password: options[:password])
         assert_ok(response)
 
@@ -40,7 +40,7 @@ module P4WebApiClient
         # we don't generate the session token
         @session_token = options[:password] || ''
       end
-      @conn.basic_auth(login, session_token)
+      @conn.basic_auth(user, session_token)
     end
 
     def self.p4_ticket?(str)

data/lib/p4_web_api_client/models/change.rb

@@ -1,5 +1,6 @@
 # Copyright (c) 2014 Perforce Software, Inc.  All rights reserved.
 
+require 'base64'
 require 'time'
 
 module P4WebApiClient
@@ -42,7 +43,8 @@ module P4WebApiClient
       # An array of job IDs fixed by this changelist
       attr_accessor :jobs
 
-      # An array of file paths being submitted in this changelist
+      # An array of Change::File models for this changelist, which describe
+      # the kinds of edits to the changelist.
       attr_accessor :files
 
       def initialize(obj = {})
@@ -65,6 +67,77 @@ module P4WebApiClient
           accessor = "#{key}="
           send(accessor, obj[key]) if self.respond_to?(accessor)
         end
+
+        @files = @files.map do |file|
+          file = Change::File.new(file) unless file.is_a?(Change::File)
+          file
+        end if @files && !@files.empty?
+      end
+
+      def to_internal_hash
+        {
+          'Description' => description,
+          'Files' => files.map(&:to_internal_hash)
+        }
+      end
+
+      # Metadata related to files changed in a particular changelist.
+      class File
+        # The depot path to the file
+        attr_accessor :depot_file
+
+        # The action, one of :add, :edit, :branch, :move, :move_delete,
+        # :move_add, :upload
+        attr_accessor :action
+
+        # The Perforce file type, e.g., :text
+        attr_accessor :type
+
+        # The file revision number created by this changelist
+        attr_accessor :revision
+
+        # If saved, the size of the file in bytes
+        attr_accessor :file_size
+
+        # The digest of changes for this file, available if it's been serialized
+        attr_accessor :digest
+
+        # For actions like :branch, or :move, this should be specified by the
+        # the client code to indicate the source of the action. This will *not*
+        # be set by the server.
+        attr_accessor :from_depot_file
+
+        # Content of the file, probably only set when uploading multiple files
+        # via the client.create_change() method
+        attr_accessor :content
+
+        def initialize(obj = {})
+          @depot_file = obj['DepotFile'] if obj.key?('DepotFile')
+          @action = obj['Action'].gsub(/\//, '_').to_sym if obj.key?('Action')
+          @type = obj['Type'].to_sym if obj.key?('Type')
+          @revision = obj['Revision'].to_i if obj.key?('Revision')
+          @file_size = obj['FileSize'].to_i if obj.key?('FileSize')
+          @digest = obj['Digest'] if obj.key?('Digest')
+          @from_depot_file = obj['FromDepotFile'] if obj.key('FromDepotFile')
+          @content = obj['Content'] if obj.key?('Content')
+
+          # If the user has defined symbols in the Ruby-ish API, then use that
+          # too, but we expect the data to be in the right format.
+          obj.each_key do |key|
+            accessor = "#{key}="
+            send(accessor, obj[key]) if self.respond_to?(accessor)
+          end
+        end
+
+        def to_internal_hash
+          obj = {
+            'DepotFile' => depot_file,
+            'Action' => action.to_s.gsub(/_/, '/')
+          }
+          obj['FromDepotFile'] = from_depot_file if from_depot_file
+          obj['Content'] = Base64.encode64(content) if content
+          obj
+        end
       end
     end
   end

data/lib/p4_web_api_client/models/file.rb

@@ -37,6 +37,10 @@ module P4WebApiClient
       # DateTime of when the file revision was created
       attr_accessor :date
 
+      # The content of the file, only created by requests to the client.file
+      # method.
+      attr_accessor :content
+
       def initialize(obj = {})
         @depot_file = obj['DepotFile'] if obj.key?('DepotFile')
         @revision = obj['Revision'].to_i if obj.key?('Revision')
@@ -45,6 +49,8 @@ module P4WebApiClient
         @type = obj['Type'].to_sym if obj.key?('Type')
         @date = Time.at(obj['Date']).to_datetime if obj.key?('Date')
 
+        @content = Base64.decode64(obj['Content']) if obj.key?('Content')
+
         # If the user has defined symbols in the Ruby-ish API, then use that
         # too, but we expect the data to be in the right format.
         obj.each_key do |key|
@@ -65,6 +71,13 @@ module P4WebApiClient
       def name
         depot_file.split('/').last
       end
+
+      def to_internal_hash
+        {
+          'DepotFile' => depot_file,
+          'Content' => Base64.encode64(content)
+        }
+      end
     end
   end
 end

data/lib/p4_web_api_client/version.rb

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

data/spec/branches_spec.rb

@@ -5,7 +5,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_branch' do
-
   it 'should create a new branch - and return it via #branches' do
     client_as_jdoe do |c|
       new_branch = P4WebApiClient::Models::Branch.new
@@ -22,7 +21,6 @@ RSpec.describe P4WebApiClient::Client, '#create_branch' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#branch' do
-
   it 'should load a single branch created via #create_branch' do
     client_as_jdoe do |c|
       new_branch = c.branch('new_branch')
@@ -36,7 +34,6 @@ RSpec.describe P4WebApiClient::Client, '#branch' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_branch' do
-
   it "'should be able to update the branch description'" do
     client_as_jdoe do |c|
       new_branch = c.branch('new_branch')
@@ -51,7 +48,6 @@ RSpec.describe P4WebApiClient::Client, '#update_branch' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_branch' do
-
   it "'should be able to delete a branch created via #create_branch'" do
     client_as_jdoe do |c|
       c.delete_branch('new_branch')

data/spec/change_spec.rb

@@ -5,7 +5,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#changes' do
-
   it 'should list change 1' do
     client_as_jdoe do |c|
       changes = c.changes
@@ -14,3 +13,57 @@ RSpec.describe P4WebApiClient::Client, '#changes' do
     end
   end
 end
+
+RSpec.describe P4WebApiClient::Client, '#change' do
+  it 'should describe two files in change 1' do
+    client_as_jdoe do |c|
+      change = c.change('1')
+      expect(change.files.length).to eq(2)
+    end
+  end
+end
+
+RSpec.describe P4WebApiClient::Client, '#create_change' do
+  it 'should allow us to integrate //depot/dev/Experimental to '\
+     '//depot/main/Experimental' do
+    client_as_jdoe do |c|
+      c.create_change(
+        'files' => [
+          {
+            'depot_file' => '//depot/main/Experimental/...',
+            'from_depot_file' => '//depot/dev/Experimental/...',
+            'action' => 'branch'
+          }
+        ]
+      )
+      files = c.files('//depot/main/Experimental')
+      expect(files.length).to eq(1)
+      expect(files.first.name).to eq('README')
+    end
+  end
+
+  it 'should allow us to upload two files to //depot/dev/Experimental' do
+    client_as_jdoe do |c|
+      c.create_change(
+        'description' => 'Upload two experimental files',
+        'files' => [
+          {
+            'depot_file' => '//depot/dev/Experimental/teapot1.txt',
+            'action' => 'upload',
+            'content' => "I'm a little teapot"
+          },
+          {
+            'depot_file' => '//depot/dev/Experimental/teapot2.txt',
+            'action' => 'upload',
+            'content' => 'Short and stout!'
+          }
+        ]
+      )
+
+      files = c.files('//depot/dev/Experimental')
+      names = files.map(&:name)
+      expect(names).to include('teapot1.txt')
+      expect(names).to include('teapot2.txt')
+    end
+  end
+end

data/spec/clients_spec.rb

@@ -5,7 +5,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_client' do
-
   it 'should create a new client - and return it via #clients' do
     client_as_jdoe do |c|
       new_client = P4WebApiClient::Models::Client.new
@@ -23,7 +22,6 @@ RSpec.describe P4WebApiClient::Client, '#create_client' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#client' do
-
   it 'should load a single client created via #create_client' do
     client_as_jdoe do |c|
       new_client = c.client('new_client')
@@ -37,7 +35,6 @@ RSpec.describe P4WebApiClient::Client, '#client' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_client' do
-
   it "'should be able to update the client description'" do
     client_as_jdoe do |c|
       new_client = c.client('new_client')
@@ -52,7 +49,6 @@ RSpec.describe P4WebApiClient::Client, '#update_client' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_client' do
-
   it "'should be able to delete a client created via #create_client'" do
     client_as_jdoe do |c|
       c.delete_client('new_client')

data/spec/depots_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_depot' do
-
   it 'should create a new depot - and return it via #depots' do
     client_as_jdoe do |c|
       new_depot = P4WebApiClient::Models::Depot.new
@@ -24,7 +23,6 @@ RSpec.describe P4WebApiClient::Client, '#create_depot' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#depot' do
-
   it 'should load a single depot created via #create_depot' do
     client_as_jdoe do |c|
       new_depot = c.depot('new_depot')
@@ -35,7 +33,6 @@ RSpec.describe P4WebApiClient::Client, '#depot' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_depot' do
-
   it "'should be able to update the depot description'" do
     client_as_jdoe do |c|
       new_depot = c.depot('new_depot')
@@ -50,7 +47,6 @@ RSpec.describe P4WebApiClient::Client, '#update_depot' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_depot' do
-
   it "'should be able to delete a depot created via #create_depot'" do
     client_as_jdoe do |c|
       c.delete_depot('new_depot')

data/spec/{run_spec.rb → exec_spec.rb}

@@ -9,11 +9,10 @@ require 'p4_web_api_client'
 
 require 'test_connections'
 
-RSpec.describe P4WebApiClient::Client, '#run' do
-
+RSpec.describe P4WebApiClient::Client, '#exec' 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.exec('user', '-o')
       expect(results.length).to eq(1)
       expect(results[0]['User']).to eq('super')
     end

data/spec/{run_input_spec.rb → execi_spec.rb}

@@ -7,8 +7,7 @@ require 'p4_web_api_client'
 
 require 'test_connections'
 
-RSpec.describe P4WebApiClient::Client, '#run_input' do
-
+RSpec.describe P4WebApiClient::Client, '#execi' do
   it "should allow us to run 'user -f joeuser' to create a new user" do
     client_as_super do |c|
       input = {
@@ -16,7 +15,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.execi('user', input, '-i', '-f')
       expect(results.length).to eq(1)
     end
   end

data/spec/files_spec.rb

@@ -6,7 +6,6 @@ require 'tempfile'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#files' do
-
   it 'should list the depots with no arguments' do
     client_as_jdoe do |c|
       depots = c.files
@@ -28,66 +27,68 @@ RSpec.describe P4WebApiClient::Client, '#files' do
   it "should list 'README' at the depot/dev/Experimental path" do
     client_as_jdoe do |c|
       paths = c.files('depot/dev/Experimental')
-      expect(paths.length).to eq(1)
       names = paths.map(&:name)
       expect(names).to include('README')
     end
   end
 end
 
-RSpec.describe P4WebApiClient::Client, '#print' do
-
-  it 'should print the content of //depot/dev/Experimental/README' do
+RSpec.describe P4WebApiClient::Client, '#upload_file' do
+  it 'should allow me to upload a new README to depot/dev/Experimental' do
     client_as_jdoe do |c|
-      content = c.print('//depot/dev/Experimental/README')
-      expect(content.strip).to eq('This is an experimental project README.')
+      c.upload_file(
+        'depot_file' => '//depot/dev/Experimental/README',
+        'content' => 'This is the new damn readme!'
+      )
+
+      uploaded = c.file('//depot/dev/Experimental/README')
+      expect(uploaded.content).to eq('This is the new damn readme!')
     end
   end
 end
 
-RSpec.describe P4WebApiClient::Client, '#upload' do
-
-  it 'should be able to edit and add files' do
+RSpec.describe P4WebApiClient::Client, '#upload_files' do
+  it 'should allow me to upload the README and a new_file to '\
+     'depot/dev/Experimental' 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(
+      c.upload_files(
+        files:
           [
             {
-              depot_path: '//depot/dev/Experimental/README',
-              content: exists_up.path
+              'depot_file' => 'README',
+              'content' => 'Another readme version'
             },
             {
-              depot_path: '//depot/dev/Experimental/a.txt',
-              content: new_up.path,
-              content_type: 'text/plain'
+              'depot_file' => 'new_file',
+              'content' => 'New file content'
             }
-          ]
-        )
+          ],
+        path: '//depot/dev/Experimental'
+      )
 
-      ensure
-        exists_up.close
-        exists_up.unlink
+      files = c.files('//depot/dev/Experimental')
+      names = files.map(&:name)
+      expect(names).to include('README')
+      expect(names).to include('new_file')
 
-        new_up.close
-        new_up.unlink
-      end
+      readme_file = c.file('//depot/dev/Experimental/README')
+      expect(readme_file.content).to eq('Another readme version')
 
-      exists_content = c.print('//depot/dev/Experimental/README')
-      expect(exists_content.strip).to eq('existing file content')
+      new_file = c.file('//depot/dev/Experimental/new_file')
+      expect(new_file.content).to eq('New file content')
+    end
+  end
+end
+
+RSpec.describe P4WebApiClient::Client, '#delete_file' do
+  it 'should allow me to delete depot/dev/Experimental/new_file' do
+    client_as_jdoe do |c|
+      c.delete_file('//depot/dev/Experimental/new_file')
 
-      new_content = c.print('//depot/dev/Experimental/a.txt')
-      expect(new_content.strip).to eq('new file content')
+      files = c.files('//depot/dev/Experimental')
 
+      names = files.map(&:name)
+      expect(names).to_not include('new_file')
     end
   end
 end

data/spec/groups_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_group' do
-
   it 'should create a new group - and return it via #groups' do
     client_as_jdoe do |c|
       new_group = P4WebApiClient::Models::Group.new
@@ -24,7 +23,6 @@ RSpec.describe P4WebApiClient::Client, '#create_group' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#group' do
-
   it 'should load a single group created via #create_group' do
     client_as_jdoe do |c|
       jarjar = c.group('jarjar')
@@ -36,7 +34,6 @@ RSpec.describe P4WebApiClient::Client, '#group' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_group' do
-
   it "'should be able to add a group owner'" do
     client_as_jdoe do |c|
       jarjar = c.group('jarjar')
@@ -51,7 +48,6 @@ RSpec.describe P4WebApiClient::Client, '#update_group' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_group' do
-
   it "'should be able to delete a group created via #create_group'" do
     client_as_jdoe do |c|
       c.delete_group('jarjar')

data/spec/jobs_spec.rb

@@ -8,7 +8,6 @@ require 'test_connections'
 first_job_id = nil
 
 RSpec.describe P4WebApiClient::Client, '#create_job' do
-
   it 'should create a new job - and return it via #jobs' do
     client_as_jdoe do |c|
       new_job = {
@@ -27,7 +26,6 @@ RSpec.describe P4WebApiClient::Client, '#create_job' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#job' do
-
   it 'should load a single job created via #create_job' do
     client_as_jdoe do |c|
       loaded = c.job(first_job_id)
@@ -38,7 +36,6 @@ RSpec.describe P4WebApiClient::Client, '#job' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_job' do
-
   it "'should be able to change status'" do
     client_as_jdoe do |c|
       job = c.job(first_job_id)
@@ -54,7 +51,6 @@ RSpec.describe P4WebApiClient::Client, '#update_job' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_job' do
-
   it "'should be able to delete a job created via #create_job'" do
     client_as_jdoe do |c|
       c.delete_job(first_job_id)

data/spec/labels_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_label' do
-
   it 'should create a new label - and return it via #labels' do
     client_as_jdoe do |c|
       new_label = P4WebApiClient::Models::Label.new
@@ -23,7 +22,6 @@ RSpec.describe P4WebApiClient::Client, '#create_label' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#label' do
-
   it 'should load a single label created via #create_label' do
     client_as_jdoe do |c|
       new_label = c.label('new_label')
@@ -35,7 +33,6 @@ RSpec.describe P4WebApiClient::Client, '#label' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_label' do
-
   it "'should be able to update the label description'" do
     client_as_jdoe do |c|
       new_label = c.label('new_label')
@@ -50,7 +47,6 @@ RSpec.describe P4WebApiClient::Client, '#update_label' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_label' do
-
   it "'should be able to delete a label created via #create_label'" do
     client_as_jdoe do |c|
       c.delete_label('new_label')

data/spec/lib/test_connections.rb

@@ -4,7 +4,7 @@ require 'p4_web_api_client'
 def client_as_jdoe
   conn = P4WebApiClient::Connection.new(
       url: 'http://localhost:4567/',
-      login: 'jdoe',
+      user: 'jdoe',
       password: 'johndoe1A!',
       prefix: '/v1'
   )
@@ -17,7 +17,7 @@ end
 def client_as_super
   conn = P4WebApiClient::Connection.new(
       url: 'http://localhost:4567/',
-      login: 'super',
+      user: 'super',
       password: 'superuser1A!',
       prefix: '/v1'
   )

data/spec/protections_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#protections' do
-
   it 'should return an array with at least two protections' do
     client_as_super do |c|
       p = c.protections
@@ -16,7 +15,6 @@ RSpec.describe P4WebApiClient::Client, '#protections' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_protections' do
-
   it 'should add a protections entry for the user jdoe' do
     client_as_super do |c|
       p = c.protections

data/spec/servers_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_server' do
-
   it 'should create a new server - and return it via #servers' do
     client_as_jdoe do |c|
       new_server = P4WebApiClient::Models::Server.new
@@ -24,7 +23,6 @@ RSpec.describe P4WebApiClient::Client, '#create_server' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#server' do
-
   it 'should load a single server created via #create_server' do
     client_as_jdoe do |c|
       new_server = c.server('new_server')
@@ -37,7 +35,6 @@ RSpec.describe P4WebApiClient::Client, '#server' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_server' do
-
   it "'should be able to update the server description'" do
     client_as_jdoe do |c|
       new_server = c.server('new_server')
@@ -52,7 +49,6 @@ RSpec.describe P4WebApiClient::Client, '#update_server' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_server' do
-
   it "'should be able to delete a server created via #create_server'" do
     client_as_jdoe do |c|
       c.delete_server('new_server')

data/spec/streams_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#create_stream' do
-
   it 'should create a new stream - and return it via #streams' do
     client_as_jdoe do |c|
       new_depot = P4WebApiClient::Models::Depot.new
@@ -34,7 +33,6 @@ RSpec.describe P4WebApiClient::Client, '#create_stream' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#stream' do
-
   it 'should load a single stream created via #create_stream' do
     client_as_jdoe do |c|
       new_stream = c.stream('//stuffs/new_stream')
@@ -47,7 +45,6 @@ RSpec.describe P4WebApiClient::Client, '#stream' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_stream' do
-
   it "'should be able to update the stream description'" do
     client_as_jdoe do |c|
       new_stream = c.stream('//stuffs/new_stream')
@@ -62,7 +59,6 @@ RSpec.describe P4WebApiClient::Client, '#update_stream' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#delete_stream' do
-
   it "'should be able to delete a stream created via #create_stream'" do
     client_as_jdoe do |c|
       c.delete_stream('//stuffs/new_stream')

data/spec/triggers_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#triggers' do
-
   it 'should allow us to update and fetch a new example trigger line' do
     client_as_super do |c|
       t = c.triggers
@@ -19,4 +18,14 @@ RSpec.describe P4WebApiClient::Client, '#triggers' do
     end
   end
 
+  it 'should allow us to clear out the triggers table' do
+    client_as_super do |c|
+      triggers = c.triggers
+      triggers.triggers = []
+      c.update_triggers(triggers)
+
+      updated = c.triggers
+      expect(updated.triggers.length).to eq(0)
+    end
+  end
 end

data/spec/users_spec.rb

@@ -6,7 +6,6 @@ require 'p4_web_api_client'
 require 'test_connections'
 
 RSpec.describe P4WebApiClient::Client, '#users' do
-
   it "should at least return the 'jdoe' and 'super' users" do
     client_as_jdoe do |c|
       users = c.users
@@ -19,7 +18,6 @@ RSpec.describe P4WebApiClient::Client, '#users' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#user' do
-
   it "should return the user 'mmustermann' who has the name 'Max Mustermann'" do
     client_as_jdoe do |c|
       max = c.user('mmustermann')
@@ -29,7 +27,6 @@ RSpec.describe P4WebApiClient::Client, '#user' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#create_user' do
-
   it 'should be able to create a new user and load it' do
     client_as_jdoe do |c|
       new_user = P4WebApiClient::Models::User.new
@@ -49,7 +46,6 @@ RSpec.describe P4WebApiClient::Client, '#create_user' do
 end
 
 RSpec.describe P4WebApiClient::Client, '#update_user' do
-
   it "should be able update mmusterman's email to max_power@example.com" do
     client_as_jdoe do |c|
       max_user = c.user('mmustermann')
@@ -66,7 +62,6 @@ end
 
 # I *think* this will run after the create_user spec if defined here.
 RSpec.describe P4WebApiClient::Client, '#delete_user' do
-
   it 'should be able to delete the newuser user' do
     client_as_jdoe do |c|
       c.delete_user('newuser')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4_web_api_client
 version: !ruby/object:Gem::Version
-  version: 2014.2.0.pre2
+  version: 2014.2.0.pre4
 platform: ruby
 authors:
 - Tristan Juricek
 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
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2014.2.0.pre2
+        version: 2014.2.0.pre4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2014.2.0.pre2
+        version: 2014.2.0.pre4
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -191,13 +191,13 @@ files:
 - lib/p4_web_api_client/client/branches.rb
 - lib/p4_web_api_client/client/changes.rb
 - lib/p4_web_api_client/client/clients.rb
+- lib/p4_web_api_client/client/commands.rb
 - lib/p4_web_api_client/client/depots.rb
 - lib/p4_web_api_client/client/files.rb
 - lib/p4_web_api_client/client/groups.rb
 - lib/p4_web_api_client/client/jobs.rb
 - lib/p4_web_api_client/client/labels.rb
 - lib/p4_web_api_client/client/protections.rb
-- lib/p4_web_api_client/client/run.rb
 - lib/p4_web_api_client/client/servers.rb
 - lib/p4_web_api_client/client/streams.rb
 - lib/p4_web_api_client/client/triggers.rb
@@ -221,13 +221,14 @@ 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
 - spec/change_spec.rb
 - spec/clients_spec.rb
 - spec/depots_spec.rb
+- spec/exec_spec.rb
+- spec/execi_spec.rb
 - spec/files_spec.rb
 - spec/groups_spec.rb
 - spec/init.base/init_p4d.rb
@@ -235,8 +236,6 @@ files:
 - spec/labels_spec.rb
 - spec/lib/test_connections.rb
 - spec/protections_spec.rb
-- spec/run_input_spec.rb
-- spec/run_spec.rb
 - spec/servers_spec.rb
 - spec/streams_spec.rb
 - spec/triggers_spec.rb
@@ -270,6 +269,8 @@ test_files:
 - spec/change_spec.rb
 - spec/clients_spec.rb
 - spec/depots_spec.rb
+- spec/exec_spec.rb
+- spec/execi_spec.rb
 - spec/files_spec.rb
 - spec/groups_spec.rb
 - spec/init.base/init_p4d.rb
@@ -277,8 +278,6 @@ test_files:
 - spec/labels_spec.rb
 - spec/lib/test_connections.rb
 - spec/protections_spec.rb
-- spec/run_input_spec.rb
-- spec/run_spec.rb
 - spec/servers_spec.rb
 - spec/streams_spec.rb
 - spec/triggers_spec.rb

data/lib/p4_web_api_client/models/upload_file.rb

@@ -1,42 +0,0 @@
-# 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