fluent_command_builder 0.1.9 → 0.1.10

data/lib/fluent_command_builder/command_builders/tf_2010.rb

@@ -8,127 +8,204 @@ module FluentCommandBuilder
           @builder = builder
           @builder.append 'tf'
         end
-        def add 
-          Add.new @builder
+        def add item_spec
+          Add.new @builder, item_spec
         end
-        def branch 
-          Branch.new @builder
+        def branch old_item, new_item
+          Branch.new @builder, old_item, new_item
         end
-        def branches 
-          Branches.new @builder
+        def branches item_spec
+          Branches.new @builder, item_spec
         end
-        def changeset 
-          Changeset.new @builder
+        def changeset changeset_number=nil
+          Changeset.new @builder, changeset_number
         end
-        def checkin 
-          Checkin.new @builder
+        def checkin item_spec=nil
+          Checkin.new @builder, item_spec
+        end
+        def checkin_shelveset shelveset_name, shelveset_owner=nil
+          CheckinShelveset.new @builder, shelveset_name, shelveset_owner
+        end
+        def checkout item_spec=nil
+          Checkout.new @builder, item_spec
+        end
+        def configure path_of_team_project=nil
+          Configure.new @builder, path_of_team_project
+        end
+        def delete item_spec
+          Delete.new @builder, item_spec
+        end
+        def destroy item_spec
+          Destroy.new @builder, item_spec
+        end
+        def compare_with_current_workspace_version item_spec
+          CompareWithCurrentWorkspaceVersion.new @builder, item_spec
+        end
+        def compare item_spec, item_spec2
+          Compare.new @builder, item_spec, item_spec2
         end
-        def checkout 
-          Checkout.new @builder
+        def compare_with_shelveset_version shelveset_item_spec
+          CompareWithShelvesetVersion.new @builder, shelveset_item_spec
         end
-        def configure 
-          Configure.new @builder
+        def configure_compare_tool 
+          @builder.append ' difference /configure'
+          self
+        end
+        def dir item_spec
+          Dir.new @builder, item_spec
         end
-        def delete 
-          Delete.new @builder
+        def folder_diff target_path, source_path=nil
+          FolderDiff.new @builder, target_path, source_path
         end
-        def destroy 
-          @builder.append ' destroy'
+        def get item_spec=nil
+          Get.new @builder, item_spec
+        end
+        def help command_name=nil
+          @builder.append ' help'
+          @builder.append " #{@builder.format command_name}" unless command_name.nil?
           self
         end
-        def diff 
-          Diff.new @builder
+        def history item_spec
+          History.new @builder, item_spec
+        end
+        def label label_name, item_spec, scope=nil
+          Label.new @builder, label_name, item_spec, scope
         end
-        def dir 
-          Dir.new @builder
+        def delete_label label_name, item_spec, scope=nil
+          DeleteLabel.new @builder, label_name, item_spec, scope
         end
-        def folder_diff 
-          FolderDiff.new @builder
+        def labels label_name=nil
+          Labels.new @builder, label_name
         end
-        def get 
-          Get.new @builder
+        def local_versions item_spec
+          LocalVersions.new @builder, item_spec
         end
-        def history 
-          History.new @builder
+        def lock item_spec
+          Lock.new @builder, item_spec
         end
-        def label 
-          Label.new @builder
+        def merge source, destination
+          Merge.new @builder, source, destination
         end
-        def labels 
-          Labels.new @builder
+        def merges destination, source=nil
+          Merges.new @builder, destination, source
         end
-        def local_versions 
-          LocalVersions.new @builder
+        def msdn command_name=nil
+          @builder.append ' msdn'
+          @builder.append " #{@builder.format command_name}" unless command_name.nil?
+          self
+        end
+        def permission item_spec
+          Permission.new @builder, item_spec
         end
-        def lock 
-          Lock.new @builder
+        def properties item_spec
+          Properties.new @builder, item_spec
         end
-        def merge 
-          Merge.new @builder
+        def configure_proxy url
+          ConfigureProxy.new @builder, url
         end
-        def merges 
-          Merges.new @builder
+        def add_proxy_record url
+          AddProxyRecord.new @builder, url
         end
-        def permissions 
-          Permissions.new @builder
+        def delete_proxy_record url
+          DeleteProxyRecord.new @builder, url
         end
-        def properties 
-          Properties.new @builder
+        def list_proxy_records url
+          ListProxyRecords.new @builder, url
         end
-        def rename 
-          Rename.new @builder
+        def enable_proxy 
+          @builder.append ' proxy /enabled:true'
+          self
         end
-        def resolve 
-          Resolve.new @builder
+        def disable_proxy 
+          @builder.append ' proxy /enabled:false'
+          self
         end
-        def rollback 
-          Rollback.new @builder
+        def rename old_item, new_item
+          Rename.new @builder, old_item, new_item
         end
