buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/rakelib/setup.rake

@@ -17,7 +17,7 @@
 require 'jruby' if RUBY_PLATFORM[/java/]
 require 'rubygems/source_info_cache'
 
-RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'yes').strip.downcase
+RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'false').strip.downcase
   when 'yes', 'true'
     true
   else
@@ -35,7 +35,14 @@ def install_gem(name, options = {})
     args = []
     args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed? and RAKE_SUDO
     args << rb_bin << '-S' << 'gem' << 'install' << name
-    args << '--version' << dep.version_requirements.to_s
+
+    if (spec.respond_to? :requirement)
+      args << '--version' << dep.requirement.to_s
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      args << '--version' << dep.version_requirements.to_s
+    end
+
     args << '--source' << options[:source] if options[:source]
     args << '--source' << 'http://gems.rubyforge.org'
     args << '--install-dir' << ENV['GEM_HOME'] if ENV['GEM_HOME']
@@ -49,6 +56,11 @@ desc "If you're building from sources, run this task first to setup the necessar
 task :setup do
   missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
   missing.each do |dep|
-    install_gem dep.name, :version=>dep.version_requirements
+    if (spec.respond_to? :requirement)
+      install_gem dep.name, :version=>dep.requirement
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      install_gem dep.name, :version=>dep.version_requirements
+    end
   end
 end

data/rakelib/stage.rake

@@ -23,13 +23,14 @@ rescue LoadError
   task(:setup) { install_gem 'rubyforge' }
 end
 
+gpg_cmd = 'gpg2'
 
 task :prepare do |task, args|
   # Make sure we're doing a release from checked code.
   lambda do
     puts "Checking there are no local changes ... "
     svn = `svn status`
-    #fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty?
+    fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty?
     git = `git status`
     fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^#\t/]
     puts "[X] There are no local changes, everything is in source control"
@@ -40,14 +41,19 @@ task :prepare do |task, args|
     puts "Checking that CHANGELOG indicates most recent version and today's date ... "
     expecting = "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})"
     header = File.readlines('CHANGELOG').first.chomp
-    #fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
+    fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
     puts "[x] CHANGELOG indicates most recent version and today's date"
   end.call
 
   # Need GPG to sign the packages.
   lambda do
     args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
-    fail "No GPG user #{args.gpg}" if `gpg2 --list-keys #{args.gpg}`.empty?
+    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    if !$?.success?
+      gpg_ok = `gpg --list-keys #{args.gpg}` 
+      gpg_cmd = 'gpg'
+    end
+    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke
@@ -73,7 +79,7 @@ task :prepare do |task, args|
   lambda do
     puts "[!] Make sure you have admin privileges to make a release on RubyForge"
     rubyforge = RubyForge.new.configure
-    rubyforge.login 
+    rubyforge.login
     rubyforge.scrape_project(spec.name)
   end.call
 
@@ -106,14 +112,14 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
     task(:package).invoke
     mkpath '_staged/dist'
     FileList['pkg/*.{gem,zip,tgz}'].each do |source|
-      pkg = source.pathmap('_staged/dist/%n%x') 
+      pkg = source.pathmap('_staged/dist/%n%x')
       cp source, pkg
       bytes = File.open(pkg, 'rb') { |file| file.read }
       File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
       File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
-      sh 'gpg2', '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
+      sh gpg_cmd, '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
-    cp 'etc/KEYS', '_staged'
+    cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"
   end.call
 
@@ -121,10 +127,11 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
   # want to do that before generating the site/documentation.
   lambda do
     puts "Updating download page with links to release packages ... "
