buildr 1.4.1 → 1.4.2

data/lib/buildr/packaging/gems.rb

@@ -60,11 +60,10 @@ module Buildr
       spec.mark_version
       spec.validate
 
-      File.open(name, 'w') do |io|
+      File.open(name, 'wb') do |io|
         Gem::Package.open(io, 'w', nil) do |pkg|
           pkg.metadata = spec.to_yaml
           file_map.each do |path, content|
-            p "path #{path} content #{content}"
             next if content.nil? || File.directory?(content.to_s)
             pkg.add_file_simple(path, File.stat(content.to_s).mode & 0777, File.size(content.to_s)) do |os|
               File.open(content.to_s, "rb") do |file|
@@ -88,7 +87,7 @@ module Buildr
         end
         gem.spec do |spec|
           spec.name = id
-          spec.version = version
+          spec.version = version.gsub('-','.') # RubyGems doesn't like '-' in version numbers
           spec.summary = full_comment
           spec.has_rdoc = true
           spec.rdoc_options << '--title' << comment

data/lib/buildr/packaging/package.rb

@@ -106,7 +106,7 @@ module Buildr
     #  end
     #
     # Two other packaging types are:
-    # * package :sources -- Creates a ZIP file with the source code and classifier 'sources', for use by IDEs.
+    # * package :sources -- Creates a JAR file with the source code and classifier 'sources', for use by IDEs.
     # * package :javadoc -- Creates a ZIP file with the Javadocs and classifier 'javadoc'. You can use the
     #   javadoc method to further customize it.
     #
@@ -124,11 +124,11 @@ module Buildr
     #
     # The file name is determined from the specification passed to the package method, however, some
     # packagers need to override this.  For example, package(:sources) produces a file with the extension
-    # 'zip' and the classifier 'sources'.  If you need to overwrite the default implementation, you should
+    # 'jar' and the classifier 'sources'.  If you need to overwrite the default implementation, you should
     # also include a method named package_as_[type]_spec.  For example:
     #   def package_as_sources_spec(spec) #:nodoc:
-    #     # Change the source distribution to .jar extension
-    #     spec.merge({ :type=>:jar, :classifier=>'sources' })
+    #     # Change the source distribution to .zip extension
+    #     spec.merge({ :type=>:zip, :classifier=>'sources' })
     #   end
     def package(*args)
       spec = Hash === args.last ? args.pop.dup : {}
@@ -168,7 +168,6 @@ module Buildr
         task 'package'=>package
         package.enhance [task('build')]
         package.enhance { info "Packaging #{File.basename(file_name)}" }
-
         if spec[:file]
           class << package ; self ; end.send(:define_method, :type) { spec[:type] }
           class << package ; self ; end.send(:define_method, :id) { nil }
@@ -176,19 +175,27 @@ module Buildr
           # Make it an artifact using the specifications, and tell it how to create a POM.
           package.extend ActsAsArtifact
           package.send :apply_spec, spec.only(*Artifact::ARTIFACT_ATTRIBUTES)
-          # Another task to create the POM file.
-          pom = package.pom
-          pom.enhance do
-            mkpath File.dirname(pom.name)
-            File.open(pom.name, 'w') { |file| file.write pom.pom_xml }
+
+          # Create pom associated with package
+          class << package
+            def pom
+              unless @pom
+                pom_filename = Util.replace_extension(self.name, 'pom')
+                spec = {:group=>group, :id=>id, :version=>version, :type=>:pom}
+                @pom = Buildr.artifact(spec, pom_filename)
+                @pom.content @pom.pom_xml
+              end
+              @pom
+            end
           end
+
           file(Buildr.repositories.locate(package)=>package) { package.install }
 
           # Add the package to the list of packages created by this project, and
           # register it as an artifact. The later is required so if we look up the spec
           # we find the package in the project's target directory, instead of finding it
           # in the local repository and attempting to install it.
-          Artifact.register package, pom
+          Artifact.register package, package.pom
         end
 
         task('install')   { package.install if package.respond_to?(:install) }
@@ -225,7 +232,7 @@ module Buildr
     alias :package_as_tgz :package_as_tar
 
     def package_as_sources_spec(spec) #:nodoc:
-      spec.merge(:type=>:zip, :classifier=>'sources')
+      spec.merge(:type=>:jar, :classifier=>'sources')
     end
 
     def package_as_sources(file_name) #:nodoc:

data/lib/buildr/packaging/tar.rb

@@ -15,7 +15,7 @@
 
 
 require 'buildr/packaging/archive'
