p4tools 0.1.4.1 → 0.2.0.0

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 source 'https://rubygems.herokuapp.com/'
 
 gem 'P4Ruby-mingwx86', '~> 2014.1'
-gem 'rake'
+gem 'rake'
+gem 'awesome_print'

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   remote: https://rubygems.herokuapp.com/
   specs:
     P4Ruby-mingwx86 (2014.1)
+    awesome_print (1.2.0)
     rake (10.3.1)
 
 PLATFORMS
@@ -10,4 +11,5 @@ PLATFORMS
 
 DEPENDENCIES
   P4Ruby-mingwx86 (~> 2014.1)
+  awesome_print
   rake

data/LICENSE

@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

data/Rakefile

@@ -5,18 +5,33 @@ def gem_name
   @gem_name ||= "#{P4Tools::PROJECT_NAME}-#{P4Tools::VERSION}"
 end
 
+def build_gem
+  system("gem build #{P4Tools::PROJECT_NAME}.gemspec")
+end
+
+def delete_gem
+  File.delete("#{gem_name}.gem")
+end
+
 task :check_version do
   abort 'Update version before release!' unless %x{git tag -l #{gem_name}}.empty?
 end
 
 task :release => [:check_version] do
-  if system("gem build #{P4Tools::PROJECT_NAME}.gemspec")
+  if build_gem
     system "git tag #{gem_name}"
     system 'git push --tags'
     system "gem push #{gem_name}.gem"
 
-    File.delete("#{gem_name}.gem")
+    delete_gem
   end
+end
+
+task :update do
+  if build_gem
+    system "gem install #{gem_name}.gem"
 
+    delete_gem
+  end
 end
 

data/lib/commands/describe.rb

@@ -0,0 +1,52 @@
+module P4Tools
+  class Describe
+
+    def self.run(arguments)
+      Describe.new(arguments).run
+    end
+
+    def self.set_options(opts)
+      opts.set do
+        help 'Provides information about changelists and the changelists files.'
+        help ''
+        help 'Options:'
+        help ''
+        arg :submitted, 'Find pending CL number, based on submitted CL number.', :short => '-s', :type => :ints
+        arg :pending, 'Find submitted CL number, based on pending CL number.', :short => '-p', :type => :ints
+      end
+    end
+
+
+    def initialize(args)
+      @pending = args[:pending]
+      @submitted = args[:submitted]
+
+      @p4 = P4Tools.connection
+    end
+
+    def run
+      if !@submitted.nil?
+        numbers = find_pending
+        report(numbers)
+      elsif !@pending.nil?
+        numbers = find_submitted
+        report(numbers)
+      end
+    end
+
+    def find_submitted
+      @p4.run_describe('-s', '-O', @pending)
+    end
+
+    def find_pending
+      @p4.run_describe('-s', @submitted)
+    end
+
+    def report(numbers)
+      numbers.each { |num|
+        p "pending: #{num['oldChange']}, submitted: #{num['change']}"
+      }
+    end
+
+  end
+end

data/lib/commands/move.rb

@@ -1,6 +1,5 @@
 module P4Tools
   class Move
-    include CommandUtils
 
     def self.run(arguments)
       Move.new(arguments).run
@@ -23,21 +22,32 @@ module P4Tools
 
 
     def initialize(args)
-      @args = args
+      @workspace = args[:workspace]
+      @switch = args[:switch]
+      @changelists = args[:changelists]
+      @revert = args[:revert]
+      @shelve = args[:shelve]
+
       @p4 = P4Tools.connection
-      workspaces = @args[:switch]
+    end
+
+    def run
+      prepare_workspaces
+      move_changelists
+    end
 
-      if workspaces
-        validate_workspaces(workspaces)
+    def prepare_workspaces
+      if @switch
+        validate_workspaces(@switch)
 
-        @workspaces = Hash[workspaces.permutation.to_a]
+        @workspaces = Hash[@switch.permutation.to_a]
       end
     end
 
-    def run
-      @args[:changelists].each do |changelist|
+    def move_changelists
+      @changelists.each do |changelist|
         @changelist = changelist
-        @is_not_empty = !empty_changelist?(@changelist)
+        @is_not_empty = !CommandUtils.empty_changelist?(@changelist)
 
         shelve
         revert
@@ -48,17 +58,14 @@ module P4Tools
       end
     end
 
-
-    private
-
     def shelve
-      if @args[:shelve] && @is_not_empty
+      if @shelve && @is_not_empty
         @p4.run_shelve('-f', '-c', @changelist)
       end
     end
 
     def revert
-      if @args[:revert] && @is_not_empty && all_files_shelved?(@changelist, true)
+      if @revert && @is_not_empty && CommandUtils.changelist_shelved?(@changelist)
         @p4.run_revert('-w', '-c', @changelist, '//...')
       end
     end
@@ -70,7 +77,7 @@ module P4Tools
 
         @workspaces[current]
       else
-        @args[:workspace]
+        @workspace
       end
     end
 

data/lib/commands/revert.rb

@@ -1,33 +1,8 @@
 module P4Tools
   class Revert
-    extend CommandUtils
 
     def self.run(arguments)
-      p4 = P4Tools.connection
-      parameters = []
-      parameters.push('-w') if arguments[:delete_added_files]
-      check_shelve = arguments[:check_shelve]
-
-      if arguments[:changelists]
-        parameters.push('-c').push('').push('//...')
-
-        arguments[:changelists].each do |changelist|
-          if check_shelve && !all_files_shelved?(changelist, true)
-              raise(StandardError, "Not all files are shelved in changelist: #{changelist}")
-          end
-
-          parameters[-2] = changelist
-          p4.run_revert(parameters)
-        end
-      else
-        if check_shelve
-          raise(ArgumentError, "The check shelve option only works with changelists!")
-        end
-
-        parameters.push(*arguments[:files])
-        p4.run_revert(parameters)
-      end
-
+      Revert.new(arguments).run
     end
 
     def self.set_options(opts)
@@ -42,5 +17,60 @@ module P4Tools
         arg :files, 'The absolute path of the files to delete.', :short => '-f', :type => :strings
       end
     end
+
+
+    def initialize(args)
+      @delete_added_files = args[:delete_added_files]
+      @check_shelve = args[:check_shelve]
+      @changelists = args[:changelists]
+      @files = args[:files]
+
+      @p4 = P4Tools.connection
+    end
+
+    def run
+      if !@changelists.nil?
+        revert_changelists
+      elsif !@files.nil?
+        revert_files
+      end
+    end
+
+    def revert_files
+      check_shelved_files(@files)
+
+      parameters = []
+      if @delete_added_files
+        parameters.push('-w')
+      end
+
+      parameters.push(*@files)
+      @p4.run_revert(parameters)
+    end
+
+    def revert_changelists
+      @changelists.each do |changelist|
+        check_shelved_changelist(changelist)
+
+        if @delete_added_files
+          @p4.run_revert('-w', '-c', changelist, '//...')
+        else
+          @p4.run_revert('-c', changelist, '//...')
+        end
+      end
+    end
+
+    def check_shelved_changelist(changelist)
+      if @check_shelve && !CommandUtils.changelist_shelved?(changelist)
+        raise(StandardError, "Not all files are shelved in changelist: #{changelist}")
+      end
+    end
+
+    def check_shelved_files(files)
+      if @check_shelve && !CommandUtils.files_shelved?(files)
+        raise(StandardError, "Not all files are shelved from list: #{files}")
+      end
+    end
+
   end
 end

data/lib/commands/shelve.rb

@@ -1,6 +1,5 @@
 module P4Tools
   class Shelve
-    include CommandUtils
 
     def self.run(arguments)
       Shelve.new(arguments).run
@@ -12,42 +11,80 @@ module P4Tools
         help ''
         help 'Options:'
         help ''
-        arg :files, 'The absolute path of the files to shelve.', :short => '-f', :type => :strings, :required => true
-        arg :changelist, 'The changelist number to shelve, if not given, then create a new one.', :short => '-c', :type => :int
+        arg :files, 'The absolute path of the files to shelve.', :short => '-f', :type => :strings
+        arg :changelist, 'The changelist to shelve.', :short => '-c', :type => :int
+        arg :tochangelist, 'The changelist number to shelve, if not given, then create a new one.', :short => '-t', :type => :int
+        arg :checkfiles, 'List the unshelved files.', :short => '-i', :type => :strings
+        arg :checkcls, 'List the unshelved files in changelist.', :short => '-l', :type => :ints
       end
     end
 
 
     def initialize(args)
       @files = args[:files]
-      @shelve_changelist = args[:changelist] || create_new_changelist("Shelve container for files:\n\n#{@files.join("\n")}")
+      @from_changelist = args[:changelist]
+      @to_changelist = args[:tochangelist]
+      @checkfiles = args[:checkfiles]
+      @checkcls = args[:checkcls]
+
       @p4 = P4Tools.connection
     end
 
     def run
-      current_changelist = get_current_changelist
-
-      move_to(@shelve_changelist)
-      shelve
-      move_to(current_changelist)
+      if !@files.nil?
+        from_changelist = CommandUtils.pending_changelist_for_file(@files.first)
+        shelve_to_cl(from_changelist, get_to_changelist)
+      elsif !@from_changelist.nil?
+        @files = CommandUtils.opened_files(@from_changelist)
+        shelve_to_cl(@from_changelist, get_to_changelist)
+      elsif !@checkfiles.nil?
+        check_files(@checkfiles)
+      elsif !@checkcls.nil?
+        check_changelists(@checkcls)
+      end
     end
 
+    def check_files(files)
+      unshelved = CommandUtils.unshelved_files(files)
 
-    private
+      if unshelved.empty?
+        puts 'All files shelved.'
+      else
+        puts unshelved.join($/)
+      end
+    end
 
-    def get_current_changelist
-      file_info = @p4.run_opened('-u', @p4.user, @files.first).first
-      file_info['change']
+    def check_changelists(changelists)
+      changelists.each { |cl|
+        files = CommandUtils.unshelved_files_in_changelist(cl)
+        if files.empty?
+          puts "#{cl}: All files shelved."
+        else
+          puts "#{cl}: "
+          puts files.join($/)
+          puts
+        end
+      }
     end
 
-    def shelve
-      @p4.run_shelve('-f', '-c', @shelve_changelist, @files)
+    def shelve_to_cl(from_changelist, to_changelist)
+      move_to(to_changelist)
+      shelve(to_changelist)
+      move_to(from_changelist)
+    end
+
+    def shelve(changelist)
+      @p4.run_shelve('-f', '-c', changelist, @files)
     end
 
     def move_to(changelist)
       @p4.run_reopen('-c', changelist, @files)
     end
 
+    def get_to_changelist
+      @to_changelist || CommandUtils.create_new_changelist("Shelve container for files:\n\n#{@files.join("\n")}")
+    end
+
   end
 
 end

data/lib/p4_tools.rb

@@ -1,6 +1,5 @@
 require 'P4'
 require_relative 'p4tools/environment'
-require_relative 'p4tools/p4_delegate'
 require_relative 'p4tools/utils/utils'
 require_relative 'p4tools/utils/command_utils'
 require_relative 'p4tools/parsers/command_parser'
@@ -16,7 +15,6 @@ module P4Tools
     entries = CommandParser.new(args).parse
     global_arguments = entries.shift.arguments
 
-    setup_perforce_config(global_arguments[:p4config])
     create_perforce_connection
 
     begin
@@ -31,13 +29,10 @@ module P4Tools
   def self.set_options(opts)
     opts.set do
       help 'Simple command line tool to run custom perforce actions through subcommands.'
-      help 'For more information, please check the help page of the command.'
+      help 'For more information, please check the help page of the subcommand.'
       help ''
       help "Available subcommands are:\n  #{SUB_COMMANDS.join("\n  ")}"
       help ''
-      help 'Global options:'
-      help ''
-      arg :p4config, 'Absolute path of the P4CONFIG file.', :short => '-p', :type => :string
     end
   end
 
@@ -66,19 +61,8 @@ module P4Tools
         command.run(arguments)
       end
     end
-
-    # @param [String] config_path
-    # @return [void]
-    def setup_perforce_config(config_path)
-      if config_path
-        ENV['P4CONFIG'] = config_path
-      elsif ENV['P4CONFIG'].nil?
-        ENV['P4CONFIG'] = CONFIG_ROOT + '/p4.ini'
-      end
-    end
   end
 
-
   if __FILE__ == $PROGRAM_NAME
     run
   end

data/lib/p4tools/environment.rb

@@ -3,16 +3,12 @@ ROOT = File.expand_path('..', File.dirname(__FILE__))
 # The absolute path of the folder which contains the command files
 COMMANDS_ROOT = ROOT + '/commands'
 # The absolute path of the folder which contains the custom command files
-CUSTOM_COMMANDS_ROOT = ROOT + '/commands/custom'
+CUSTOM_COMMANDS_ROOT = COMMANDS_ROOT + '/custom'
 # The absolute path of the folder which contains the configuration files
 CONFIG_ROOT = ROOT + '/config'
-# Special command to simply delegate everything to p4.run
-P4_COMMAND = 'p4'
 # Array of command names, read from the COMMAND_ROOT folder
 SUB_COMMANDS = Dir[COMMANDS_ROOT + '/*.rb'].collect { |file|
                 File.basename(file, '.rb')
               }
-SUB_COMMANDS.push(P4_COMMAND)
-
 
 $LOAD_PATH.unshift(CUSTOM_COMMANDS_ROOT, COMMANDS_ROOT)

data/lib/p4tools/parsers/command_parser.rb

@@ -26,14 +26,13 @@ module P4Tools
     # @return [void]
     def parse_commands
       while command = @raw_args.shift
-        if command == P4_COMMAND
-          entry = CommandEntry.new(P4Delegate, parse_p4_arguments)
-          @parsed_args.push(entry)
-        else
-          command_module = load_module_for_command(command)
-          entry = CommandEntry.new(command_module, parse_arguments(command_module))
-          @parsed_args.push(entry)
+        unless SUB_COMMANDS.include?(command)
+          raise(ArgumentError, "The following subcommand does not exist: '#{command}'")
         end
+
+        command_module = load_module_for_command(command)
+        entry = CommandEntry.new(command_module, parse_arguments(command_module))
+        @parsed_args.push(entry)
       end
     end
 
@@ -52,24 +51,6 @@ module P4Tools
       }
     end
 
