smusher 0.4.6 → 0.4.7

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+gem 'rake'
+gem 'json'
+gem 'httpclient'
+
+group :dev do
+  gem 'rake'
+  gem 'rspec', '~>2'
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,30 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    httpclient (2.1.5.2)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  httpclient
+  jeweler
+  json
+  rake
+  rspec (~> 2)

data/Rakefile

@@ -1,20 +1,18 @@
-task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+task :default do
+  sh "rspec spec/"
+end
 
 begin
   require 'jeweler'
-  project_name = 'smusher'
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
+    gem.name = 'smusher'
     gem.summary = "Automatic Lossless Reduction Of All Your Images"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.email = "michael@grosser.it"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
     gem.authors = ["Michael Grosser"]
-    %w[rake json httpclient].each{|d| gem.add_dependency d}
   end
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+end

data/Readme.md

@@ -1,7 +1,7 @@
 *LOSSLESS* image size reduction for jpg, png and gif in the cloud
 
  - no image libraries needed, everything done in the interwebs
- - less size (up 97% saving) = faster downloads = less bandwidth + happy users 
+ - less size (up 97% saving) = faster downloads = less bandwidth + happy users
 
 Install
 =======
@@ -58,11 +58,11 @@ reduce images and minify css + js -> try [reduce](http://github.com/grosser/redu
 
 Authors
 ======
-###Contributors
+### [Contributors](http://github.com/grosser/smusher/contributors)
  - [ahaller](http://ahax.de/)
  - [retr0h](http://geminstallthat.wordpress.com/)
  - [Nate Pickens](http://github.com/npickens)
 
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
 Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/bin/smusher

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'smusher'
 
 options = {}

data/lib/smusher.rb

@@ -25,7 +25,7 @@ module Smusher
       check_options(options)
       puts "THIS FILE IS EMPTY!!! #{file}" and return if size(file).zero?
 
-      with_logging(file,options[:quiet]) do
+      with_logging(file, options[:quiet]) do
         write_optimized_data(file, service)
       end
     end
@@ -43,7 +43,7 @@ module Smusher
 
   def check_options(options)
     known_options = [:convert_gifs, :quiet, :service]
-    if options.detect{|k,v| not known_options.include?(k)}
+    if options.detect{|k,_| not known_options.include?(k)}
       raise "Known options: #{known_options*' '}"
     end
   end
@@ -55,22 +55,26 @@ module Smusher
     raise "Error: empty file downloaded" if optimized.size < MINIMUM_IMAGE_SIZE
     raise "cannot be optimized further" if size(file) == optimized.size
 
-    File.open(file,'wb') {|f| f.write optimized}
+    File.open(file,'wb') {|f| f.write optimized }
 
     if service.converts_gif_to_png? && File.extname(file) == ".gif" && optimized[0..2] != "GIF"
-      `mv #{file} #{file.sub(/.gif$/, '.png')}`
+      result_file = file.sub(/\.gif$/, '.png')
+      `mv #{file} #{result_file}`
+      result_file
+    else
+      file
     end
   end
 
   def sanitize_folder(folder)
-    folder.sub(%r[/$],'')#remove tailing slash
+    folder.sub(%r[/$],'') # remove tailing slash
   end
 
-  def images_in_folder(folder,with_gifs=false)
+  def images_in_folder(folder, with_gifs=false)
     folder = sanitize_folder(folder)
     images = %w[png jpg jpeg JPG]
     images << 'gif' if with_gifs
-    images.map! {|ext| "#{folder}/**/*.#{ext}"}
+    images.map! {|ext| "#{folder}/**/*.#{ext}" }
     FileList[*images]
   end
 
@@ -78,17 +82,27 @@ module Smusher
     File.exist?(file) ? File.size(file) : 0
   end
 
-  def with_logging(file,quiet)
-    puts "smushing #{file}" unless quiet
-
-    before = size(file)
-    begin; yield; rescue; puts $! unless quiet; end
-    after = size(file)
+  def with_logging(file, quiet)
+    if quiet
+      yield rescue nil
+    else
+      puts "smushing #{file}"
+
+      before = size(file)
+
+      # notify user about changed file
+      begin
+        result_file = yield
+        puts "--> #{result_file}" if file != result_file
+        file = result_file
+      rescue
+        puts $!
+      end
 
-    unless quiet
+      after = size(file)
       result = "#{(100*after)/before}%"
       puts "#{before} -> #{after}".ljust(40) + " = #{result}"
       puts ''
     end
   end
-end
+end

data/smusher.gemspec

@@ -1,63 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{smusher}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2011-03-15}
   s.default_executable = %q{smusher}
-  s.email = %q{grosser.michael@gmail.com}
+  s.email = %q{michael@grosser.it}
   s.executables = ["smusher"]
   s.files = [
-    ".gitignore",
-     "Rakefile",
-     "Readme.md",
-     "VERSION",
-     "bin/smusher",
-     "lib/smusher.rb",
-     "lib/smusher/puny_png.rb",
-     "lib/smusher/smush_it.rb",
-     "smusher.gemspec",
-     "spec/empty/.gitignore",
-     "spec/images/ad.gif",
-     "spec/images/add.png",
-     "spec/images/drink_empty.png",
-     "spec/images/logo.gif",
-     "spec/images/people.jpg",
-     "spec/images/water.JPG",
-     "spec/images/woman.jpeg",
-     "spec/out/ad.gif",
-     "spec/out/people.jpg",
-     "spec/reduced/add.png",
-     "spec/reduced/add_puny.png",
-     "spec/reduced/fam.png",
-     "spec/smusher/puny_png_spec.rb",
-     "spec/smusher/smush_it_spec.rb",
-     "spec/smusher_spec.rb",
-     "spec/spec_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "Readme.md",
+    "VERSION",
+    "bin/smusher",
+    "lib/smusher.rb",
+    "lib/smusher/puny_png.rb",
+    "lib/smusher/smush_it.rb",
+    "smusher.gemspec",
+    "spec/empty/.gitignore",
+    "spec/images/ad.gif",
+    "spec/images/add.png",
+    "spec/images/drink_empty.png",
+    "spec/images/logo.gif",
+    "spec/images/people.jpg",
+    "spec/images/water.JPG",
+    "spec/images/woman.jpeg",
+    "spec/out/ad.gif",
+    "spec/out/people.jpg",
+    "spec/reduced/add.png",
+    "spec/reduced/add_puny.png",
+    "spec/reduced/fam.png",
+    "spec/smusher/puny_png_spec.rb",
+    "spec/smusher/smush_it_spec.rb",
+    "spec/smusher_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/grosser/smusher}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Automatic Lossless Reduction Of All Your Images}
   s.test_files = [
     "spec/smusher/puny_png_spec.rb",
-     "spec/smusher/smush_it_spec.rb",
-     "spec/smusher_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/smusher/smush_it_spec.rb",
+    "spec/smusher_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<httpclient>, [">= 0"])

data/spec/smusher_spec.rb

@@ -170,7 +170,7 @@ describe :smusher do
   describe :logging do
     it "yields" do
       val = 0
-      Smusher.send(:with_logging,@file,false) {val = 1}
+      Smusher.send(:with_logging, @file, false) {val = 1; @file}
       val.should == 1
     end
   end
@@ -178,4 +178,4 @@ describe :smusher do
   it "has a VERSION" do
     Smusher::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smusher
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,47 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2011-03-15 00:00:00 +01:00
 default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id001
+  type: :runtime
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id002
+  type: :runtime
+  name: json
 - !ruby/object:Gem::Dependency 
-  name: httpclient
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id003
+  type: :runtime
+  name: httpclient
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: 
 - smusher
 extensions: []
@@ -62,7 +69,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -93,28 +101,32 @@ homepage: http://github.com/grosser/smusher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Automatic Lossless Reduction Of All Your Images

data/.gitignore

@@ -1,2 +0,0 @@
-Manifest
-pkg