-gem 'archive-tar-minitar' ; autoload :Archive, 'archive/tar/minitar'
+gem 'minitar' ; autoload :Archive, 'archive/tar/minitar'
 
 
 module Buildr

data/lib/buildr/packaging/ziptask.rb

@@ -160,7 +160,7 @@ module Buildr
                   trace "Extracting #{dest}"
                   mkpath File.dirname(dest) rescue nil
                   #entry.restore_permissions = true
-                  File.open(dest, 'w') {|f| f.write entry.read}
+                  File.open(dest, 'wb') {|f| f.write entry.read}
                 end
               end
             end

data/lib/buildr/scala/bdd.rb

@@ -32,19 +32,23 @@ module Buildr::Scala
     @lang = :scala
     @bdd_dir = :spec
 
-    VERSION = '1.6.2.1'
+    VERSION = '1.6.5'
 
     class << self
       def version
         Buildr.settings.build['scala.specs'] || VERSION
       end
 
+      def artifact
+        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr::Scala.version}"
+      end
+
       def dependencies
         unless @dependencies
           super
+          specs = (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
           # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
-          @dependencies |= [ File.join(File.dirname(__FILE__)) ] +
-                           ["org.scala-tools.testing:specs:jar:#{version}"] +
+          @dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
                            Check.dependencies + JUnit.dependencies + Scalac.dependencies
         end
         @dependencies

data/lib/buildr/scala/compiler.rb

@@ -19,7 +19,7 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr::Scala
-  DEFAULT_VERSION = '2.7.7'   # currently the latest (Oct 31, 2009)
+  DEFAULT_VERSION = '2.8.0'
 
   class << self
 
@@ -225,7 +225,7 @@ module Buildr::Scala
     def scalac_args #:nodoc:
       args = []
       args << "-nowarn" unless options[:warnings]
-      args << "-verbose" if Buildr.application.options.trace
+      args << "-verbose" if trace?(:scalac)
       args << "-g" if options[:debug]
       args << "-deprecation" if options[:deprecation]
       args << "-optimise" if options[:optimise]

data/lib/buildr/scala/doc.rb

@@ -22,7 +22,7 @@ module Buildr
       specify :language => :scala, :source_ext => 'scala'
 
       def generate(sources, target, options = {})
-        cmd_args = [ '-d', target, Buildr.application.options.trace ? '-verbose' : '' ]
+        cmd_args = [ '-d', target, trace?(:scaladoc) ? '-verbose' : '' ]
         options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
           each { |key, value| value.invoke if value.respond_to?(:invoke) }.
           each do |key, value|
@@ -54,7 +54,7 @@ module Buildr
     end
 
     class VScaladoc < Base
-      VERSION = '1.2-SNAPSHOT'
+      VERSION = '1.2-m1'
       Buildr.repositories.remote << 'http://scala-tools.org/repo-snapshots'
 
       class << self
@@ -68,7 +68,7 @@ module Buildr
       specify :language => :scala, :source_ext => 'scala'
 
       def generate(sources, target, options = {})
-        cmd_args = [ '-d', target, (Buildr.application.options.trace ? '-verbose' : ''),
+        cmd_args = [ '-d', target, (trace?(:vscaladoc) ? '-verbose' : ''),
           '-sourcepath', project.compile.sources.join(File::PATH_SEPARATOR) ]
         options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
           each { |key, value| value.invoke if value.respond_to?(:invoke) }.

data/lib/buildr/scala/tests.rb

@@ -23,7 +23,7 @@ require 'buildr/java/tests'
 module Buildr::Scala
   # Scala::Check is available when using Scala::Test or Scala::Specs
   module Check
-    VERSION = '1.6'
+    VERSION = '1.7'
 
     class << self
       def version
@@ -34,8 +34,12 @@ module Buildr::Scala
         Buildr.settings.build['scala.check.classifier'] || ""
       end
 
+      def artifact
+        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr::Scala.version}"
+      end
+
       def dependencies
-        ["org.scala-tools.testing:scalacheck:jar:#{classifier}:#{version}"]
+        (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
       end
 
     private
@@ -56,7 +60,7 @@ module Buildr::Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr::TestFramework::Java
 
-    VERSION = '1.0.1'
+    VERSION = '1.2'
 
     class << self
       def version

data/lib/buildr/version.rb

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  VERSION = '1.4.2'.freeze
+end

data/rakelib/all-in-one.rake

@@ -18,7 +18,7 @@ task "all-in-one" => 'all-in-one:all-in-one'
 
 namespace :'all-in-one' do
   
-  version = "1.5.1"
+  version = "1.5.2"
   jruby_distro = "jruby-bin-#{version}.tar.gz"
   url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
   dir = "jruby-#{version}"

data/rakelib/doc.rake

@@ -36,7 +36,17 @@ end
 
 
 begin
-  require 'rakelib/jekylltask'
+  require 'jekylltask'
+  module TocFilter
+    def toc(input)
+      input.scan(/<(h2)(?:>|\s+(.*?)>)([^<]*)<\/\1\s*>/mi).inject(%{<ol class="toc">}) { |toc, entry|
+        id = entry[1][/^id=(['"])(.*)\1$/, 2]
+        title = entry[2].gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip
+        toc << %{<li><a href="##{id}">#{title}</a></li>}
+      } << "</ol>"
+    end
+  end
+  Liquid::Template.register_filter(TocFilter)
 
   desc "Generate Buildr documentation in _site/"
   JekyllTask.new :jekyll do |task|
@@ -45,9 +55,9 @@ begin
   end
 
 rescue LoadError
-  puts "Buildr uses the mojombo-jekyll to generate the Web site. You can install it by running rake doc:setup"
+  puts "Buildr uses the jekyll gem to generate the Web site. You can install it by running rake doc:setup"
   task 'doc:setup' do
-    install_gem 'mojombo-jekyll', :source=>'http://gems.github.com', :version=>'0.5.4'
+    install_gem 'jekyll', :version=>'0.6.2'
     if `pygmentize -V`.empty?
       args = %w{easy_install Pygments}
       args.unshift 'sudo' unless Config::CONFIG['host_os'] =~ /windows/

data/rakelib/metrics.rake

@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+namespace :metrics do
+  desc 'run Saikuro reports'
+  task :saikuro do
+    gem 'atoulme-Saikuro'
+    require 'saikuro'
+    output_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "_reports", "saikuro"))
+    base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), "..")))
+    rb_files = ["lib", "addon"].collect { |folder| 
+      FileList[File.expand_path(File.join(File.dirname(__FILE__), "..", folder, "**", "*.rb"))]
+    }.flatten.collect {|path| 
+      Pathname.new(path).relative_path_from(base_dir).to_s
+    }
+    SaikuroRunner.new.run(rb_files, output_dir)
+  end
+  
+  desc 'generate ccn treemap'
+  task :ccn_treemap do
+    require 'saikuro_treemap'
+    SaikuroTreemap.generate_treemap :code_dirs => ['lib', 'addon'], :output_file => "_reports/saikuro_treemap.html"
+  end
+end
+
+desc 'Run all metrics tools'
+task :metrics => ["metrics:saikuro", "metrics:ccn_treemap"]

