From 517fd2f3d354fb2c411d872187de12a92c992456 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Thu, 3 Mar 2011 09:25:01 +1100
Subject: Fixed #6566 Replace ftools with filetuils in rake gem task

ftools is used in the rake gem rasks. It is deprecated in
Ruby 1.9.x and so we've replaced it with FileUtils.
---
 tasks/rake/gem.rake | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tasks')

diff --git a/tasks/rake/gem.rake b/tasks/rake/gem.rake
index d654886ae..efea73882 100644
--- a/tasks/rake/gem.rake
+++ b/tasks/rake/gem.rake
@@ -1,4 +1,4 @@
-require 'ftools'
+require 'fileutils'
 
 GEM_FILES = FileList[
     '[A-Z]*',
@@ -44,7 +44,7 @@ end
 desc "Prepare binaries for gem creation"
 task :prepare_gem do
     SBIN.each do |f|
-      File.copy(f,"bin")
+      FileUtils.copy(f,"bin")
     end
 end
 
@@ -52,8 +52,9 @@ desc "Create the gem"
 task :create_gem => :prepare_gem do
     Dir.mkdir("pkg") rescue nil
     Gem::Builder.new(spec).build
-    File.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
+    FileUtils.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
     SBIN.each do |f|
-       File.unlink("bin/" + f.gsub(/sbin\//, ''))
+       fn = f.gsub(/sbin\/(.*)/, '\1')
+       FileUtils.rm_r "bin/" + fn
     end
 end
-- 
cgit 


From d448763f6e94709b688e12f2a0edc589cf38e6fa Mon Sep 17 00:00:00 2001
From: Matt Robinson <matt@puppetlabs.com>
Date: Tue, 22 Mar 2011 00:54:09 -0700
Subject: (#6566) Fix ruby 1.9 incompatible case statement

Once the futils area of the Rakefile was fixed, running `rake spec`
turned up this problem.
---
 tasks/rake/git_workflow.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tasks')

diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
index 1ba57c1aa..68a4d4a59 100644
--- a/tasks/rake/git_workflow.rake
+++ b/tasks/rake/git_workflow.rake
@@ -6,8 +6,8 @@ def find_start(start)
 # This is a case statement, as we might want to map certain
 # git tags to starting points that are not currently in git.
 	case start
-		when nil?:
-		when @next_release: return "master"
+		when nil?;
+		when @next_release; return "master"
 		else return start
 	end
 end
-- 
cgit 


From 4156edc25b3ad95df6ed0eaa302ec06db2ba303b Mon Sep 17 00:00:00 2001
From: Matt Robinson <matt@puppetlabs.com>
Date: Tue, 22 Mar 2011 00:55:31 -0700
Subject: (#6566) Replace tabs with spaces

---
 tasks/rake/git_workflow.rake | 100 +++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

(limited to 'tasks')

diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
index 68a4d4a59..75dc8833a 100644
--- a/tasks/rake/git_workflow.rake
+++ b/tasks/rake/git_workflow.rake
@@ -5,82 +5,82 @@
 def find_start(start)
 # This is a case statement, as we might want to map certain
 # git tags to starting points that are not currently in git.
-	case start
-		when nil?;
-		when @next_release; return "master"
-		else return start
-	end
+  case start
+    when nil?;
+    when @next_release; return "master"
+    else return start
+  end
 end
 
 desc "Set up git for working with Puppet"
 task :git_setup do
-	# This should be changed as new versions get released
-	@next_release = '0.26.x'
-	@remote = {}
-	default_remote = {}
-	default_remote[:url] = 'git://github.com/reductivelabs/puppet'
-	default_remote[:name] = 'origin'
-	@remote[:name] = %x{git config puppet.defaultremote}.chomp
-	@remote[:name] = @remote[:name].empty? ? default_remote[:name] : @remote[:name]
-	@remote[:url] = default_remote[:url] if @remote[:name] == default_remote[:name]
-	default_fetch = '+refs/heads/*:refs/remotes/puppet/*'
-	@remote[:fetch] = %x{git config puppet.#{@remote[:name]}.fetch}.chomp
-	@remote[:fetch] = @remote[:fetch].empty? ?  default_fetch : @remote[:fetch]
+  # This should be changed as new versions get released
+  @next_release = '0.26.x'
+  @remote = {}
+  default_remote = {}
+  default_remote[:url] = 'git://github.com/reductivelabs/puppet'
+  default_remote[:name] = 'origin'
+  @remote[:name] = %x{git config puppet.defaultremote}.chomp
+  @remote[:name] = @remote[:name].empty? ? default_remote[:name] : @remote[:name]
+  @remote[:url] = default_remote[:url] if @remote[:name] == default_remote[:name]
+  default_fetch = '+refs/heads/*:refs/remotes/puppet/*'
+  @remote[:fetch] = %x{git config puppet.#{@remote[:name]}.fetch}.chomp
+  @remote[:fetch] = @remote[:fetch].empty? ?  default_fetch : @remote[:fetch]
 end
 
 desc "Start work on a feature"
 task :start_feature, [:feature,:remote,:branch] => :git_setup do |t, args|
-	args.with_defaults(:remote => @remote[:name])
-	args.with_defaults(:branch => @next_release)
-	start_at = find_start(args.branch)
-	branch = "feature/#{start_at}/#{args.feature}"
-	sh "git checkout -b #{branch} #{start_at}" do |ok, res|
-		if ! ok
-			raise <<EOS
+  args.with_defaults(:remote => @remote[:name])
+  args.with_defaults(:branch => @next_release)
+  start_at = find_start(args.branch)
+  branch = "feature/#{start_at}/#{args.feature}"
+  sh "git checkout -b #{branch} #{start_at}" do |ok, res|
+    if ! ok
+      raise <<EOS
 Was not able to create branch for #{args.feature} on branch #{args.branch}, starting at #{start_at}: error code was: #{res.exitstatus}
 EOS
-		end
-	end
-	sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
-		raise "Could not set remote: #{$?}" unless ok
-	end
-
-	sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
-		raise "Could not configure merge: #{$?}" unless ok
-	end
+    end
+  end
+  sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
+    raise "Could not set remote: #{$?}" unless ok
+  end
+
+  sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
+    raise "Could not configure merge: #{$?}" unless ok
+  end
 end
 
 desc "Do git prep to start work on a Redmine ticket"
 task :start_ticket, [:ticket, :remote, :branch] => :git_setup do |t, args|
-	args.with_defaults(:remote => @remote[:name])
-	args.with_defaults(:branch => @next_release)
-	start_at = find_start(args.branch)
-	branch = "tickets/#{start_at}/#{args.ticket}"
-	sh "git checkout -b #{branch} #{start_at}" do |ok, res|
-		unless ok
-			raise <<EOS
+  args.with_defaults(:remote => @remote[:name])
+  args.with_defaults(:branch => @next_release)
+  start_at = find_start(args.branch)
+  branch = "tickets/#{start_at}/#{args.ticket}"
+  sh "git checkout -b #{branch} #{start_at}" do |ok, res|
+    unless ok
+      raise <<EOS
 Was not able to create branch for ticket #{args.ticket} on branch #{args.branch}, starting at #{start_at}: error code was: #{$?}
 Git command used was: #{command}
 EOS
-		end
-	end
+    end
+  end
     sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
-    	raise "Could not set remote: #{$?}" unless ok
-	end
+      raise "Could not set remote: #{$?}" unless ok
+  end
 
     sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
-    	raise "Could not configure merge: #{$?}" unless ok
-	end
+      raise "Could not configure merge: #{$?}" unless ok
+  end
 end
 
 # This isn't very useful by itself, but we might enhance it later, or use it
 # in a dependency for a more complex task.
 desc "Push out changes"
 task :push_changes, [:remote] do |t, arg|
-	branch = %x{git branch | grep "^" | awk '{print $2}'}
-	sh "git push #{arg.remote} #{branch}" do |ok, res|
-		raise "Unable to push to #{arg.remote}" unless ok
-	end
+  branch = %x{git branch | grep "^" | awk '{print $2}'}
+  sh "git push #{arg.remote} #{branch}" do |ok, res|
+    raise "Unable to push to #{arg.remote}" unless ok
+  end
 end
 
 desc "Send patch information to the puppet-dev list"
-- 
cgit