redcar 0.6.1 → 0.7

data/plugins/scm/lib/scm/model.rb

@@ -8,33 +8,34 @@ module Redcar
       def repository_type
         ""
       end
-      
-      # REQUIRED. Checks if a given directory is a repository supported by 
+
+      # REQUIRED. Checks if a given directory is a repository supported by
       # the SCM.
       def repository?(path)
         raise "Scm.repository? not implemented."
       end
-      
+
       # REQUIRED. Initialises the SCM with a path. This path should be used
       # for all future interactions. Repeated calls to load should be treated
       # as a breaking error.
       def load(path)
         raise "Scm.load not implemented."
       end
-      
+
       # RECOMMENDED. If we call this method, than we expect the repository to
       # return all fresh data for any subsequent calls. Any caching should be
       # reset.
       def refresh
         nil
       end
-      
+
       # REQUIRED to be useful. If no commands are supported, than the SCM will
       # will essentially be useless. These commands loosely translate to the
-      # common operations of a distributed CVS. 
+      # common operations of a distributed CVS.
       #
       # Supported values to date:
       #  * :init
+      #  * :remote_init
       #  * :push
       #  * :pull
       #  * :pull_targetted
@@ -45,19 +46,23 @@ module Redcar
       #
       # Note about non-distributed CVS's: If your CVS doesn't support local
       # commits, ie. subversion, then implement :commit and :pull, and then
-      # provide translations via the translations method.
+      # provide translations via the translations method. :remote_init can
+      # fill the gap for initializing a non-distributed VCS.
       def supported_commands
         []
       end
-      
+
       # This method allows SCM's to override the default names for different
       # commands and bring them into line with the normal vocabulary in their
-      # respective worlds. ie, SVN calls :commit and :pull "checkin" and 
+      # respective worlds. ie, SVN calls :commit and :pull "checkin" and
       # "checkout" respectively. If you overload this method, you need to
       # provide names for all commands you support with supported_commands
       def translations
         {
           :init => "Initialise " + repository_type.capitalize,
+          :remote_init => "Initialize "+ repository_type.capitalize+" from remote repository",
+          :remote_init_path => "Repository URL",
+          :remote_init_target => "Target Directory",
           :push => "Push Changesets",
           :unpushed_commits => "Unpushed commits",
           :pull => "Pull Changesets",
@@ -79,15 +84,23 @@ module Redcar
           :merge => "Merge...",
         }
       end
-      
-      # REQUIRED for :init. Initialise a repository in a given path. 
+
+      # REQUIRED for :init. Initialise a repository in a given path.
       # Returns false on error.
       def init!(path)
         raise "Scm.init not implemented." if supported_commands.include?(:init)
         nil
       end
-      
-      # REQUIRED for :commit if :index is not supported. Returns an 
+
+      # REQUIRED for :remote_init. Initialize a repository from
+      # a url or file path, like SVN 'checkout' or git 'clone'
+      # Returns false on error
+      def remote_init(repo_path,target_directory)
+        raise "Scm.remote_init not implemented." if supported_commands.include?(:remote_init)
+        nil
+      end
+
+      # REQUIRED for :commit if :index is not supported. Returns an
       # array of changes currently waiting for commit.
       #
       # @return [Array<Redcar::Scm::ScmChangesMirror::Change>]
@@ -95,7 +108,7 @@ module Redcar
         raise "Scm.uncommited_changes not implemented." if supported_commands.include?(:commit)
         []
       end
-      
+
       # REQUIRED for :commit if :index is supported. Returns an array
       # of changes currently in the index.
       #
@@ -104,7 +117,7 @@ module Redcar
         raise "Scm.indexed_changes not implemented." if supported_commands.include?(:commit)
         []
       end
-      
+
       # REQUIRED for :commit if :index is supported. Returns an array
       # of changes currently not in the index.
       #