-        def shelve 
-          Shelve.new @builder
+        def resolve item_spec=nil
+          Resolve.new @builder, item_spec
         end
-        def shelvesets 
-          Shelvesets.new @builder
+        def rollback_to_version version_spec, item_spec
+          RollbackToVersion.new @builder, version_spec, item_spec
         end
-        def status 
-          Status.new @builder
+        def rollback_changeset changeset_from, changeset_to=nil, item_spec=nil
+          RollbackChangeset.new @builder, changeset_from, changeset_to, item_spec
         end
-        def undelete 
-          Undelete.new @builder
+        def replace_shelveset shelveset_name
+          ReplaceShelveset.new @builder, shelveset_name
         end
-        def undo 
-          Undo.new @builder
+        def shelve shelveset_name, item_spec
+          Shelve.new @builder, shelveset_name, item_spec
         end
-        def unlabel 
-          Unlabel.new @builder
+        def delete_shelveset shelveset_name, shelveset_owner=nil
+          DeleteShelveset.new @builder, shelveset_name, shelveset_owner
         end
-        def unshelve 
-          Unshelve.new @builder
+        def shelvesets shelveset_name=nil
+          Shelvesets.new @builder, shelveset_name
         end
-        def view 
-          View.new @builder
+        def status item_spec
+          Status.new @builder, item_spec
         end
-        def workfold 
-          Workfold.new @builder
+        def undelete item_spec, deletion_id=nil
+          Undelete.new @builder, item_spec, deletion_id
         end
-        def workspace 
-          Workspace.new @builder
+        def undo item_spec
+          Undo.new @builder, item_spec
         end
-        def workspaces 
-          Workspaces.new @builder
+        def unlabel label_name, item_spec
+          Unlabel.new @builder, label_name, item_spec
+        end
+        def unshelve shelveset_name=nil, username=nil, item_spec=nil
+          Unshelve.new @builder, shelveset_name, username, item_spec
+        end
+        def view item_spec
+          View.new @builder, item_spec
+        end
+        def show_local_folder_mapping local_folder
+          ShowLocalFolderMapping.new @builder, local_folder
+        end
+        def show_workspace_mappings workspace_name
+          ShowWorkspaceMappings.new @builder, workspace_name
+        end
+        def show_server_folder_mappings server_folder
+          ShowServerFolderMappings.new @builder, server_folder
+        end
+        def map_folder server_folder, local_folder
+          MapFolder.new @builder, server_folder, local_folder
+        end
+        def unmap_folder 
+          UnmapFolder.new @builder
+        end
+        def cloak_folder server_folder
+          CloakFolder.new @builder, server_folder
+        end
+        def decloak_folder server_folder
+          DecloakFolder.new @builder, server_folder
+        end
+        def create_workspace workspace_name, workspace_owner=nil
+          CreateWorkspace.new @builder, workspace_name, workspace_owner
+        end
+        def delete_workspace workspace_name, workspace_owner=nil
+          DeleteWorkspace.new @builder, workspace_name, workspace_owner
+        end
+        def modify_workspace workspace_name=nil, workspace_owner=nil
+          ModifyWorkspace.new @builder, workspace_name, workspace_owner
+        end
+        def workspaces workspace_name=nil
+          Workspaces.new @builder, workspace_name
+        end
+        def remove_workspace workspace_name
+          RemoveWorkspace.new @builder, workspace_name
         end
         def to_s 
           @builder.to_s
         end
       end
       class Add
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' add'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " add #{@builder.format item_spec, ' '}"
         end
         def lock lock_type
           @builder.append " /lock:#{@builder.format lock_type}"
@@ -146,8 +223,9 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -155,17 +233,9 @@ module FluentCommandBuilder
         end
       end
       class Branch
-        def initialize builder
+        def initialize builder, old_item, new_item
           @builder = builder
-          @builder.append ' branch'
-        end
-        def old_item old_item
-          @builder.append " #{@builder.format old_item}"
-          self
-        end
-        def new_item new_item
-          @builder.append " #{@builder.format new_item}"
-          self
+          @builder.append " branch #{@builder.format old_item} #{@builder.format new_item}"
         end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
@@ -199,8 +269,9 @@ module FluentCommandBuilder
           @builder.append " /author:#{@builder.format author_name}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -208,13 +279,9 @@ module FluentCommandBuilder
         end
       end
       class Branches
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' branches'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " branches #{@builder.format item_spec}"
         end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
@@ -224,8 +291,9 @@ module FluentCommandBuilder
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -233,16 +301,17 @@ module FluentCommandBuilder
         end
       end
       class Changeset
-        def initialize builder
+        def initialize builder, changeset_number=nil
           @builder = builder
           @builder.append ' changeset'