data/spec/core/application_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 
 describe Buildr::Application do
@@ -164,34 +164,34 @@ describe Buildr::Application do
 
     it 'should fail if required gem not found in remote repository' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([])
+      Gem.source_index.should_receive(:search).at_least(:once).and_return([])
       lambda { Buildr.application.load_gems }.should raise_error(LoadError, /cannot be found/i)
     end
 
     it 'should fail if need to install gem and not running in interactive mode' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $stdout.should_receive(:isatty).and_return(false)
       lambda { Buildr.application.load_gems }.should raise_error(LoadError, /this build requires the gems/i)
     end
 
     it 'should ask permission before installing required gems' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $terminal.should_receive(:agree).with(/install/, true)
       lambda { Buildr.application.load_gems }.should raise_error
     end
 
     it 'should fail if permission not granted to install gem' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $terminal.should_receive(:agree).and_return(false)
       lambda { Buildr.application.load_gems }.should raise_error(LoadError, /cannot build without/i)
     end
 
     it 'should install gem if permission granted' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $terminal.should_receive(:agree).and_return(true)
       Util.should_receive(:ruby) do |*args|
         args.should include('install', 'foo', '-v', '1.2')
@@ -202,7 +202,7 @@ describe Buildr::Application do
 
     it 'should reload gem cache after installing required gems' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $terminal.should_receive(:agree).and_return(true)
       Util.should_receive(:ruby)
       Gem.source_index.should_receive(:load_gems_in).with(Gem::SourceIndex.installed_spec_directories)
@@ -218,7 +218,7 @@ describe Buildr::Application do
 
     it 'should load newly installed gems' do
       Buildr.application.should_receive(:listed_gems).and_return([Gem::Dependency.new('foo', '>=1.1')])
-      Gem::SourceInfoCache.should_receive(:search).and_return([@spec])
+      Gem.source_index.should_receive(:search).and_return([@spec])
       $terminal.should_receive(:agree).and_return(true)
       Util.should_receive(:ruby)
       Buildr.application.should_receive(:gem).with('foo', @spec.version.to_s)
