buildr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Spiewak <djspie...@gmail.com>
Subject Re: svn commit: r917050 - /buildr/trunk/lib/buildr/core/util.rb
Date Sat, 27 Feb 2010 22:07:10 GMT
Yeah, it was driving me nuts.  :-)  I don't know why it is that Rake seems
to struggle with this, but until they figure it out, we can stick with our
magic overrides.

Daniel

On Sat, Feb 27, 2010 at 4:05 PM, Alex Boisvert <alex.boisvert@gmail.com>wrote:

> nice, thanks! :)
>
> On Sat, Feb 27, 2010 at 1:39 PM, <djspiewak@apache.org> wrote:
>
> > Author: djspiewak
> > Date: Sat Feb 27 21:39:49 2010
> > New Revision: 917050
> >
> > URL: http://svn.apache.org/viewvc?rev=917050&view=rev
> > Log:
> > Added special monkey-patched FileUtils#sh on MRI to avoid spurious
> messages
> >
> > Modified:
> >    buildr/trunk/lib/buildr/core/util.rb
> >
> > Modified: buildr/trunk/lib/buildr/core/util.rb
> > URL:
> >
> http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=917050&r1=917049&r2=917050&view=diff
> >
> >
> ==============================================================================
> > --- buildr/trunk/lib/buildr/core/util.rb (original)
> > +++ buildr/trunk/lib/buildr/core/util.rb Sat Feb 27 21:39:49 2010
> > @@ -446,4 +446,40 @@
> >     end
> >
> >   end
> > +else
> > +  module FileUtils
> > +    # code "borrowed" directly from Rake
> > +    def sh(*cmd, &block)
> > +      options = (Hash === cmd.last) ? cmd.pop : {}
> > +      unless block_given?
> > +        show_command = cmd.join(" ")
> > +        show_command = show_command[0,42] + "..."
> > +
> > +        block = lambda { |ok, status|
> > +          ok or fail "Command failed with status (#{status.exitstatus}):
> > [#{show_command}]"
> > +        }
> > +      end
> > +      if RakeFileUtils.verbose_flag == :default
> > +        options[:verbose] = false
> > +      else
> > +        options[:verbose] ||= RakeFileUtils.verbose_flag
> > +      end
> > +      options[:noop]    ||= RakeFileUtils.nowrite_flag
> > +      rake_check_options options, :noop, :verbose
> > +      rake_output_message cmd.join(" ") if options[:verbose]
> > +      unless options[:noop]
> > +        cd = "cd '#{Dir.pwd}' && "
> > +        args = if cmd.size > 1 then cmd[1..cmd.size] else [] end
> > +
> > +        res = if Buildr::Util.win_os? && cmd.size == 1
> > +          system("#{cd} call #{cmd.first}")
> > +        else
> > +          arg_str = args.map { |a| "'#{a}'" }
> > +          system(cd + cmd.first + ' ' + arg_str.join(' '))
> > +        end
> > +
> > +        block.call(res, $?)
> > +      end
> > +    end
> > +  end
> >  end
> >
> >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message