+          @builder.append " #{@builder.format changeset_number}" unless changeset_number.nil?
         end
         def comment comment
           @builder.append " /comment:#{@builder.format comment}"
           self
         end
         def notes notes
-          @builder.append " /notes:#{@builder.format notes}"
+          @builder.append " /notes:#{@builder.format notes, ';', '='}"
           self
         end
         def no_prompt 
@@ -253,16 +322,13 @@ module FluentCommandBuilder
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def changeset_number changeset_number
-          @builder.append " #{@builder.format changeset_number}"
-          self
-        end
         def latest 
           @builder.append ' /latest'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -270,9 +336,10 @@ module FluentCommandBuilder
         end
       end
       class Checkin
-        def initialize builder
+        def initialize builder, item_spec=nil
           @builder = builder
           @builder.append ' checkin'
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
         end
         def author author_name
           @builder.append " /author:#{@builder.format author_name}"
@@ -287,7 +354,7 @@ module FluentCommandBuilder
           self
         end
         def notes notes
-          @builder.append " /notes:#{@builder.format notes}"
+          @builder.append " /notes:#{@builder.format notes, ';', '='}"
           self
         end
         def override reason
@@ -306,26 +373,54 @@ module FluentCommandBuilder
           @builder.append ' /validate'
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def bypass 
+          @builder.append ' /bypass'
           self
         end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def force 
+          @builder.append ' /force'
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class CheckinShelveset
+        def initialize builder, shelveset_name, shelveset_owner=nil
+          @builder = builder
+          @builder.append " checkin /shelveset:#{@builder.format shelveset_name}"
+          @builder.append ";#{@builder.format shelveset_owner}" unless shelveset_owner.nil?
+        end
         def bypass 
           @builder.append ' /bypass'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def no_prompt 
+          @builder.append ' /noPrompt'
           self
         end
-        def shelveset shelveset_name
-          @builder.append " /shelveset:#{@builder.format shelveset_name}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
+        def author author_name
+          @builder.append " /author:#{@builder.format author_name}"
+          self
+        end
         def force 
           @builder.append ' /force'
           self
@@ -335,9 +430,10 @@ module FluentCommandBuilder
         end
       end
       class Checkout
-        def initialize builder
+        def initialize builder, item_spec=nil
           @builder = builder
           @builder.append ' checkout'
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
         end
         def lock lock_type
           @builder.append " /lock:#{@builder.format lock_type}"
@@ -351,12 +447,9 @@ module FluentCommandBuilder
           @builder.append " /type:#{@builder.format encoding}"
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -364,20 +457,18 @@ module FluentCommandBuilder
         end
       end
       class Configure
-        def initialize builder
+        def initialize builder, path_of_team_project=nil
           @builder = builder
           @builder.append ' configure'
-        end
-        def path_of_team_project path_of_team_project
-          @builder.append " #{@builder.format path_of_team_project}"
-          self
+          @builder.append " #{@builder.format path_of_team_project}" unless path_of_team_project.nil?
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -385,9 +476,9 @@ module FluentCommandBuilder
         end
       end
       class Delete
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' delete'
+          @builder.append " delete #{@builder.format item_spec, ' '}"
         end
         def lock lock_type
           @builder.append " /lock:#{@builder.format lock_type}"
@@ -397,31 +488,62 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Diff
-        def initialize builder
+      class Destroy
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' diff'
+          @builder.append " destroy #{@builder.format item_spec, ' '}"
+        end
+        def keep_history 
+          @builder.append ' /keepHistory'
+          self
+        end
+        def stop_at version_spec
+          @builder.append " /stopAt:#{@builder.format version_spec}"
+          self
+        end
+        def preview 
+          @builder.append ' /preview'
+          self
+        end
+        def start_cleanup 
+          @builder.append ' /startCleanup'
+          self
+        end
+        def no_prompt 
+          @builder.append ' /noPrompt'
+          self
+        end
+        def silent 
+          @builder.append ' /silent'
+          self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def item_spec2 item_spec2
-          @builder.append " #{@builder.format item_spec2}"
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class CompareWithCurrentWorkspaceVersion
+        def initialize builder, item_spec
+          @builder = builder
+          @builder.append " difference #{@builder.format item_spec}"
+        end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
           self
@@ -458,35 +580,117 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def shelveset shelveset_name
-          @builder.append " /shelveset:#{@builder.format shelveset_name}"
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class Compare
+        def initialize builder, item_spec, item_spec2
+          @builder = builder
+          @builder.append " difference #{@builder.format item_spec} #{@builder.format item_spec2}"
+        end
+        def type file_type
+          @builder.append " /type:#{@builder.format file_type}"
           self
         end
-        def shelveset_itemspec shelveset_itemspec
-          @builder.append " #{@builder.format shelveset_itemspec}"
+        def format format
+          @builder.append " /format:#{@builder.format format}"
           self
         end