-    url = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
+    mirror = "http://www.apache.org/dyn/closer.cgi/#{spec.name}/#{spec.version}"
+    official = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
     rows = FileList['_staged/dist/*.{gem,tgz,zip}'].map { |pkg|
       name, md5 = File.basename(pkg), Digest::MD5.file(pkg).to_s
-      %{| "#{name}":#{url}/#{name} | "#{md5}":#{url}/#{name}.md5 | "Sig":#{url}/#{name}.asc |}
+      %{| "#{name}":#{mirror}/#{name} | "#{md5}":#{official}/#{name}.md5 | "Sig":#{official}/#{name}.asc |}
     }
     textile = <<-TEXTILE
 h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
@@ -132,7 +139,7 @@ h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
 |_. Package |_. MD5 Checksum |_. PGP |
 #{rows.join("\n")}
 
-p>. ("Release signing keys":#{url}/KEYS)
+p>. ("Release signing keys":#{official}/KEYS)
     TEXTILE
     file_name = 'doc/download.textile'
     print "Adding download links to #{file_name} ... "
@@ -161,7 +168,7 @@ p>. ("Release signing keys":#{url}/KEYS)
     sh 'rsync', '--progress', '--recursive', '_staged/', url
     puts "[X] Uploaded _staged directory to #{url}"
   end.call
-  
+
 
   # Prepare a release vote email. In the distant future this will also send the
   # email for you and vote on it.

data/spec/addon/drb_spec.rb

@@ -12,16 +12,16 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under
 # the License.
- 
- 
+
+
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 require 'stringio'
 Sandbox.require_optional_extension 'buildr/drb'
 
 
-describe Buildr::DRbApplication do 
+describe Buildr::DRbApplication do
 
-  module DRbHelper 
+  module DRbHelper
     attr_accessor :app, :drb, :cfg
 
     def use_stdio(stdin = nil, stdout = nil, stderr = nil)
@@ -30,7 +30,7 @@ describe Buildr::DRbApplication do
       stderr ||= StringIO.new
       cfg.update :in => stdin, :out => stdout, :err => stderr
     end
-    
+
     def remote_run(*argv)
       cfg.update :argv => argv
       drb.remote_run(cfg)
@@ -48,7 +48,7 @@ describe Buildr::DRbApplication do
             $stdout.puts "#{t.name} from #{t.source}"
           end
 
-          task('hello') do 
+          task('hello') do
             $stdout.puts 'hi'
           end
 
@@ -81,7 +81,7 @@ describe Buildr::DRbApplication do
   end
 
   include DRbHelper
-  
+
   before(:each) do
     @in, @out, @err = $stdin, $stdout, $stderr
     @cfg = {
@@ -96,7 +96,7 @@ describe Buildr::DRbApplication do
   after(:each) do
     $stdin, $stdout, $stderr = @in, @out, @err
   end
-  
+
   describe '.run' do
     it 'starts server if no server is running' do
       drb.should_receive(:connect).and_raise DRb::DRbConnError
@@ -114,11 +114,11 @@ describe Buildr::DRbApplication do
   end
 
   describe '.remote_run' do
-    
+
     describe 'stdout' do
-      it 'is redirected to client' do 
+      it 'is redirected to client' do
         use_stdio
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           $stdout.puts "HELLO"
         end
         remote_run
@@ -126,10 +126,10 @@ describe Buildr::DRbApplication do
       end
     end
 
-    describe 'stderr' do 
+    describe 'stderr' do
       it 'is redirected to client' do
         use_stdio
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           $stderr.puts "HELLO"
         end
         remote_run
@@ -142,7 +142,7 @@ describe Buildr::DRbApplication do
         use_stdio
         cfg[:in].should_receive(:gets).and_return("HELLO\n")
         result = nil
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           result = $stdin.gets
         end
         remote_run
@@ -152,7 +152,7 @@ describe Buildr::DRbApplication do
 
     describe 'server ARGV' do
       it 'is replaced with client argv' do
-        Buildr.application.should_receive(:remote_run) do 
+        Buildr.application.should_receive(:remote_run) do
           ARGV.should eql(['hello'])
         end
         remote_run 'hello'
@@ -164,7 +164,7 @@ describe Buildr::DRbApplication do
         app.instance_eval { @rakefile = nil }
         write_buildfile
       end
-      
+
       it 'should load the buildfile' do
         app.should_receive(:top_level)
         lambda { remote_run }.should run_task('foo')
@@ -172,14 +172,14 @@ describe Buildr::DRbApplication do
     end
 
     describe 'with unmodified buildfile' do
-      
-      before(:each) do 
+
+      before(:each) do
         write_buildfile
         app.options.rakelib = []
         app.send :load_buildfile
         drb.save_snapshot(app)
       end
-      
+
       it 'should not reload the buildfile' do
         app.should_not_receive(:reload_buildfile)
         app.should_receive(:top_level)
@@ -235,12 +235,12 @@ describe Buildr::DRbApplication do
         remote_run 'foo:empty'
         app.instance_eval { @rules.size }.should eql(orig)
       end
-            
+
     end
 
     describe 'with modified buildfile' do
-      
-      before(:each) do 
+
+      before(:each) do
         write_buildfile
         app.options.rakelib = []
         app.send :load_buildfile
@@ -251,12 +251,12 @@ describe Buildr::DRbApplication do
             $stdout.puts "#{t.name} from #{t.source}"
           end
           define('foo') do
-            task('hello') do 
+            task('hello') do
               $stdout.puts 'bye'
             end
             task('empty')
             define('bar') do
-              
+
             end
           end
         }
@@ -277,7 +277,7 @@ describe Buildr::DRbApplication do
         remote_run
         app.lookup('foo:delete_me').should be_nil
       end
-      
+
       it 'should redefine tasks actions' do
         actions = app.lookup('foo:empty').instance_eval { @actions }
         actions.should be_empty # no action

data/spec/core/application_spec.rb

@@ -72,7 +72,7 @@ describe Buildr::Application do
       Buildr.application.environment.should eql('test')
       ENV['BUILDR_ENV'].should eql('test')
     end
-    
+
     it 'should be echoed to user' do
       write 'buildfile'
       ENV['BUILDR_ENV'] = 'spec'
@@ -80,12 +80,22 @@ describe Buildr::Application do
       lambda { Buildr.application.send :load_buildfile }.should show(%r{(in .*, spec)})
     end
   end
-  
+
   describe 'options' do
     it "should have 'tasks' as the sole default rakelib" do
       Buildr.application.send(:handle_options)
       Buildr.application.options.rakelib.should == ['tasks']
     end
+
+    it 'should show the version when prompted with -V' do
+      ARGV.push('-V')
+      test_exit(0) { Buildr.application.send(:handle_options) }.should show(/Buildr #{Buildr::VERSION}.*/)
+    end
+
+    it 'should show the version when prompted with --version' do
+      ARGV.push('--version')
+      test_exit(0) { Buildr.application.send(:handle_options) }.should show(/Buildr #{Buildr::VERSION}.*/)
+    end
   end
 
   describe 'gems' do
@@ -248,45 +258,45 @@ describe Buildr::Application do
       @original_loaded_features = $LOADED_FEATURES.dup
       Buildr.application.options.rakelib = ["tasks"]
     end
-    
+
     after do
       $taskfiles = nil
       ($LOADED_FEATURES - @original_loaded_features).each do |new_load|
         $LOADED_FEATURES.delete(new_load)
       end
     end
-    
+
     def write_task(filename)
       write filename, <<-RUBY
         $taskfiles ||= []
         $taskfiles << __FILE__
       RUBY
     end
-    
+
     def loaded_tasks
       @loaded ||= Buildr.application.load_tasks
       $taskfiles
     end
-    
+
     it "should load {options.rakelib}/foo.rake" do
       write_task 'tasks/foo.rake'
       loaded_tasks.should have(1).task
       loaded_tasks.first.should =~ %r{tasks/foo\.rake$}
     end
-    
+
     it 'should load all *.rake files from the rakelib' do
       write_task 'tasks/bar.rake'
       write_task 'tasks/quux.rake'
       loaded_tasks.should have(2).tasks
     end
-    
+
     it 'should not load files which do not have the .rake extension' do
       write_task 'tasks/foo.rb'
       write_task 'tasks/bar.rake'
       loaded_tasks.should have(1).task
       loaded_tasks.first.should =~ %r{tasks/bar\.rake$}
     end
-    
+
     it 'should load files only from the directory specified in the rakelib option' do
       Buildr.application.options.rakelib = ['extensions']
       write_task 'extensions/amp.rake'
@@ -297,7 +307,7 @@ describe Buildr::Application do
         loaded_tasks.select{|x| x =~ %r{extensions/#{filename}\.rake}}.should have(1).entry
       end
     end
-    
+
     it 'should load files from all the directories specified in the rakelib option' do
       Buildr.application.options.rakelib = ['ext', 'more', 'tasks']
       write_task 'ext/foo.rake'
@@ -306,17 +316,71 @@ describe Buildr::Application do
       write_task 'more/baz.rake'
       loaded_tasks.should have(4).tasks
     end
-    
+
     it 'should not load files from the rakelib more than once' do
       write_task 'tasks/new_one.rake'
       write_task 'tasks/already.rake'
       $LOADED_FEATURES << 'tasks/already.rake'
-      
+
       loaded_tasks.should have(1).task
       loaded_tasks.first.should =~ %r{tasks/new_one\.rake$}
     end
   end
 
+  describe 'exception handling' do
+
+    it 'should exit when given a SystemExit exception' do
+      test_exit(3) { Buildr.application.standard_exception_handling { raise SystemExit.new(3) } }
+    end
+
+    it 'should exit with status 1 when given an OptionParser::ParseError exception' do
+      test_exit(1) { Buildr.application.standard_exception_handling { raise OptionParser::ParseError.new() } }
+    end
+
+    it 'should exit with status 1 when given any other type of exception exception' do
+      test_exit(1) { Buildr.application.standard_exception_handling { raise Exception.new() } }
+    end
+
+    it 'should print the class name and the message when receiving an exception (except when the exception is named Exception)' do
+
+      # Our fake $stderr for the exercise. We could start it with a matcher instead
+      class FakeStdErr
+
+        attr_accessor :messages
+
+        def puts(*args)
+          @messages ||= []
+          @messages += args
+        end
+
+        alias :write :puts
+      end
+
+      # Save the old $stderr and make sure to restore it in the end.
+      old_stderr = $stderr
+      begin
+
+        $stderr = FakeStdErr.new
+        test_exit(1) {
+          Buildr.application.send :standard_exception_handling do
+            class MyOwnNicelyNamedException < Exception
+            end
+            raise MyOwnNicelyNamedException.new('My message')
+          end
+        }.call
+        $stderr.messages.select {|msg| msg =~ /.*MyOwnNicelyNamedException : My message.*/}.size.should == 1
+        $stderr.messages.clear
+        test_exit(1) {
+          Buildr.application.send :standard_exception_handling do
+            raise Exception.new('My message')
+          end
+        }.call
+        $stderr.messages.select {|msg| msg =~ /.*My message.*/ && !(msg =~ /Exception/)}.size.should == 1
+      end
+      $stderr = old_stderr
+    end
+  end
+
 end
 
 
@@ -439,48 +503,55 @@ describe Buildr, 'settings' do
       @buildfile_time = Time.now - 10
       write 'buildfile'; File.utime(@buildfile_time, @buildfile_time, 'buildfile')
     end
-    
+
     it 'should point to the buildfile' do
       Buildr.application.buildfile.should point_to_path('buildfile')
     end
-    
+
     it 'should be a defined task' do
       Buildr.application.buildfile.should == file(File.expand_path('buildfile'))
     end
-    
+
     it 'should ignore any rake namespace' do
       namespace 'dummy_ns' do
         Buildr.application.buildfile.should point_to_path('buildfile')
       end
     end
-    
+
     it 'should have the same timestamp as the buildfile' do
       Buildr.application.buildfile.timestamp.should be_close(@buildfile_time, 1)
     end
-    
+
     it 'should have the same timestamp as build.yaml if the latter is newer' do
       write 'build.yaml'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'build.yaml')
       Buildr.application.run
       Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
     end
-    
+
     it 'should have the same timestamp as the buildfile if build.yaml is older' do
       write 'build.yaml'; File.utime(@buildfile_time - 5, @buildfile_time - 5, 'build.yaml')
       Buildr.application.run
       Buildr.application.buildfile.timestamp.should be_close(@buildfile_time, 1)
     end
-    
-    it 'should have the same timestamp as build.rb in home dir if the latter is newer' do
+
+    it 'should have the same timestamp as build.rb in home dir if the latter is newer (until version 1.6)' do
+      Buildr::VERSION.should < '1.6'
       write 'home/buildr.rb'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'home/buildr.rb')
       Buildr.application.send :load_tasks
       Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
     end
+
+    it 'should have the same timestamp as build.rb in home dir if the latter is newer' do
+      write 'home/.buildr/buildr.rb'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'home/.buildr/buildr.rb')
+      Buildr.application.send :load_tasks
+      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
+    end
   end
 end
 
 
 describe Buildr do
-  
+
   describe 'environment' do
     it 'should be same as Buildr.application.environment' do
       Buildr.environment.should eql(Buildr.application.environment)
@@ -498,5 +569,24 @@ describe Buildr do
       Buildr.settings.should == Buildr.application.settings
     end
   end
+
+end
+
+describe Rake do
+  describe 'define_task' do
+   it 'should restore call chain when invoke is called' do
+     task1 = Rake::Task.define_task('task1') do
+     end
+
+     task2 = Rake::Task.define_task('task2') do
+       chain1 = Thread.current[:rake_chain]
+       task1.invoke
+       chain2 = Thread.current[:rake_chain]
+       chain2.should == chain1
+     end
+
+     task2.invoke
+   end
+ end
 end