@@ -77,7 +77,7 @@ class Move opts = OptionParser.new opts.on('-v', '--version') { output_version ; exit 0 } opts.on('-h', '--help') { output_help } - opts.on('-d', '--discard') { @status = 'discard' } + opts.on('-d', '--discard') { @status = 'discard' } opts.on('-f', '--final') { @status = 'final' } opts.on('-p', '--preparatory') { @status = 'preparatory' } # This consumes matched arguments from @arguments @@ -146,8 +146,8 @@ class Move end def move_work_in_version_control - Kernel.system("git mv #{@work} #{@destination}") if using_git? - Kernel.system("svn mv #{@work} #{@destination}") if using_svn? + Kernel.system("git", "mv", "#{@work} #{@destination}") if using_git? + Kernel.system("svn", "mv", "#{@work} #{@destination}") if using_svn? end def process_command generator/move.rb @@ -194,7 +194,6 @@ class ArtProject FileUtils.mkdir_p @version_control_dir + '/tags' end - FileUtils.mkdir_p @project_dir + "/discard" FileUtils.mkdir_p @project_dir + "/final" FileUtils.mkdir_p @project_dir + "/preparatory" @@ -256,7 +255,7 @@ class ArtProject @project.remote_repository, "-m", "Checkin of generated directory structure.") FileUtils.remove_entry_secure(@version_control_dir) - Kernel.system('svn', 'checkout', @project.remote_repository, + Kernel.system('svn', 'checkout', "#{@project.remote_repository}/trunk", @project.name) end end generator/project.rb @@ -134,8 +134,8 @@ class ArtWork end def add_work_to_version_control - Kernel.system("git add #{@destination_work_name}") if using_git? - Kernel.system("svn add #{@destination_work_name}") if using_svn? + Kernel.system("git", "add", "#{@destination_work_name}") if using_git? + Kernel.system("svn", "add", "#{@destination_work_name}") if using_svn? end def process_command generator/work.rb 0f0d04946732fed282e0b007717fe787205f9a52 Rob Myers rob@robmyers.org http://github.com/robmyers/art_generators/commit/de13b8ba518feafd143c4017c1109d9b91028f1c de13b8ba518feafd143c4017c1109d9b91028f1c 2008-09-01T13:25:03-07:00 2008-09-01T13:25:03-07:00 Fixed svn handling, tidied up some formatting. 1cf8e38ed9b13cf79ef39e291e0ed20c345685a7 Rob Myers rob@robmyers.org