-        def configure 
-          @builder.append ' /configure'
+        def ignore_space 
+          @builder.append ' /ignoreSpace'
+          self
+        end
+        def ignore_eol 
+          @builder.append ' /ignoreEol'
+          self
+        end
+        def ignore_case 
+          @builder.append ' /ignoreCase'
+          self
+        end
+        def recursive 
+          @builder.append ' /recursive'
+          self
+        end
+        def options 
+          @builder.append ' /options'
+          self
+        end
+        def no_prompt 
+          @builder.append ' /noPrompt'
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Dir
-        def initialize builder
+      class CompareWithShelvesetVersion
+        def initialize builder, shelveset_item_spec
           @builder = builder
-          @builder.append ' dir'
+          @builder.append " difference #{@builder.format shelveset_item_spec}"
+        end
+        def shelveset shelveset_name, shelveset_owner=nil
+          @builder.append " /shelveset:#{@builder.format shelveset_name}"
+          @builder.append ";#{@builder.format shelveset_owner}" unless shelveset_owner.nil?
+          self
+        end
+        def type file_type
+          @builder.append " /type:#{@builder.format file_type}"
+          self
+        end
+        def format format
+          @builder.append " /format:#{@builder.format format}"
+          self
+        end
+        def ignore_space 
+          @builder.append ' /ignoreSpace'
+          self
+        end
+        def ignore_eol 
+          @builder.append ' /ignoreEol'
+          self
+        end
+        def ignore_case 
+          @builder.append ' /ignoreCase'
+          self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def recursive 
+          @builder.append ' /recursive'
           self
         end
+        def options 
+          @builder.append ' /options'
+          self
+        end
+        def no_prompt 
+          @builder.append ' /noPrompt'
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class Dir
+        def initialize builder, item_spec
+          @builder = builder
+          @builder.append " dir #{@builder.format item_spec, ' '}"
+        end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
           self
@@ -503,8 +707,9 @@ module FluentCommandBuilder
           @builder.append ' /deleted'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
@@ -516,17 +721,11 @@ module FluentCommandBuilder
         end
       end
       class FolderDiff
-        def initialize builder
+        def initialize builder, target_path, source_path=nil
           @builder = builder
           @builder.append ' folderDiff'
-        end
-        def source_path source_path
-          @builder.append " #{@builder.format source_path}"
-          self
-        end
-        def target_path target_path
+          @builder.append " #{@builder.format source_path}" unless source_path.nil?
           @builder.append " #{@builder.format target_path}"
-          self
         end
         def recursive 
           @builder.append ' /recursive'
@@ -541,19 +740,20 @@ module FluentCommandBuilder
           self
         end
         def filter filter
-          @builder.append " /filter:#{@builder.format filter}"
+          @builder.append " /filter:#{@builder.format filter, ';'}"
           self
         end
         def filter_local_paths_only 
           @builder.append ' /filterLocalPathsOnly'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def view view
-          @builder.append " /view:#{@builder.format view}"
+          @builder.append " /view:#{@builder.format view, ','}"
           self
         end
         def to_s 
@@ -561,13 +761,10 @@ module FluentCommandBuilder
         end
       end
       class Get
-        def initialize builder
+        def initialize builder, item_spec=nil
           @builder = builder
           @builder.append ' get'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
         end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
@@ -601,8 +798,9 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -610,13 +808,9 @@ module FluentCommandBuilder
         end
       end
       class History
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' history'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " history #{@builder.format item_spec}"
         end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
@@ -650,8 +844,9 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def sort sort
@@ -667,22 +862,16 @@ module FluentCommandBuilder
         end
       end
       class Label
-        def initialize builder
+        def initialize builder, label_name, item_spec, scope=nil
           @builder = builder
-          @builder.append ' label'
-        end
-        def label_name label_name
-          @builder.append " #{@builder.format label_name}"
-          self
+          @builder.append " label #{@builder.format label_name}"
+          @builder.append "@#{@builder.format scope}" unless scope.nil?
+          @builder.append " #{@builder.format item_spec, ' '}"
         end
         def owner owner_name
           @builder.append " /owner:#{@builder.format owner_name}"
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
           self
@@ -699,16 +888,33 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def delete 
-          @builder.append ' /delete'
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class DeleteLabel
+        def initialize builder, label_name, item_spec, scope=nil
+          @builder = builder
+          @builder.append " label /delete #{@builder.format label_name}"
+          @builder.append "@#{@builder.format scope}" unless scope.nil?
+          @builder.append " #{@builder.format item_spec, ' '}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
         def to_s 
@@ -716,9 +922,10 @@ module FluentCommandBuilder
         end
       end
       class Labels
-        def initialize builder
+        def initialize builder, label_name=nil
           @builder = builder
           @builder.append ' labels'
