COPYING.txt @@ -1,3 +1,12 @@ +=== 0.0.2 / 2008-12-19 + +* 2 major fixes + + * Fixed test parameters + + * Fixed script handling of relative file names + + === 0.0.1 / 2008-09-08 * 1 major enhancement History.txt Manifest.txt README.txt Rakefile @@ -54,7 +54,7 @@ require 'rdoc/usage' require 'yaml' class Frame - VERSION = "0.0.1" + VERSION = "0.0.2" def initialize (arguments) @arguments = arguments lib/frame.rb @@ -102,20 +102,30 @@ class Move end def file_of_status file, status - "#{status}/#{File.basename(file)}" + "#{@project_dir}/#{status}/#{File.basename(file)}" end def file_path_in_project name # Default to preparatory if no directory provided + # FIXME add absolute and relative paths if name.index('/') == nil - "preparatory/" + name + "#{@project_dir}/preparatory/" + name else name end end def process_arguments - @work = file_path_in_project @arguments[0] + if File.dirname(@arguments[0]) == "." + # filename only + @work = "#{@project_dir}/preparatory/#{@arguments[0]}" + elsif @arguments[0].index(@project_dir) != nil # Robustify me + # absolute path + @work = @arguments[0] + else + # status/filename + @work = "#{@project_dir}/#{@arguments[0]}" + end @destination = file_of_status @work, @status end lib/move.rb @@ -77,7 +77,16 @@ class Work opts.on('-v', '--version') { output_version ; exit 0 } opts.on('-h', '--help') { output_help } opts.on('-c FILE', '--copy FILE') do |source| - @source_work_name = "#{@work_dir}/#{source}" + if File.dirname(source) == "." + # filename only + @source_work_name = "#{@work_dir}/#{source}" + elsif source.index(@project_dir) != nil # Robustify me + # absolute path + @source_work_name = source + else + # status/filename + @source_work_name = "#{@project_dir}/#{source}" + end end # This consumes matched arguments from @arguments opts.parse!(@arguments) rescue return false lib/work.rb templates/template.psd templates/template.svg @@ -26,7 +26,7 @@ end # Test making a project -Kernel.system '../bin/frame', 'test_project' +Kernel.system 'bin/frame', 'test_project' raise "Couldn't make test project." unless File.exist? './test_project' @@ -34,32 +34,32 @@ raise "Couldn't make test project." unless File.exist? './test_project' Kernel.system 'test_project/script/work', 'work.svg' raise "Couldn't make test svg work." unless - File.exist? './test_project/preparatory/work.svg' + File.exist? 'test_project/preparatory/work.svg' Kernel.system 'test_project/script/work', '-c', 'work.svg', 'work2.svg' raise "Couldn't make relative test svg work copy." unless - File.exist? './test_project/preparatory/work2.svg' + File.exist? 'test_project/preparatory/work2.svg' Kernel.system 'test_project/script/work', '-c', - './test_project/preparatory/work2.svg', 'work3.svg' + 'preparatory/work2.svg', 'work3.svg' raise "Couldn't make absolute test svg work copy." unless - File.exist? './test_project/preparatory/work3.svg' + File.exist? 'test_project/preparatory/work3.svg' # Test Move Kernel.system 'test_project/script/move', '--discard', 'work2.svg' raise "Couldn't move work to discard." unless - File.exist? './test_project/final/work2.svg' + File.exist? 'test_project/discard/work2.svg' Kernel.system 'test_project/script/move', '--final', 'work3.svg' raise "Couldn't move work to final." unless - File.exist? './test_project/final/work3.svg' + File.exist? 'test_project/final/work3.svg' Kernel.system 'test_project/script/move', '--discard', 'work.svg' -Kernel.system 'test_project/script/move', '--preparatory', 'work.svg' +Kernel.system 'test_project/script/move', '--preparatory', 'discard/work.svg' raise "Couldn't move work back to preparatory." unless - File.exist? './test_project/final/work.svg' + File.exist? 'test_project/preparatory/work.svg' # Test Release test/test_frame.rb 0ee26e5ab2e328c282d0d03f07edd854566e9ea8 Rob Myers rob@robmeyrs.org http://github.com/robmyers/frame/commit/00efba16d6fa07be6923135d6003df31256f97bf 00efba16d6fa07be6923135d6003df31256f97bf 2008-12-19T15:25:13-08:00 2008-12-19T15:25:13-08:00 Fixed the test suite and handling of relative paths. 9cc6d4120a641f9641b8e76c1b5e1aca3b309518 Rob Myers rob@robmeyrs.org