middleman-favicon-maker 3.0.0 → 3.0.1

data/Gemfile

@@ -6,10 +6,8 @@ gemspec
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
+group :development, :test do
+  gem "rake"
+  gem "shoulda"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.4"
-  gem "jeweler", "~> 1.8.4"
-  gem "simplecov"
 end

data/README.md

@@ -2,7 +2,7 @@ middleman-favicon-maker
 =======================
 Generate favicon files in various sizes from a base image in your [Middleman](http://middlemanapp.com/) project.
 
-This gem integrates []FaviconMaker](https://github.com/follmann/favicon_maker) effortless into your [Middleman](https://github.com/middleman/middleman) project.
+This gem integrates [FaviconMaker](https://github.com/follmann/favicon_maker) effortless into your [Middleman](https://github.com/middleman/middleman) project.
 
 
 ## IMPORTANT:
@@ -62,7 +62,7 @@ You can set the following options for `middleman-favicon-maker`:
     :favicon_maker_base_image # default: "favicon_base.png"
     :favicon_maker_versions # default: ::FaviconMaker::Generator::ICON_VERSIONS.keys
     :favicon_maker_custom_versions # default: {}
-    
+
     e.g.
     set :favicon_maker_input_dir, "favicons"
     set :favicon_maker_custom_versions, {:apple_extreme_retina => {:filename => "apple-touch-icon-228x228-precomposed.png", :dimensions => "228x228", :format => "png"}}

data/Rakefile

@@ -1,29 +1,9 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "middleman-favicon-maker"
-  gem.homepage    = "https://github.com/follmann/middleman-favicon-maker"
-  gem.summary     = %q{Generate favicon files in various sizes from a base image in your Middleman project}
-  gem.description = %q{Generate favicon files in various sizes from a base image in your Middleman project}
-  gem.authors     = ["Andreas Follmann", "Kematzy"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require File.expand_path('../lib/middleman-favicon-maker/version', __FILE__)
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
@@ -34,10 +14,8 @@ task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "middleman-favicon-maker #{version}"
+  rdoc.title = "middleman-favicon-maker #{Middleman::FaviconMaker::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/middleman-favicon-maker/extension.rb

@@ -2,55 +2,42 @@ module Middleman
   module FaviconMaker
     class << self
       def registered(app, options={})
-        app.set :favicon_maker_root_dir,        ""
-        app.set :favicon_maker_input_dir,       ""
-        app.set :favicon_maker_output_dir,      ""
-        app.set :favicon_maker_base_image,      "favicon_base.png"
-        app.set :favicon_maker_versions,        []
-        app.set :favicon_maker_custom_versions, {}
-        
+        require "favicon_maker"
+
+        options[:favicon_maker_root_dir]        ||= ''
+        options[:favicon_maker_input_dir]       ||= ''
+        options[:favicon_maker_output_dir]      ||= ''
+        options[:favicon_maker_base_image]      ||= 'favicon_base.png'
+        options[:favicon_maker_versions]        ||= ::FaviconMaker::Generator::ICON_VERSIONS.keys
+        options[:favicon_maker_custom_versions] ||= {}
+
         app.after_configuration do
           # configs are either default or set by user in config.rb
           # due to Middleman extension limitations, we need to ensure they are sane
           # before we continue
-          app.set :favicon_maker_root_dir,    root                if favicon_maker_root_dir.empty?
-          app.set :favicon_maker_input_dir,   source              if favicon_maker_input_dir.empty?
-          app.set :favicon_maker_output_dir,  build_dir           if favicon_maker_output_dir.empty?
-          app.set :favicon_maker_base_image,  "favicon_base.png"  if favicon_maker_base_image.empty?
-          
-          unless favicon_maker_root_dir.empty?
-            require "favicon_maker"
-            if favicon_maker_versions.empty?
-              app.set :favicon_maker_versions,    ::FaviconMaker::Generator::ICON_VERSIONS.keys
-            end
-          end
-          
+          options[:favicon_maker_root_dir]   = root      if options[:favicon_maker_root_dir].empty?
+          options[:favicon_maker_input_dir]  = source    if options[:favicon_maker_input_dir].empty?
+          options[:favicon_maker_output_dir] = build_dir if options[:favicon_maker_output_dir].empty?
         end
-        
+
         app.after_build do |builder|
-          
           ::FaviconMaker::Generator.create_versions({
-            :root_dir => favicon_maker_root_dir,
-            :input_dir => favicon_maker_input_dir,
-            :output_dir => favicon_maker_output_dir,
-            :base_image => favicon_maker_base_image,
-            :versions => favicon_maker_versions,
-            :custom_versions => favicon_maker_custom_versions,
-            :copy => true
+            :root_dir =>        options[:favicon_maker_root_dir],
+            :input_dir =>       options[:favicon_maker_input_dir],
+            :output_dir =>      options[:favicon_maker_output_dir],
+            :base_image =>      options[:favicon_maker_base_image],
+            :versions =>        options[:favicon_maker_versions],
+            :custom_versions => options[:favicon_maker_custom_versions],
+            :copy =>            true
           }) do |f|
             builder.say_status :generated, f.gsub(root + "/", "")
           end
-          
+
           # remove favicon_base_image from the build dir
-          builder.remove_file File.join(favicon_maker_root_dir, favicon_maker_output_dir, favicon_maker_base_image)
-          
+          builder.remove_file File.join(options[:favicon_maker_root_dir], options[:favicon_maker_output_dir], options[:favicon_maker_base_image])
         end
-        
       end
       alias :included :registered
-      
     end
-    
   end
-  
 end

data/lib/middleman-favicon-maker/version.rb

@@ -1,5 +1,10 @@
 module Middleman
   module FaviconMaker
-    VERSION = "3.0.0"
+    MAJOR = 3
+    MINOR = 0
+    PATCH = 1
+    BUILD =  nil
+
+    VERSION = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end
 end

data/middleman-favicon-maker.gemspec

@@ -2,22 +2,23 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "middleman-favicon-maker/version"
 
-Gem::Specification.new do |s|
-  s.name        = "middleman-favicon-maker"
-  s.version     = Middleman::FaviconMaker::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Andreas Follmann", "Kematzy"]
-  #s.email       = [""]
-  s.homepage    = "https://github.com/follmann/middleman-favicon-maker"
-  s.summary     = %q{Generate favicon files in various sizes from a base image in your Middleman project}
-  s.description = %q{Generate favicon files in various sizes from a base image in your Middleman project}
+Gem::Specification.new do |gem|
+  gem.name          = "middleman-favicon-maker"
+  gem.email         = ["hello@toyrocketscience.com"]
+  gem.version       = Middleman::FaviconMaker::VERSION
+  gem.platform      = Gem::Platform::RUBY
+  gem.authors       = ["Andreas Follmann", "Kematzy"]
+  gem.email         = ["andreas@toyrocketscience.com"]
+  gem.homepage      = "https://github.com/follmann/middleman-favicon-maker"
+  gem.summary       = %q{Generate favicon files in various sizes from a base image in your Middleman project}
+  gem.description   = %q{Generate favicon files in various sizes from a base image in your Middleman project}
+
+  gem.files         = `git ls-files`.split($\)
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
   # Additional dependencies
-  s.add_runtime_dependency("middleman-core", [">= 3.0.0"])
-  s.add_runtime_dependency("favicon_maker", ["~>0.0.7"])
-end
+  gem.add_runtime_dependency("middleman-core", [">= 3.0.0"])
+  gem.add_runtime_dependency("favicon_maker", ["~>0.0.7"])
+end

data/test/test_middleman-favicon-maker.rb

@@ -2,6 +2,7 @@ require 'helper'
 
 class TestMiddlemanFaviconMaker < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+    # FIXME
+    # flunk "hey buddy, you should probably rename this file and start testing for real"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-favicon-maker
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -46,7 +46,8 @@ dependencies:
         version: 0.0.7
 description: Generate favicon files in various sizes from a base image in your Middleman
   project
-email: 
+email:
+- andreas@toyrocketscience.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -56,7 +57,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/middleman-favicon-maker.rb
 - lib/middleman-favicon-maker/extension.rb
 - lib/middleman-favicon-maker/version.rb
@@ -76,12 +76,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4407961007158755037
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4407961007158755037
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/VERSION

@@ -1 +0,0 @@
-3.0.0