+          @builder.append " #{@builder.format label_name}" unless label_name.nil?
         end
         def owner owner_name
           @builder.append " /owner:#{@builder.format owner_name}"
@@ -732,12 +939,9 @@ module FluentCommandBuilder
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def label_name label_name
-          @builder.append " #{@builder.format label_name}"
-          self
-        end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -745,13 +949,9 @@ module FluentCommandBuilder
         end
       end
       class LocalVersions
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' localVersions'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " localVersions #{@builder.format item_spec, ' '}"
         end
         def recursive 
           @builder.append ' /recursive'
@@ -761,8 +961,9 @@ module FluentCommandBuilder
           @builder.append " /format:#{@builder.format format}"
           self
         end
-        def workspace workspace_name
+        def workspace workspace_name, workspace_owner=nil
           @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def collection team_project_collection_url
@@ -774,28 +975,26 @@ module FluentCommandBuilder
         end
       end
       class Lock
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' lock'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " lock #{@builder.format item_spec, ' '}"
         end
         def lock lock_type
           @builder.append " /lock:#{@builder.format lock_type}"
           self
         end
-        def workspace workspace_name
+        def workspace workspace_name, workspace_owner=nil
           @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def recursive 
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
@@ -807,9 +1006,9 @@ module FluentCommandBuilder
         end
       end
       class Merge
-        def initialize builder
+        def initialize builder, source, destination
           @builder = builder
-          @builder.append ' merge'
+          @builder.append " merge #{@builder.format source} #{@builder.format destination}"
         end
         def recursive 
           @builder.append ' /recursive'
@@ -863,16 +1062,9 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def source source
-          @builder.append " #{@builder.format source}"
-          self
-        end
-        def destination destination
-          @builder.append " #{@builder.format destination}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -880,17 +1072,11 @@ module FluentCommandBuilder
         end
       end
       class Merges
-        def initialize builder
+        def initialize builder, destination, source=nil
           @builder = builder
           @builder.append ' merges'
-        end
-        def source source
-          @builder.append " #{@builder.format source}"
-          self
-        end
-        def destination destination
+          @builder.append " #{@builder.format source}" unless source.nil?
           @builder.append " #{@builder.format destination}"
-          self
         end
         def recursive 
           @builder.append ' /recursive'
@@ -904,8 +1090,9 @@ module FluentCommandBuilder
           @builder.append " /format:#{@builder.format format}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def show_all 
@@ -920,21 +1107,21 @@ module FluentCommandBuilder
           @builder.to_s
         end
       end
-      class Permissions
-        def initialize builder
+      class Permission
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' permissions'
+          @builder.append " permission #{@builder.format item_spec, ' '}"
         end
         def allow permission
-          @builder.append " /allow:#{@builder.format permission}"
+          @builder.append " /allow:#{@builder.format permission, ','}"
           self
         end
         def deny permission
-          @builder.append " /deny:#{@builder.format permission}"
+          @builder.append " /deny:#{@builder.format permission, ','}"
           self
         end
         def remove permission
-          @builder.append " /remove:#{@builder.format permission}"
+          @builder.append " /remove:#{@builder.format permission, ','}"
           self
         end
         def inherit inherit
@@ -942,11 +1129,11 @@ module FluentCommandBuilder
           self
         end
         def user user_name
-          @builder.append " /user:#{@builder.format user_name}"
+          @builder.append " /user:#{@builder.format user_name, ','}"
           self
         end
         def group group_name
-          @builder.append " /group:#{@builder.format group_name}"
+          @builder.append " /group:#{@builder.format group_name, ','}"
           self
         end
         def collection team_project_collection_url
@@ -957,16 +1144,13 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
         def global 
           @builder.append ' /global'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -974,9 +1158,9 @@ module FluentCommandBuilder
         end
       end
       class Properties
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' properties'
+          @builder.append " properties #{@builder.format item_spec, ' '}"
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
@@ -986,60 +1170,136 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
           self
         end
-        def workspace 
-          @builder.append ' /workspace'
+        def workspace workspace_name, workspace_owner=nil
+          @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Rename
-        def initialize builder
+      class ConfigureProxy
+        def initialize builder, url
           @builder = builder
-          @builder.append ' rename'
+          @builder.append " proxy /configure #{@builder.format url}"
         end
-        def lock lock_type
-          @builder.append " /lock:#{@builder.format lock_type}"
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class AddProxyRecord
+        def initialize builder, url
+          @builder = builder
+          @builder.append " proxy /add #{@builder.format url}"
+        end
+        def name name
+          @builder.append " /name:#{@builder.format name}"
+          self
+        end
+        def site site_name
+          @builder.append " /site:#{@builder.format site_name}"
           self
         end
