.gitignore @@ -8,11 +8,6 @@ require 'mini_magick' desc 'Default: run unit tests.' task :default => :test -desc 'Clean generated files.' -task :clean => :clobber_rdoc do - rm FileList['test/output/*.png'] -end - desc 'Test the mini_magick plugin.' Rake::TestTask.new(:test) do |t| t.libs << 'lib' @@ -30,11 +25,15 @@ Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end -desc 'Update gemspec.' -task :update_gemspec => :clean do - files = `git-ls-files`.split - data = File.read('mini_magick.gemspec') - data.sub!(/^ s.version = .*$/, " s.version = #{MiniMagick::VERSION.inspect}") - data.sub!(/^ s.files = .*$/, " s.files = %w(#{files.join(' ')})") - open('mini_magick.gemspec', 'w'){|f| f.write(data)} -end +begin + require 'jeweler' + Jeweler::Tasks.new do |gemspec| + gemspec.name = "mini_magick" + gemspec.summary = "Manipulate images with minimal use of memory." + gemspec.email = "probablycorey@gmail.com" + gemspec.homepage = "http://github.com/probablycorey/mini_magick" + gemspec.authors = ["Corey Johnson"] + end +rescue LoadError + puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" +end \ No newline at end of file Rakefile @@ -1 +1 @@ -0.0.0 +1.2.5 \ No newline at end of file VERSION @@ -8,8 +8,6 @@ require File.join(File.dirname(__FILE__), '/image_temp_file') module MiniMagick class MiniMagickError < RuntimeError; end - VERSION = '1.2.5' - class Image attr :path attr :tempfile @@ -87,13 +85,13 @@ module MiniMagick old_path = @path.dup @path.sub!(/(\.\w+)?$/, ".#{format}") - File.unlink(old_path) unless old_path == @path + File.delete(old_path) unless old_path == @path unless File.exists?(@path) begin FileUtils.copy_file(@path.sub(".#{format}", "-#{page}.#{format}"), @path) - rescue => ex - raise MiniMagickError, "Unable to format to #{format}; #{ex}" unless File.exist?(@path) + rescue e + raise MiniMagickError, "Unable to format to #{format}; #{e}" unless File.exist?(@path) end end ensure @@ -143,9 +141,13 @@ module MiniMagick end def run_command(command, *args) - args.collect! do |arg| - # values quoted because they can contain characters like '>', but don't quote switches - arg =~ /^\+|\-/) ? %|"#{arg}"| : arg.to_s + args.collect! do |arg| + # args can contain characters like '>' so we must escape them, but don't quote switches + if arg !~ /^\+|\-/ + "\"#{arg}\"" + else + arg.to_s + end end command = "#{command} #{args.join(' ')}" lib/mini_magick.rb @@ -1,18 +1,52 @@ -Gem::Specification.new do |s| - s.platform = Gem::Platform::RUBY - s.name = 'mini_magick' - s.version = "1.5" - s.summary = "Manipulate images with minimal use of memory." - s.description = %q{Uses command-line ImageMagick tools to resize, rotate, and mogrify images.} +# -*- encoding: utf-8 -*- - s.author = "Corey Johnson" - s.email = "probablycorey@gmail.com" - s.rubyforge_project = 'mini_magick' - s.homepage = "http://github.com/probablycorey/mini_magick" +Gem::Specification.new do |s| + s.name = %q{mini_magick} + s.version = "1.2.5" + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Corey Johnson"] + s.date = %q{2009-05-27} + s.email = %q{probablycorey@gmail.com} + s.extra_rdoc_files = [ + "README.rdoc" + ] + s.files = [ + "MIT-LICENSE", + "README.rdoc", + "Rakefile", + "VERSION", + "lib/image_temp_file.rb", + "lib/mini_magick.rb", + "test/actually_a_gif.jpg", + "test/animation.gif", + "test/command_builder_test.rb", + "test/image_temp_file_test.rb", + "test/image_test.rb", + "test/leaves.tiff", + "test/not_an_image.php", + "test/simple.gif", + "test/trogdor.jpg" + ] s.has_rdoc = true - s.requirements << 'none' - s.require_path = 'lib' + s.homepage = %q{http://github.com/probablycorey/mini_magick} + s.rdoc_options = ["--charset=UTF-8"] + s.require_paths = ["lib"] + s.rubygems_version = %q{1.3.1} + s.summary = %q{Manipulate images with minimal use of memory.} + s.test_files = [ + "test/command_builder_test.rb", + "test/image_temp_file_test.rb", + "test/image_test.rb" + ] + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 2 - s.files = %w(.gitignore MIT-LICENSE README.rdoc Rakefile lib/image_temp_file.rb lib/mini_magick.rb mini_magick.gemspec test/actually_a_gif.jpg test/animation.gif test/command_builder_test.rb test/image_temp_file_test.rb test/image_test.rb test/leaves.tiff test/not_an_image.php test/simple.gif test/trogdor.jpg) + if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + else + end + else + end end mini_magick.gemspec 591f963f0d4ef5761bce880256c3d87a9623b6f3 Corey Johnson probablycorey@gmail.com http://github.com/probablycorey/mini_magick/commit/4956b901514a30056c8a8f1befb65594cb64a0e3 4956b901514a30056c8a8f1befb65594cb64a0e3 2009-05-27T10:08:15-07:00 2009-05-27T10:08:15-07:00 added jewler support 36731e9811e2ab4e8655fa8f42df401033ae210e Corey Johnson probablycorey@gmail.com