@@ -227,25 +227,26 @@ describe Buildr::Application do
 
     it 'should default to >=0 version requirement if not specified' do
       write 'build.yaml', 'gems: foo'
-      Gem::SourceInfoCache.should_receive(:search).with(Gem::Dependency.new('foo', '>=0')).and_return([])
+      $terminal.should_receive(:agree).and_return(true)
+      Gem.source_index.should_receive(:search).with(Gem::Dependency.new('foo', '>=0')).and_return([])
       lambda { Buildr.application.load_gems }.should raise_error
     end
 
     it 'should parse exact version requirement' do
       write 'build.yaml', 'gems: foo 2.5'
-      Gem::SourceInfoCache.should_receive(:search).with(Gem::Dependency.new('foo', '=2.5')).and_return([])
+      Gem.source_index.should_receive(:search).with(Gem::Dependency.new('foo', '=2.5')).and_return([])
       lambda { Buildr.application.load_gems }.should raise_error
     end
 
     it 'should parse range version requirement' do
       write 'build.yaml', 'gems: foo ~>2.3'
-      Gem::SourceInfoCache.should_receive(:search).with(Gem::Dependency.new('foo', '~>2.3')).and_return([])
+     Gem.source_index.should_receive(:search).with(Gem::Dependency.new('foo', '~>2.3')).and_return([])
       lambda { Buildr.application.load_gems }.should raise_error
     end
 
     it 'should parse multiple version requirements' do
       write 'build.yaml', 'gems: foo >=2.0 !=2.1'
-      Gem::SourceInfoCache.should_receive(:search).with(Gem::Dependency.new('foo', ['>=2.0', '!=2.1'])).and_return([])
+      Gem.source_index.should_receive(:search).with(Gem::Dependency.new('foo', ['>=2.0', '!=2.1'])).and_return([])
       lambda { Buildr.application.load_gems }.should raise_error
     end
   end

data/spec/core/build_spec.rb

@@ -14,8 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), '../spec_helpers')
-
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe 'local task', :shared=>true do
   it "should execute task for project in current directory" do
@@ -407,12 +406,158 @@ describe 'a release process', :shared=>true do
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.002-SNAPSHOT"')
     end