-        def old_item old_item
-          @builder.append " #{@builder.format old_item}"
+        def description description
+          @builder.append " /description:#{@builder.format description}"
           self
         end
-        def new_item new_item
-          @builder.append " #{@builder.format new_item}"
+        def default scope
+          @builder.append " /default:#{@builder.format scope}"
+          self
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Resolve
-        def initialize builder
+      class DeleteProxyRecord
+        def initialize builder, url
           @builder = builder
-          @builder.append ' resolve'
+          @builder.append " proxy /delete #{@builder.format url}"
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class ListProxyRecords
+        def initialize builder, url
+          @builder = builder
+          @builder.append " proxy /list #{@builder.format url, ' '}"
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class Rename
+        def initialize builder, old_item, new_item
+          @builder = builder
+          @builder.append " rename #{@builder.format old_item} #{@builder.format new_item}"
+        end
+        def lock lock_type
+          @builder.append " /lock:#{@builder.format lock_type}"
+          self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class Resolve
+        def initialize builder, item_spec=nil
+          @builder = builder
+          @builder.append ' resolve'
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
+        end
         def auto resolution
           @builder.append " /auto:#{@builder.format resolution}"
           self
@@ -1068,27 +1328,57 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Rollback
-        def initialize builder
+      class RollbackToVersion
+        def initialize builder, version_spec, item_spec
           @builder = builder
-          @builder.append ' rollback'
+          @builder.append " rollback /toVersion:#{@builder.format version_spec} #{@builder.format item_spec, ' '}"
+        end
+        def recursive 
+          @builder.append ' /recursive'
+          self
+        end
+        def lock lock_type
+          @builder.append " /lock:#{@builder.format lock_type}"
+          self
+        end
+        def version version_spec
+          @builder.append " /version:#{@builder.format version_spec}"
+          self
+        end
+        def keep_merge_history 
+          @builder.append ' /keepMergeHistory'
+          self
         end
-        def to_version version_spec
-          @builder.append " /toVersion:#{@builder.format version_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def no_prompt 
+          @builder.append ' /noPrompt'
           self
         end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class RollbackChangeset
+        def initialize builder, changeset_from, changeset_to=nil, item_spec=nil
+          @builder = builder
+          @builder.append " rollback /changeset:#{@builder.format changeset_from}"
+          @builder.append "~#{@builder.format changeset_to}" unless changeset_to.nil?
+          @builder.append ''
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
+        end
         def recursive 
           @builder.append ' /recursive'
           self
@@ -1105,16 +1395,39 @@ module FluentCommandBuilder
           @builder.append ' /keepMergeHistory'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def no_prompt 
+          @builder.append ' /noPrompt'
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class ReplaceShelveset
+        def initialize builder, shelveset_name
+          @builder = builder
+          @builder.append " shelve /replace #{@builder.format shelveset_name}"
+        end
+        def comment comment
+          @builder.append " /comment:#{@builder.format comment}"
+          self
+        end
+        def validate 
+          @builder.append ' /validate'
           self
         end
         def no_prompt 
           @builder.append ' /noPrompt'
           self
         end
-        def changeset changeset
-          @builder.append " /changeset:#{@builder.format changeset}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -1122,9 +1435,13 @@ module FluentCommandBuilder
         end
       end
       class Shelve
-        def initialize builder
+        def initialize builder, shelveset_name, item_spec
           @builder = builder
-          @builder.append ' shelve'
+          @builder.append " shelve #{@builder.format shelveset_name} #{@builder.format item_spec, ' '}"
+        end
+        def move 
+          @builder.append ' /move'
+          self
         end
         def replace 
           @builder.append ' /replace'
@@ -1134,8 +1451,8 @@ module FluentCommandBuilder
           @builder.append " /comment:#{@builder.format comment}"
           self
         end
-        def shelveset_name shelveset_name
-          @builder.append " #{@builder.format shelveset_name}"
+        def recursive 
+          @builder.append ' /recursive'
           self
         end
         def validate 
@@ -1146,24 +1463,24 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def move 
-          @builder.append ' /move'
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def recursive 
-          @builder.append ' /recursive'
-          self
+        def to_s 
+          @builder.to_s
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+      end
+      class DeleteShelveset
+        def initialize builder, shelveset_name, shelveset_owner=nil
+          @builder = builder
+          @builder.append " shelve /delete #{@builder.format shelveset_name}"
+          @builder.append ";#{@builder.format shelveset_owner}" unless shelveset_owner.nil?
         end
-        def delete 
-          @builder.append ' /delete'
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
@@ -1175,9 +1492,10 @@ module FluentCommandBuilder
         end
       end
       class Shelvesets
-        def initialize builder
+        def initialize builder, shelveset_name=nil
           @builder = builder
           @builder.append ' shelvesets'