-    # @return [Hash<Symbol, Object>]
-    def parse_p4_arguments
-      P4Delegate.help if @raw_args.empty?
-
-      args = []
-      i = 0
-      current = @raw_args[i]
-
-      begin
-        i += 1
-        args.push(current)
-        current = @raw_args[i]
-      end while !SUB_COMMANDS.include?(current) && i < @raw_args.length
-
-      @raw_args = @raw_args[i .. -1]
-      {:raw => args}
-    end
-
     # @param [String] command
     # @return [Module]
     def load_module_for_command(command)

data/lib/p4tools/spec.rb

@@ -1,4 +1,4 @@
 module P4Tools
   PROJECT_NAME = 'p4tools'
-  VERSION = '0.1.4.1'
+  VERSION = '0.2.0.0'
 end

data/lib/p4tools/utils/command_utils.rb

@@ -3,26 +3,69 @@ require_relative 'validators/shelve_validator'
 module P4Tools
   module CommandUtils
 
+    # @param [Array<String>] files
+    # @param [Boolean] check_diff
+    # @return [Boolean]
+    def self.files_shelved?(files, check_diff=true)
+      ShelveValidator.new.find_unshelved_files(files, check_diff).empty?
+    end
+
     # @param [Integer] changelist
     # @param [Boolean] check_diff
     # @return [Boolean]