-
+    
     it 'should commit the updated buildfile' do
       @release.stub!(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end
+
+    it 'should not consider "-rc" as "-SNAPSHOT"' do
+      write 'buildfile', "VERSION_NUMBER = '1.0.0-rc1'"
+      @release.stub!(:tag_release)
+      @release.make
+      file('buildfile').should contain('VERSION_NUMBER = "1.0.0-rc1"')
+    end
+    
+    it 'should only commit the updated buildfile if the version changed' do
+      write 'buildfile', "VERSION_NUMBER = '1.0.0-rc1'"
+      @release.should_not_receive(:update_version_to_next)
+      @release.stub!(:tag_release)
+      @release.make
+    end
+  end
+
+  describe '#resolve_next_version' do
+
+    it 'should increment the version number if SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0-SNAPSHOT").should == '1.0.1-SNAPSHOT'
+    end
+
+    it 'should NOT increment the version number if no SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0'
+    end
+
+    it 'should return the version specified by NEXT_VERSION env var' do
+      ENV['NEXT_VERSION'] = "version_from_env"
+      @release.send(:resolve_next_version, "1.0.0").should == 'version_from_env'
+    end
+
+    it 'should return the version specified by next_version' do
+      Release.next_version = "ze_next_version"
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_next_version'
+    end
+
+    it 'should return the version specified by next_version if next_version is a proc' do
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0++'
+    end
+
+    it "should return the version specified by 'NEXT_VERSION' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = "ze_version_from_env"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env'
+    end
+
+    it "should return the version specified by 'next_version' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = "ze_version_from_env_lowercase"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env_lowercase'
+    end
+    after { 
+      Release.next_version = nil
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = nil
+    }
+  end
+
+  describe '#resolve_next_version' do
+
+    it 'should increment the version number if SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0-SNAPSHOT").should == '1.0.1-SNAPSHOT'
+    end
+
+    it 'should NOT increment the version number if no SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0'
+    end
+
+    it 'should return the version specified by NEXT_VERSION env var' do
+      ENV['NEXT_VERSION'] = "version_from_env"
+      @release.send(:resolve_next_version, "1.0.0").should == 'version_from_env'
+    end
+
+    it 'should return the version specified by next_version' do
+      Release.next_version = "ze_next_version"
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_next_version'
+    end
+
+    it 'should return the version specified by next_version if next_version is a proc' do
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0++'
+    end
+
+    it "should return the version specified by 'NEXT_VERSION' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = "ze_version_from_env"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env'
+    end
+
+    it "should return the version specified by 'next_version' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = "ze_version_from_env_lowercase"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env_lowercase'
+    end
+    after { 
+      Release.next_version = nil
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = nil
+    }
+  end
+
+  describe '#resolve_next_version' do
+
+    it 'should increment the version number if SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0-SNAPSHOT").should == '1.0.1-SNAPSHOT'
+    end
+
+    it 'should NOT increment the version number if no SNAPSHOT' do
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0'
+    end
+
+    it 'should return the version specified by NEXT_VERSION env var' do
+      ENV['NEXT_VERSION'] = "version_from_env"
+      @release.send(:resolve_next_version, "1.0.0").should == 'version_from_env'
+    end
+
+    it 'should return the version specified by next_version' do
+      Release.next_version = "ze_next_version"
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_next_version'
+    end
+
+    it 'should return the version specified by next_version if next_version is a proc' do
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == '1.0.0++'
+    end
+
+    it "should return the version specified by 'NEXT_VERSION' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = "ze_version_from_env"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env'
+    end
+
+    it "should return the version specified by 'next_version' env var even if next_version is non nil" do
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = "ze_version_from_env_lowercase"
+      Release.next_version = lambda {|version| "#{version}++"}
+      @release.send(:resolve_next_version, "1.0.0").should == 'ze_version_from_env_lowercase'
+    end
+    after { 
+      Release.next_version = nil
+      ENV['NEXT_VERSION'] = nil
+      ENV['next_version'] = nil
+    }
   end
 
   describe '#resolve_tag' do
@@ -487,12 +632,14 @@ describe 'a release process', :shared=>true do
 
   describe '#update_version_to_next' do
     before do
-      write 'buildfile', 'THIS_VERSION = "1.0.0"'
+      write 'buildfile', "VERSION_NUMBER = '1.0.5-SNAPSHOT'"
+      @release.send(:this_version=, "1.0.5-SNAPSHOT")
     end
 
     it 'should update the buildfile with a new version number' do
       @release.send :update_version_to_next
-      file('buildfile').should contain('THIS_VERSION = "1.0.1-SNAPSHOT"')
+      `cp buildfile /tmp/out`
+      file('buildfile').should contain('VERSION_NUMBER = "1.0.6-SNAPSHOT"')
     end
 
     it 'should commit the new buildfile on the trunk' do
@@ -516,11 +663,19 @@ describe 'a release process', :shared=>true do
     end
 
     it 'should inform the user of the new version' do
-      lambda { @release.update_version_to_next }.should show_info('Current version is now 1.0.1-SNAPSHOT')
+      lambda { @release.update_version_to_next }.should show_info('Current version is now 1.0.6-SNAPSHOT')
     end
     after { Release.commit_message = nil }
   end
 
+
+  describe '#check' do
+    before { @release.send(:this_version=, "1.0.0-SNAPSHOT") }
+    it 'should fail if THIS_VERSION equals the next_version' do
+      @release.stub!(:resolve_next_version).and_return('1.0.0-SNAPSHOT')
+      lambda { @release.check }.should raise_error("The next version can't be equal to the current version 1.0.0-SNAPSHOT.\nUpdate THIS_VERSION/VERSION_NUMBER, specify Release.next_version or use NEXT_VERSION env var")
+    end
+  end
 end
 
 
@@ -528,6 +683,7 @@ describe GitRelease do
   it_should_behave_like 'a release process'
 
   before do
+    write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
     @release = GitRelease.new
     Git.stub!(:git)
     Git.stub!(:current_branch).and_return('master')
@@ -547,9 +703,10 @@ describe GitRelease do
     end
   end
 
-  describe '#release_check' do
+  describe '#check' do
     before do
       @release = GitRelease.new
+      @release.send(:this_version=, '1.0.0-SNAPSHOT')
     end
 
     it 'should accept a clean repository' do
@@ -624,6 +781,7 @@ describe SvnRelease do
   it_should_behave_like 'a release process'
 
   before do
+    write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
     @release = SvnRelease.new
     Svn.stub!(:svn)
     Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
@@ -645,6 +803,7 @@ describe SvnRelease do
     before do
       Svn.stub!(:uncommitted_files).and_return([])
       @release = SvnRelease.new
+      @release.send(:this_version=, "1.0.0-SNAPSHOT")
     end
 
     it 'should accept to release from the trunk' do