+          @builder.append " #{@builder.format shelveset_name}" unless shelveset_name.nil?
         end
         def owner owner_name
           @builder.append " /owner:#{@builder.format owner_name}"
@@ -1191,12 +1509,9 @@ module FluentCommandBuilder
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def shelveset_name shelveset_name
-          @builder.append " #{@builder.format shelveset_name}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -1204,28 +1519,27 @@ module FluentCommandBuilder
         end
       end
       class Status
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' status'
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
+          @builder.append " status #{@builder.format item_spec, ' '}"
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def workspace workspace_name
+        def workspace workspace_name, workspace_owner=nil
           @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
-        def shelveset shelveset_name
+        def shelveset shelveset_name, shelveset_owner=nil
           @builder.append " /shelveset:#{@builder.format shelveset_name}"
+          @builder.append ";#{@builder.format shelveset_owner}" unless shelveset_owner.nil?
           self
         end
         def format format
@@ -1245,9 +1559,10 @@ module FluentCommandBuilder
         end
       end
       class Undelete
-        def initialize builder
+        def initialize builder, item_spec, deletion_id=nil
           @builder = builder
-          @builder.append ' undelete'
+          @builder.append " undelete #{@builder.format item_spec}"
+          @builder.append ";#{@builder.format deletion_id}" unless deletion_id.nil?
         end
         def no_get 
           @builder.append ' /noGet'
@@ -1261,12 +1576,9 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -1274,28 +1586,26 @@ module FluentCommandBuilder
         end
       end
       class Undo
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' undo'
+          @builder.append " undo #{@builder.format item_spec, ' '}"
         end
-        def workspace workspace_name
+        def workspace workspace_name, workspace_owner=nil
           @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def recursive 
           @builder.append ' /recursive'
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
         def no_prompt 
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def collection team_project_collection_url
@@ -1307,9 +1617,9 @@ module FluentCommandBuilder
         end
       end
       class Unlabel
-        def initialize builder
+        def initialize builder, label_name, item_spec
           @builder = builder
-          @builder.append ' unlabel'
+          @builder.append " unlabel #{@builder.format label_name} #{@builder.format item_spec, ' '}"
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
@@ -1319,16 +1629,9 @@ module FluentCommandBuilder
           @builder.append ' /recursive'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
-        end
-        def label_name label_name
-          @builder.append " #{@builder.format label_name}"
-          self
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -1336,22 +1639,19 @@ module FluentCommandBuilder
         end
       end
       class Unshelve
-        def initialize builder
+        def initialize builder, shelveset_name=nil, username=nil, item_spec=nil
           @builder = builder
           @builder.append ' unshelve'
+          @builder.append " #{@builder.format shelveset_name}" unless shelveset_name.nil?
+          @builder.append ''
+          @builder.append ";#{@builder.format username}" unless username.nil?
+          @builder.append ''
+          @builder.append " #{@builder.format item_spec, ' '}" unless item_spec.nil?
         end
         def move 
           @builder.append ' /move'
           self
         end
-        def shelveset_name shelveset_name
-          @builder.append " #{@builder.format shelveset_name}"
-          self
-        end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
         def recursive 
           @builder.append ' /recursive'
           self
@@ -1360,8 +1660,9 @@ module FluentCommandBuilder
           @builder.append ' /noPrompt'
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
@@ -1369,9 +1670,9 @@ module FluentCommandBuilder
         end
       end
       class View
-        def initialize builder
+        def initialize builder, item_spec
           @builder = builder
-          @builder.append ' view'
+          @builder.append " view #{@builder.format item_spec, ' '}"
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
@@ -1389,94 +1690,188 @@ module FluentCommandBuilder
           @builder.append " /output:#{@builder.format local_file}"
           self
         end
-        def shelveset shelveset_name
+        def shelveset shelveset_name, shelveset_owner=nil
           @builder.append " /shelveset:#{@builder.format shelveset_name}"
+          @builder.append ";#{@builder.format shelveset_owner}" unless shelveset_owner.nil?
           self
         end
         def no_prompt 
           @builder.append ' /noPrompt'
           self
         end
-        def item_spec item_spec
-          @builder.append " #{@builder.format item_spec}"
-          self
-        end
         def version version_spec
           @builder.append " /version:#{@builder.format version_spec}"
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Workfold
-        def initialize builder
+      class ShowLocalFolderMapping
+        def initialize builder, local_folder
+          @builder = builder
+          @builder.append " workfold #{@builder.format local_folder}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class ShowWorkspaceMappings
+        def initialize builder, workspace_name
+          @builder = builder
+          @builder.append " workfold /workspace:#{@builder.format workspace_name}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class ShowServerFolderMappings
+        def initialize builder, server_folder
           @builder = builder
