montage 0.3.0 → 0.4.0

data/Rakefile

@@ -24,10 +24,13 @@ begin
     gem.add_dependency 'highline', '>= 1.5'
 
     # Development dependencies.
-    gem.add_development_dependency 'rspec',    '>= 1.3.0'
-    gem.add_development_dependency 'open4',    '>= 1.0'
-    gem.add_development_dependency 'haml',     '>= 3.0.0.beta.1'
-    gem.add_development_dependency 'yard',     '>= 0.5'
+    gem.add_development_dependency 'rspec-core',         '>= 2.0.0.beta.12'
+    gem.add_development_dependency 'rspec-expectations', '>= 2.0.0.beta.12'
+    gem.add_development_dependency 'rspec-mocks',        '>= 2.0.0.beta.12'
+
+    gem.add_development_dependency 'open4', '>= 1.0'
+    gem.add_development_dependency 'haml',  '>= 3.0.0.beta.1'
+    gem.add_development_dependency 'yard',  '>= 0.5'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/montage/core_ext.rb

@@ -1,3 +1,4 @@
+# Some simple string extensions to make things easier.
 class String
 
   # Replace sequences of whitespace (including newlines) with either
@@ -8,13 +9,10 @@ class String
   #     FROM users
   #   QUERY => "SELECT name FROM users"
   #
-  # @param [TrueClass, FalseClass] spaced (default=true)
-  #   Determines whether returned string has whitespace collapsed or removed
-  #
   # @return [String] Receiver with whitespace (including newlines) replaced
   #
-  def compress_lines(spaced = true)
-    split($/).map { |line| line.strip }.join(spaced ? ' ' : '')
+  def compress_lines
+    split($/).map { |line| line.strip }.join(' ')
   end
 
   # Removes leading whitespace from each line, such as might be added when

data/lib/montage/sprite.rb

@@ -91,10 +91,15 @@ module Montage
         MESSAGE
       end
 
-      list = @sources.inject(Magick::ImageList.new) do |list, source|
+      list = Magick::ImageList.new
+
+      @sources.each do |source|
         list << source.image
-        list << Magick::Image.new(1, @padding) do
-          self.background_color = '#FFF0'
+
+        if @padding and @padding > 0
+          list << Magick::Image.new(1, @padding) do
+            self.background_color = '#FFF0'
+          end
         end
       end
 

data/lib/montage/sprite_definition.rb

@@ -48,10 +48,9 @@ module Montage
           option; please use only one.
         ERROR
       elsif not has_name_segment? and not @options.has_key?(:name)
-        raise Montage::MissingName, <<-ERROR.compress_lines
-          Sprite `#{path}' requires a name. Add a :name path segment
-          or add a "name" option.
-        ERROR
+        # Infer the sprite name from the filename.
+        @options[:name] =
+          File.basename(@options[:to], File.extname(@options[:to]))
       elsif has_name_segment? and not @options[:to] =~ /:name/
         raise Montage::MissingName, <<-ERROR.compress_lines
           Sprite `#{path}' requires :name in the "to" option.

data/montage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{montage}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Williams"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{montage}
   s.description = %q{Even Rocky had a montage.}
   s.email = %q{hi@antw.me}
@@ -68,7 +68,6 @@ Gem::Specification.new do |s|
      "spec/montage/sprite_definition_spec.rb",
      "spec/montage/sprite_spec.rb",
      "spec/rcov.opts",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/spec.rake",
      "tasks/yard.rake"