-    def all_files_shelved?(changelist, check_diff=false)
-      validator = ShelveValidator.new(changelist, check_diff)
-      validator.valid?
+    def self.changelist_shelved?(changelist, check_diff=true)
+      files = opened_files(changelist)
+      ShelveValidator.new.find_unshelved_files(files, check_diff).empty?
+    end
+
+    # @param [Array<String>] files
+    # @param [Boolean] check_diff
+    # @return [Array<String>]
+    def self.unshelved_files(files, check_diff=true)
+      ShelveValidator.new.find_unshelved_files(files, check_diff)
+    end
+
+    # @param [Integer] changelist
+    # @param [Boolean] check_diff
+    # @return [Array<String>]
+    def self.unshelved_files_in_changelist(changelist, check_diff=true)
+      files = opened_files(changelist)
+      ShelveValidator.new.find_unshelved_files(files, check_diff)
     end
 
     # @param [Integer] changelist
     # @return [Boolean]
-    def empty_changelist?(changelist)
+    def self.empty_changelist?(changelist)
       p4 = P4Tools.connection
-      opened_files = p4.run(%W{ describe -s #{changelist} })[0]['depotFile']
+      opened_files = p4.run_describe('-s', changelist).first['depotFile']
       opened_files.nil?
     end
 
+    # @param [String] file
+    # @return [Integer]
+    def self.pending_changelist_for_file(file)
+      p4 = P4Tools.connection
+      p4.run_opened(file).first['change']
+    end
+
+    # @param [Integer] changelist
+    # @return [Array<String>]
+    def self.shelved_files(changelist)
+      p4 = P4Tools.connection
+      p4.run_describe('-s', '-S', changelist).first['depotFile']
+    end
+
+    # @param [Integer] changelist
+    # @return [Array<String>]
+    def self.opened_files(changelist)
+      p4 = P4Tools.connection
+      p4.run_describe('-s', changelist).first['depotFile']
+    end
+
     # @param [String] description
     # @return [String]
     # The number of the new changelist
-    def create_new_changelist(description='Created with P4Tools.')
+    def self.create_new_changelist(description='Created with P4Tools.')
       p4 = P4Tools.connection
 
       p4.input = {
@@ -30,7 +73,7 @@ module P4Tools
           'Description' => description,
       }
 
-      confirmation = p4.run('change', '-i').first
+      confirmation = p4.run_change('-i').first
       confirmation.match(/\d+/)[0]
     end
   end

data/lib/p4tools/utils/validators/shelve_validator.rb

@@ -1,37 +1,51 @@
 module P4Tools
   class ShelveValidator
 
-    def initialize(changelist, check_diff)
-      @changelist = changelist
-      @check_diff = check_diff
-    end
+    # @return [Array<String>]
+    def find_unshelved_files(files, check_diff)
+      return false if files.nil?
 
-    # @return [Boolean]
-    def valid?
+      @opened_files = files
+      @check_diff = check_diff
       @p4 = P4Tools.connection
-      @opened_files = @p4.run(%W{ describe -s #{@changelist} })[0]['depotFile']
-      @shelved_files = @p4.run(%W{ describe -s -S #{@changelist} })[0]['depotFile']
 
-      @opened_files.nil? || (!@shelved_files.nil? && all_opened_files_shelved? && files_are_identical?)
-    end
+      @cl = CommandUtils.pending_changelist_for_file(@opened_files[0])
+      @shelved_files = CommandUtils.shelved_files(@cl)
+
+      if @shelved_files.nil?
+        return files
+      end
 
-    private
+      unshelved_files = find_not_shelved_files
+      unless unshelved_files.empty?
+        return unshelved_files
+      end
+
+      find_diff_files
+    end
 
     # @return [Boolean]
-    def all_opened_files_shelved?
-      (@opened_files - @shelved_files).empty?
+    def find_not_shelved_files
+      @opened_files - @shelved_files
     end
 
     # @return [Boolean]
-    def files_are_identical?
-      identical = true
+    def find_diff_files
+      return [] unless @check_diff
 
-      if @check_diff
-        shelve_revisions = @opened_files.map { |file| file + "@=#{@changelist}" }
-        identical = @p4.run_diff('-Od', *shelve_revisions).empty?
-      end
+      shelve_revisions = []
+      @p4.run_opened(*@opened_files).each { |file|
+        unless deleted?(file)
+          shelve_revisions.push("#{file['depotFile']}@=#{@cl}")
+        end
+      }
 
-      identical
+      @p4.run_diff('-f', '-se', *shelve_revisions)
     end
+
+    def deleted?(file)
+      file['action'].include?('delete')
+    end
+
   end
 end

data/p4tools.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split($/).delete_if {|file| file =~ %r{^gem/|^lib/commands/custom/}}
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.require_paths = ['lib']
+  gem.license = 'GPL-2'
   
   gem.add_runtime_dependency('P4Ruby-mingwx86', '~> 2014.1')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p4tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: P4Ruby-mingwx86
@@ -53,15 +53,15 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Rakefile
 - bin/p4tools
+- lib/commands/describe.rb
 - lib/commands/move.rb
 - lib/commands/revert.rb
 - lib/commands/shelve.rb
-- lib/config/README
 - lib/p4_tools.rb
 - lib/p4tools/environment.rb
-- lib/p4tools/p4_delegate.rb
 - lib/p4tools/parsers/command_entry.rb
 - lib/p4tools/parsers/command_options.rb
 - lib/p4tools/parsers/command_parser.rb
@@ -72,7 +72,8 @@ files:
 - lib/p4tools/utils/validators/shelve_validator.rb
 - p4tools.gemspec
 homepage: https://github.com/ncsibra/P4Tools
-licenses: []
+licenses:
+- GPL-2
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/config/README

@@ -1 +0,0 @@
-Put your 'p4.ini' file to this folder to load automatically during script run.

data/lib/p4tools/p4_delegate.rb

@@ -1,34 +0,0 @@
-module P4Tools
-  class P4Delegate
-
-    def self.run(arguments)
-      @p4 = P4Tools.connection
-      command = arguments[:raw]
-
-      if help?(command)
-        help
-      else
-        @p4.run(command)
-      end
-    end
-
-    def self.set_options(opts)
-    end
-
-    def self.help
-      $stdout.puts "\n"
-      $stdout.puts "Special command which delegate every argument to the perforce 'run()' method."
-      $stdout.puts 'This way it will behave as the command line client of perforce(p4).'
-      $stdout.puts "So if in the command line using a command like 'p4 revert -w -c 1234', you can use it in the exact same way with p4tools, e.g.: 'p4tools p4 revert -w -c 1234'"
-      $stdout.puts "For more information check the perforce command reference: http://www.perforce.com/perforce/doc.current/manuals/cmdref"
-      exit
-    end
-
-    def self.help?(command)
-      %w(--help -h).include?(command[0])
-    end
-
-    private_class_method :help?
-
-  end
-end