svn_branch 0.2.1 → 0.3.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.3.1 2007-10-29
+
+* When determining project/app_name, use reverse repos root path parts (not just last) and
+ignore 'repos' or 'trunk' etc.
+
+== 0.3.0 2007-06-24
+
+* RubyGem support via svn:gems:create
+  * Includes svn copy -m message
+
 == 0.2.1 2007-06-17
 
 * Fixed up svn:branch:merge_to_trunk

data/Manifest.txt

@@ -4,8 +4,10 @@ README.txt
 Rakefile
 lib/svn_branch.rb
 lib/svn_branch/version.rb
-lib/tasks/create.rake
-lib/tasks/merge.rake
+lib/tasks/rails/create.rake
+lib/tasks/rails/merge.rake
+lib/tasks/rubygems/create.rake
+lib/tasks/rubygems/merge.rake
 scripts/txt2html
 setup.rb
 test/test_helper.rb

data/lib/svn_branch/version.rb

@@ -1,7 +1,7 @@
 module SvnBranch #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/tasks/{create.rake → rails/create.rake}

@@ -19,7 +19,9 @@ namespace :svn do
       puts "ERROR: only perform this operation from the trunk checkout" and next if repo_curr.sub(repo_root, '') != '/trunk'
     
       app_name = ENV['APP_NAME']
-      app_name ||= repo_root.split('/').last
+      app_name ||= repo_root.split('/').reverse.find do |path_part|
+        !%w[trunk repos].include?(path_part)
+      end
     
       curr_path = Dir.pwd
       target_path = File.join(curr_path, '..', "#{app_name}_#{name}")

data/lib/tasks/rubygems/create.rake

@@ -0,0 +1,44 @@
+namespace :svn do
+  namespace :gems do
+    desc 'Creates a new branch using NAME=branch_name'
+    task :create do
+      require 'highline'
+      
+
+      puts "Usage: NAME=branch_name" and next unless name = ENV['NAME']
+
+      svn_info = `svn info`
+      puts "Not under svn; ignoring request" and next unless svn_info
+      repo_root = (svn_info.match(/^Repository Root:\s(.*)$/) || [nil,nil])[1]
+      repo_curr = (svn_info.match(/^URL:\s(.*)$/) || [nil,nil])[1]
+      puts "ERROR: cannot find Repository Root via `svn info`" and next unless repo_root
+      puts "ERROR: cannot find URL via `svn info`" and next unless repo_curr
+      puts "Repository Root: #{repo_root}"
+      puts "Checkout URL:    #{repo_curr}"
+      puts "ERROR: svn project is not setup for branching (needs trunk,branches,tags subfolders)" and next if repo_root == repo_curr
+      puts "ERROR: only perform this operation from the trunk checkout" and next if repo_curr.sub(repo_root, '') != '/trunk'
+    
+      app_name = ENV['APP_NAME']
+      app_name ||= repo_root.split('/').reverse.find do |path_part|
+        !%w[trunk repos].include?(path_part)
+      end
+    
+      curr_path = Dir.pwd
+      target_path = File.expand_path(File.join(curr_path, '..', "#{app_name}_#{name}"))
+      repo_branch = File.join(repo_root, 'branches', name)
+      puts "Current path:    #{curr_path}"
+      puts "*Branch path:    #{target_path}"
+
+      puts "*Repos branch:   #{repo_branch}"
+
+      question = HighLine.new
+      puts "Quitting." and next unless question.agree("Create branch? [y/N]", true)
+      
+      repo_from = repo_curr # TODO allow task to be called from non-trunk to clone branches
+      repo_to   = repo_branch
+      puts `svn copy #{repo_curr} #{repo_to} -m "Branching trunk to #{app_name}"`
+      puts `svn co #{repo_to} #{target_path}`
+      
+    end
+  end
+end

data/lib/tasks/rubygems/merge.rake

@@ -0,0 +1,31 @@
+namespace :svn do
+  namespace :gems do
+    namespace :merge do
+      desc 'Merge branch back into trunk; run from trunk'
+      task :to_trunk do
+        puts "Usage [from trunk dir]: NAME=branch_name" and next unless name = ENV['NAME']
+    
+        svn_info = `svn info`
+        puts "Not under svn; ignoring request" and next unless svn_info
+        repo_root = (svn_info.match(/^Repository Root:\s(.*)$/) || [nil,nil])[1]
+        repo_curr = (svn_info.match(/^URL:\s(.*)$/) || [nil,nil])[1]
+        branch_name = repo_curr.split('/').last
+        repo_branch = "#{repo_root}/branches/#{name}"
+      
+        # get the last r(\d+) number
+        svn_log = `svn log --verbose --stop-on-copy #{repo_branch}`
+        branch_rev = svn_log.scan(/^r(\d+)\s/).last
+        # merge branch_rev:HEAD
+        puts merge = "svn merge -r #{branch_rev}:HEAD #{repo_branch}"
+        puts `#{merge}`
+      
+        # fix conflicts
+      
+        post_merge = ["Now fix up any 'C' conflicts and remove the temporary files",
+          "rake test",
+          "svn commit -m \"Merged branch changes from #{branch_name}; r#{branch_rev}:HEAD\""]
+        post_merge.each_with_index { |help,i| puts "#{i+1}) #{help}" }
+      end
+    end
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>svn_branch</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/svn_branch"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/svn_branch" class="numbers">0.2.1</a>
+      <a href="http://rubyforge.org/projects/svn_branch" class="numbers">0.3.1</a>
     </div>
     <h1>&#x2192; rake svn:branch:create <span class="caps">NAME</span>=branchname</h1>
 
@@ -87,7 +87,7 @@ $ rake gems:link GEM=svn_branch</pre>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 9th May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 10th May 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.1
+rubygems_version: 0.9.4.3
 specification_version: 1
 name: svn_branch
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-06-17 00:00:00 +02:00
+  version: 0.3.1
+date: 2007-10-29 00:00:00 +10:00
 summary: A collection of rake tasks to automate the svn functions within a project, with special support for rails projects.  For example, the creation of new branch, plus for rails apps, a new database.yml and new databases for development and test, for the branch.
 require_paths: 
 - lib
@@ -35,8 +35,10 @@ files:
 - Rakefile
 - lib/svn_branch.rb
 - lib/svn_branch/version.rb
-- lib/tasks/create.rake
-- lib/tasks/merge.rake
+- lib/tasks/rails/create.rake
+- lib/tasks/rails/merge.rake
+- lib/tasks/rubygems/create.rake
+- lib/tasks/rubygems/merge.rake
 - scripts/txt2html
 - setup.rb
 - test/test_helper.rb