@@ -113,59 +126,59 @@ module Redcar
         raise "Scm.unindexed_changes not implemented." if supported_commands.include?(:commit)
         []
       end
-      
+
       # REQUIRED for :index. Adds a new file to the index.
       def index_add(change)
         raise "Scm.index_add not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Ignores a new file so it won't show in changes.
       def index_ignore(change)
         raise "Scm.index_ignore not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Ignores all files with a certain extension so they
       # won't show in changes.
       def index_ignore_all(extension, change)
         raise "Scm.index_ignore_all not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Reverts a file to its last commited state.
       def index_revert(change)
         raise "Scm.index_revert not implemented" if supported_commands.include?(:index)
         nil
       end
-      
-      # REQUIRED for :index. Reverts a file in the index back to it's 
+
+      # REQUIRED for :index. Reverts a file in the index back to it's
       # last commited state, but leaves the file intact.
       def index_unsave(change)
         raise "Scm.index_unsave not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Saves changes made to a file in the index.
       def index_save(change)
         raise "Scm.index_save not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Restores a file to the last known state of
       # the file. This may be from the index, or the last commit.
       def index_restore(change)
         raise "Scm.index_restore not implemented" if supported_commands.include?(:index)
         nil
       end
-      
+
       # REQUIRED for :index. Marks a file as deleted in the index.
       def index_delete(change)
         raise "Scm.index_delete not implemented" if supported_commands.include?(:index)
         nil
       end
-      
-      # REQUIRED for :commit. Commits the currently indexed changes 
+
+      # REQUIRED for :commit. Commits the currently indexed changes
       # in the subproject.
       #
       # @param change Required for :commitable changes. Ignore if
@@ -174,8 +187,8 @@ module Redcar
         raise "Scm.commit! not implemented." if supported_commands.include?(:index)
         nil
       end
-      
-      # REQUIRED for :commit. Gets a default commit message for the 
+
+      # REQUIRED for :commit. Gets a default commit message for the
       # currently indexed changes.
       #
       # @param change Required for :commitable changes. Ignore if
@@ -183,7 +196,7 @@ module Redcar
       def commit_message(change=nil)
         "\n\n# Please enter your commit message above."
       end
-      
+
       # REQUIRED for :push. Returns an array of unpushed changesets for
       # a given target.
       #
@@ -192,14 +205,14 @@ module Redcar
         raise "Scm.unpushed_commits not implemented." if supported_commands.include?(:push)
         nil
       end
-      
+
       # REQUIRED for :push. Pushes all current changesets to the remote
       # repository for the given target only.
       def push!(target='')
         raise "Scm.push! not implemented." if supported_commands.include?(:push)
         nil
       end
-      
+
       # RECOMMENDED for :push. Allows to provide a list of targets that
       # can be pushed.
       #
@@ -207,23 +220,23 @@ module Redcar
       def push_targets
         []
       end
-      
-      # REQUIRED for :pull and :pull_targetted. Pulls all remote changesets from the 
+
+      # REQUIRED for :pull and :pull_targetted. Pulls all remote changesets from the
       # remote repository.
-      # 
+      #
       # Note: If you only support :pull, you can implement this without the
       # argument. It will never be called with an explicit nil.
       def pull!(remote=nil)
         raise "Scm.pull! not implemented." if supported_commands.include?(:pull)
         nil
       end
-      
+
       # REQUIRED for :pull_targetted. Returns an array of pull targets.
       def pull_targets
         raise "Scm.pull_targets not implemented." if supported_commands.include?(:pull_targeted)
         []
       end
-      
+
       # REQUIRED for :switch_branch and :merge. Returns an array of branch names.
       #
       # @return [Array<String>]
@@ -231,27 +244,27 @@ module Redcar
         raise "Scm.branches not implemented." if supported_commands.include?(:switch_branch) or supported_commands.include?(:merge)
         []
       end