-          @builder.append ' workfold'
+          @builder.append " workfold #{@builder.format server_folder}"
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def workspace workspace_name
+        def workspace workspace_name, workspace_owner=nil
           @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def collection team_project_collection_url
           @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def map 
-          @builder.append ' /map'
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class MapFolder
+        def initialize builder, server_folder, local_folder
+          @builder = builder
+          @builder.append " workfold /map #{@builder.format server_folder} #{@builder.format local_folder}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def server_folder server_folder
-          @builder.append " #{@builder.format server_folder}"
+        def workspace workspace_name, workspace_owner=nil
+          @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
-        def local_folder local_folder
-          @builder.append " #{@builder.format local_folder}"
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def unmap 
-          @builder.append ' /unmap'
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class UnmapFolder
+        def initialize builder
+          @builder = builder
+          @builder.append ' workfold /unmap'
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def workspace workspace_name, workspace_owner=nil
+          @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
+          self
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
         def recursive 
           @builder.append ' /recursive'
           self
         end
-        def cloak 
-          @builder.append ' /cloak'
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class CloakFolder
+        def initialize builder, server_folder
+          @builder = builder
+          @builder.append " workfold /cloak #{@builder.format server_folder}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def workspace workspace_name, workspace_owner=nil
+          @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
-        def decloak 
-          @builder.append ' /decloak'
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
         def to_s 
           @builder.to_s
         end
       end
-      class Workspace
-        def initialize builder
+      class DecloakFolder
+        def initialize builder, server_folder
           @builder = builder
-          @builder.append ' workspace'
+          @builder.append " workfold /decloak #{@builder.format server_folder}"
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def workspace workspace_name, workspace_owner=nil
+          @builder.append " /workspace:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
+          self
         end
-        def new 
-          @builder.append ' /new'
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class CreateWorkspace
+        def initialize builder, workspace_name, workspace_owner=nil
+          @builder = builder
+          @builder.append " workspace /new #{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
+        end
         def no_prompt 
           @builder.append ' /noPrompt'
           self
         end
-        def template workspace_name
+        def template workspace_name, workspace_owner=nil
           @builder.append " /template:#{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
           self
         end
         def computer computer_name
@@ -1495,16 +1890,61 @@ module FluentCommandBuilder
           @builder.append " /permission:#{@builder.format permission}"
           self
         end
-        def workspace_name workspace_name
-          @builder.append " #{@builder.format workspace_name}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class DeleteWorkspace
+        def initialize builder, workspace_name, workspace_owner=nil
+          @builder = builder
+          @builder.append " workspace /delete #{@builder.format workspace_name}"
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
-        def delete 
-          @builder.append ' /delete'
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
+          self
+        end
+        def to_s 
+          @builder.to_s
+        end
+      end
+      class ModifyWorkspace
+        def initialize builder, workspace_name=nil, workspace_owner=nil
+          @builder = builder
+          @builder.append ' workspace '
+          @builder.append "#{@builder.format workspace_name}" unless workspace_name.nil?
+          @builder.append ''
+          @builder.append ";#{@builder.format workspace_owner}" unless workspace_owner.nil?
+        end
+        def computer computer_name
+          @builder.append " /computer:#{@builder.format computer_name}"
+          self
+        end
+        def comment comment
+          @builder.append " /comment:#{@builder.format comment}"
+          self
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
+          self
+        end
+        def permission permission
+          @builder.append " /permission:#{@builder.format permission}"
+          self
+        end
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
         def new_name workspace_name
@@ -1520,9 +1960,10 @@ module FluentCommandBuilder
         end
       end
       class Workspaces
-        def initialize builder
+        def initialize builder, workspace_name=nil
           @builder = builder
           @builder.append ' workspaces'
+          @builder.append " #{@builder.format workspace_name}" unless workspace_name.nil?
         end
         def owner owner_name
           @builder.append " /owner:#{@builder.format owner_name}"
@@ -1548,16 +1989,22 @@ module FluentCommandBuilder
           @builder.append " /updateComputerName:#{@builder.format old_computer_name}"
           self
         end
-        def workspace_name workspace_name
-          @builder.append " #{@builder.format workspace_name}"
+        def login username, password=nil
+          @builder.append " /login:#{@builder.format username}"
+          @builder.append ",#{@builder.format password}" unless password.nil?
           self
         end
-        def login credentials
-          @builder.append " /login:#{@builder.format credentials}"
-          self
+        def to_s 
+          @builder.to_s
         end
-        def remove workspace_name
-          @builder.append " /remove:#{@builder.format workspace_name}"
+      end
+      class RemoveWorkspace
+        def initialize builder, workspace_name
+          @builder = builder
+          @builder.append " workspaces /remove:#{@builder.format workspace_name, ','}"
+        end
+        def collection team_project_collection_url
+          @builder.append " /collection:#{@builder.format team_project_collection_url}"
           self
         end
         def to_s