@@ -77,7 +76,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/antw/montage}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Montage}
   s.test_files = [
     "spec/lib/command_runner.rb",
@@ -101,17 +100,21 @@ Gem::Specification.new do |s|
     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<rmagick>, [">= 2.12"])
       s.add_runtime_dependency(%q<highline>, [">= 1.5"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
       s.add_development_dependency(%q<open4>, [">= 1.0"])
       s.add_development_dependency(%q<haml>, [">= 3.0.0.beta.1"])
       s.add_development_dependency(%q<yard>, [">= 0.5"])
     else
       s.add_dependency(%q<rmagick>, [">= 2.12"])
       s.add_dependency(%q<highline>, [">= 1.5"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
       s.add_dependency(%q<open4>, [">= 1.0"])
       s.add_dependency(%q<haml>, [">= 3.0.0.beta.1"])
       s.add_dependency(%q<yard>, [">= 0.5"])
@@ -119,7 +122,9 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rmagick>, [">= 2.12"])
     s.add_dependency(%q<highline>, [">= 1.5"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
     s.add_dependency(%q<open4>, [">= 1.0"])
     s.add_dependency(%q<haml>, [">= 3.0.0.beta.1"])
     s.add_dependency(%q<yard>, [">= 0.5"])

data/spec/lib/command_runner.rb

@@ -54,7 +54,7 @@ module Montage
       #
       def run(command, &block)
         if command =~ /^montage(.*)$/
-          command = "#{RUBY} -rubygems #{EXECUTABLE}#{$1} --no-color"
+          command = "#{RUBY} #{EXECUTABLE}#{$1} --no-color"
         end
 
         @status, @stderr, @stdout = nil, nil, nil

data/spec/lib/have_public_method_defined.rb

@@ -1,4 +1,4 @@
-::Spec::Matchers.define :have_public_method_defined do |value|
+::RSpec::Matchers.define :have_public_method_defined do |value|
   match do |klass|
     klass.public_method_defined?(value.to_sym)
   end

data/spec/lib/shared_project_specs.rb

@@ -1,4 +1,4 @@
-describe 'a project with correct paths', :shared => true do
+shared_examples_for 'a project with correct paths' do
   # Requires:
   #
   #   @project => Montage::Project

data/spec/lib/shared_sprite_specs.rb

@@ -1,4 +1,4 @@
-describe 'saving a sprite', :shared => true do
+shared_examples_for 'saving a sprite' do
   # Requires:
   #
   #   @sprite => Montage::Sprite

data/spec/montage/commands/generate_spec.rb

@@ -76,6 +76,30 @@ end
 
 # ----------------------------------------------------------------------------
 
+context 'Generating a single sprite with zero padding' do
+  before(:all) do
+    @runner = Montage::Spec::CommandRunner.new('montage')
+    @runner.write_config <<-CONFIG
+      ---
+        config.padding: 0
+
+        "public/images/sprites/:name/*.{png,jpg,jpeg,gif}":
+          to: "public/images/:name.png"
+
+    CONFIG
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_one/two')
+    @runner.run!
+  end
+
+  it { @runner.should be_success }
+  it { @runner.stdout.should =~ /Generating "sprite_one": Done/ }
+  it { @runner.path_to_sprite('sprite_one').should be_file }
+  it { @runner.dimensions_of('sprite_one').should == [50, 40] }
+end
+
+# ----------------------------------------------------------------------------
+
 context 'Trying to generate sprites in a non-project directory' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage').run!

data/spec/montage/project_spec.rb

@@ -130,14 +130,14 @@ describe Montage::Project do
 
       it 'should raise an error' do
         running = lambda { Montage::Project.find(@helper.project_dir) }
-        running.should raise_exception(Montage::MissingProject)
+        running.should raise_error(Montage::MissingProject)
       end
     end # when given an empty directory
 
     describe 'when given an invalid path' do
       it 'should raise an error' do
         running = lambda { Montage::Project.find('__invalid__') }
-        running.should raise_exception(Montage::MissingProject)
+        running.should raise_error(Montage::MissingProject)
       end
     end # when given an invalid path
   end

data/spec/montage/spec/have_public_method_defined_spec.rb

@@ -2,30 +2,30 @@ require File.expand_path('../../../spec_helper', __FILE__)
 
 describe 'have_public_method_defined matcher' do
   before(:all) do
-    @exception = Spec::Expectations::ExpectationNotMetError
+    @exception = RSpec::Expectations::ExpectationNotMetError
   end
 
   describe 'with should' do
     it 'should pass when the method is defined' do
       running = lambda { String.should have_public_method_defined(:length) }
-      running.should_not raise_exception(@exception)
+      running.should_not raise_error(@exception)
     end
 
     it 'should fail when the method is not defined' do
       running = lambda { String.should have_public_method_defined(:__invalid__) }
-      running.should raise_exception(@exception)
+      running.should raise_error(@exception)
     end
   end
 
   describe 'with should_not' do
     it 'should fail when the method is defined' do
       running = lambda { String.should_not have_public_method_defined(:length) }
-      running.should raise_exception(@exception)
+      running.should raise_error(@exception)
     end
 
     it 'should pass when the method is not defined' do
       running = lambda { String.should_not have_public_method_defined(:__invalid__) }
-      running.should_not raise_exception(@exception)
+      running.should_not raise_error(@exception)
     end
   end
 end

data/spec/montage/sprite_definition_spec.rb

@@ -338,12 +338,17 @@ describe Montage::SpriteDefinition do
 
   # --------------------------------------------------------------------------
 
-  context 'with a no :name capture, and and no "name" option' do
-    it 'should raise an error' do
-      running = lambda { Montage::SpriteDefinition.new(
-        @helper.project, '/__invalid__/*', "to" => "_") }
+  context 'with a full file name, and no :name capture or option' do
+    it 'should infer the sprite name from the filename' do
+      @helper.touch('src/source')
 
-      running.should raise_error(Montage::MissingName)
+      definition = Montage::SpriteDefinition.new(
+        @helper.project, 'src/*', 'to' => 'lurrr.png')
+
+      @return = definition.to_sprites
+
+      @return.length.should == 1
+      @return[0].name.should == 'lurrr'
     end
   end
 

data/spec/spec_helper.rb

@@ -4,16 +4,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'tmpdir'
 
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'rspec/core'
+require 'rspec/autorun'
 
 require 'montage'
 require 'sass'
 
 # Spec libraries.
-spec_libs = Dir.glob(File.expand_path(File.dirname(__FILE__)) + '/lib/**/*.rb')
-spec_libs.each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/lib/**/*.rb"].each { |f| require f }
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.after(:suite) { Montage::Spec::ProjectHelper.cleanup! }
 end

data/tasks/spec.rake

@@ -1,13 +1,10 @@
 begin
-  require 'spec/rake/spectask'
 
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.pattern    = 'spec/**/*_spec.rb'
-    spec.libs      << 'lib' << 'spec'
-    spec.spec_opts << '--options' << 'spec/spec.opts'
-  end
+  require 'rspec/core/rake_task'
 
-  desc "Run the specs, followed by the Cucumber features (if specs pass)"
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
 
 rescue LoadError
   task :spec do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: montage
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Anthony Williams
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +01:00
+date: 2010-07-14 00:00:00 +01:00
 default_executable: montage
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 12
@@ -34,9 +37,11 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 5
@@ -44,39 +49,83 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rspec-core
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196475
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 0
+        - beta
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: rspec-expectations
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196475
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 12
+        version: 2.0.0.beta.12
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-mocks
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196475
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 12
+        version: 2.0.0.beta.12
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196417
         segments: 
         - 3
         - 0
@@ -85,20 +134,22 @@ dependencies:
         - 1
         version: 3.0.0.beta.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 description: Even Rocky had a montage.
 email: hi@antw.me
 executables: 
@@ -158,7 +209,6 @@ files:
 - spec/montage/sprite_definition_spec.rb
 - spec/montage/sprite_spec.rb
 - spec/rcov.opts
-- spec/spec.opts
 - spec/spec_helper.rb
 - tasks/spec.rake
 - tasks/yard.rake
@@ -172,23 +222,27 @@ 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.3.7
 signing_key: 
 specification_version: 3
 summary: Montage

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---loadby random
---format progress
---backtrace