-      
+
       # REQUIRED for :switch_branch. Returns the name of the current branch.
       def current_branch
         raise "Scm.current_branch not implemented." if supported_commands.include?(:switch_branch)
         ''
       end
-      
+
       # REQUIRED for :switch_branch. Switches to the named branch.
       def switch!(branch)
         raise "Scm.switch! not implemented." if supported_commands.include?(:switch_branch)
         nil
       end
-      
+
       # REQUIRED for :merge. Merges the target branch with the current one.
       def merge!(branch)
         raise "Scm.switch! not implemented." if supported_commands.include?(:merge)
         nil
       end
-      
+
       # Allows the SCM to provide a custom adapter which is injected into the
-      # project instead of old_adapter. This allows interception of file 
+      # project instead of old_adapter. This allows interception of file
       # modifications such as move and copy, which you may wish to do via
       # your SCM instead of normal file system operations.
       def adapter(old_adapter)

data/plugins/scm_svn/LICENSE

@@ -0,0 +1,48 @@
+The TMate Open Source License.
+
+
+This license applies to all portions of TMate SVNKit library, which 
+are not externally-maintained libraries (e.g. Ganymed SSH library).
+
+All the source code and compiled classes in package org.tigris.subversion.javahl
+except SvnClient class are covered by the license in JAVAHL-LICENSE file
+
+Copyright (c) 2004-2009 TMate Software. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+      
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+      
+    * Redistributions in any form must be accompanied by information on how to 
+      obtain complete source code for the software that uses SVNKit and any 
+      accompanying software that uses the software that uses SVNKit. The source 
+      code must either be included in the distribution or be available for no 
+      more than the cost of distribution plus a nominal fee, and must be freely 
+      redistributable under reasonable conditions. For an executable file, complete 
+      source code means the source code for all modules it contains. It does not 
+      include source code for modules or files that typically accompany the major 
+      components of the operating system on which the executable file runs.
+      
+    * Redistribution in any form without redistributing source code for software 
+      that uses SVNKit is possible only when such redistribution is explictly permitted 
+      by TMate Software. Please, contact TMate Software at support@svnkit.com to 
+      get such permission.
+
+THIS SOFTWARE IS PROVIDED BY TMATE SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE 
+DISCLAIMED. 
+
+IN NO EVENT SHALL TMATE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/plugins/scm_svn/features/add_and_commit.feature

@@ -0,0 +1,18 @@
+Feature: Adding and committing files in a working copy
+
+  Scenario: Adding and committing new files to a repository
+    When I checkout a local repository
+    And I create a wc file named "README,foo.rb"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then there should be "1" unindexed files and "0" indexed files
+    And if I checkout to a new working copy, it should have "1" files
+
+  Scenario: Adding and committing new directories to a repository
+    When I checkout a local repository
+    And I create a wc directory named "lib"
+    And I create a wc file named "lib/foo.rb"
+    And I add "lib/foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then there should be "0" unindexed files and "0" indexed files
+    And if I checkout to a new working copy, it should have "1" files

data/plugins/scm_svn/features/checkout.feature

@@ -0,0 +1,5 @@
+Feature: Checking out a repository
+
+  Scenario: Checking out a repository via the 'file' protocol
+    When I checkout a local repository
+    Then I should have a working copy

data/plugins/scm_svn/features/edit_and_index.feature

@@ -0,0 +1,12 @@
+Feature: Editing and indexing files in a working copy
+
+  Scenario: Editing a file and viewing unindexed modified files
+    When I checkout a local repository
+    And I create a wc file named "README"
+    Then there should be "1" unindexed files and "0" indexed files
+
+  Scenario: Editing a file and adding to the index
+    When I checkout a local repository
+    And I create a wc file named "README,foo.rb"
+    And I add "foo.rb" to the index
+    Then there should be "1" unindexed files and "1" indexed files

data/plugins/scm_svn/features/ignore_files.feature

@@ -0,0 +1,14 @@
+Feature: Ignoring external files within a working directory
+
+  Scenario: Ignoring certain files
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I ignore "foo.rb"
+    Then there should be "0" unindexed files and "0" indexed files
+
+  Scenario: Ignoring all files of a type
+    When I checkout a local repository
+    And I create a wc file named "foo.rb,bar.rb,README"
+    Then there should be "3" unindexed files and "0" indexed files
+    When I ignore "rb" files
+    Then there should be "1" unindexed files and "0" indexed files

data/plugins/scm_svn/features/merge.feature

@@ -0,0 +1,34 @@
+Feature: Merging two branches together
+
+  Scenario: Merging a branch into trunk
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "trunk" branch as a new project
+    When I open a directory
+    And I merge the "version1" branch
+    Then I should see "b.txt" in "trunk" branch
+
+  Scenario: Merging two branches together
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "version1" branch as a new project
+    When I open a directory
+    And I merge the "version2" branch
+    Then I should see "c.txt" in "version1" branch
+
+  Scenario: Merging trunk into a branch
+    When I checkout a local repository
+    And I create a wc directory named "trunk,branches,branches/version1,branches/version2"
+    And I create a wc file named "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt"
+    And I add "trunk/a.txt,branches/version1/b.txt,branches/version2/c.txt" to the index
+    And I commit my changes with message "Initial commit"
+    Given I will open "version2" branch as a new project
+    When I open a directory
+    And I merge the "trunk" branch
+    Then I should see "a.txt" in "version2" branch

data/plugins/scm_svn/features/resolve_conflict.feature

@@ -0,0 +1,23 @@
+Feature: Resolving conflicts
+
+  Scenario: Resolving a file content conflict
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I replace "foo.rb" contents with "Never gonna make you cry"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    Then if I checkout to a new working copy, it should have "1" files
+    And the contents of wc file "foo.rb" in the new copy should be "Never gonna make you cry"
+    When I replace "foo.rb" contents with "Never gonna say goodbye"
+    And I commit my changes with message "Yarr! This is another commit."
+    And I replace "foo.rb" contents in the new copy with "Never gonna tell a lie and hurt you"
+    Then if I update my new working copy, it should have "4" files
+    And there should be "1" conflicted files in the new copy
+    When I replace "foo.rb" contents in the new copy with "Never gonna tell a lie and hurt you"
+    And and I resolve "foo.rb" conflicts in the new copy
+    Then if I update my new working copy, it should have "1" files
+    And there should be "0" conflicted files in the new copy
+    And the contents of wc file "foo.rb" in the new copy should be "Never gonna tell a lie and hurt you"
+    And I commit my changes in the new copy with message "Commit commit commit again!"
+    And if I update my working copy, it should have "1" files
+    And the contents of wc file "foo.rb" should be "Never gonna tell a lie and hurt you"

data/plugins/scm_svn/features/revert_and_delete.feature

@@ -0,0 +1,21 @@
+Feature: Reverting and deleting files in a working copy
+
+  Scenario: Reverting a dirty file to base revision
+    When I checkout a local repository
+    And I create a wc file named "foo.rb"
+    And I replace "foo.rb" contents with "Never gonna give you up"
+    And I add "foo.rb" to the index
+    And I commit my changes with message "Hark! This is a commit."
+    And I replace "foo.rb" contents with "Never gonna let you down"
+    And I revert "foo.rb"
+    Then there should be "0" unindexed files and "0" indexed files
+    And the contents of wc file "foo.rb" should be "Never gonna give you up"
+
+  Scenario: Deleting a file from version control
+    When I checkout a local repository
+    And I create a wc file named "foo.rb,bar.rb"
+    And I add "foo.rb,bar.rb" to the index
+    And I commit my changes with message "Hark! This be a commit."
+    And I wc delete "foo.rb"
+    And I commit my changes with message "Yarr! Committin' I be!"
+    Then if I checkout to a new working copy, it should have "1" files