diff options
author | Hans de Graaff <graaff@gentoo.org> | 2011-02-20 10:46:38 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2011-02-20 10:46:38 +0000 |
commit | 4cf2b01ecb35091380a0bed9cb76c4f750ce058a (patch) | |
tree | 92c661b35aee67d163258b02f223b2b7333cf09f /dev-ruby/yard/files | |
parent | Marked ~ppc wrt #341449. Thansk to hiyuh <hiyuh.root@gmail.com> for report an... (diff) | |
download | historical-4cf2b01ecb35091380a0bed9cb76c4f750ce058a.tar.gz historical-4cf2b01ecb35091380a0bed9cb76c4f750ce058a.tar.bz2 historical-4cf2b01ecb35091380a0bed9cb76c4f750ce058a.zip |
Version bump.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/yard/files')
-rw-r--r-- | dev-ruby/yard/files/yard-0.6.4-config-file-feature.patch | 19 | ||||
-rw-r--r-- | dev-ruby/yard/files/yard-0.6.4-yaml.patch | 30 |
2 files changed, 49 insertions, 0 deletions
diff --git a/dev-ruby/yard/files/yard-0.6.4-config-file-feature.patch b/dev-ruby/yard/files/yard-0.6.4-config-file-feature.patch new file mode 100644 index 000000000000..df2c5d92bdac --- /dev/null +++ b/dev-ruby/yard/files/yard-0.6.4-config-file-feature.patch @@ -0,0 +1,19 @@ +commit e1cafe5d2123631cdff8c115de15575bc6643677 +Author: Loren Segal <lsegal@soen.ca> +Date: Sun Jan 23 04:05:41 2011 -0500 + + Fix failing spec when ~/.yard/ignored_plugins does not exist + +diff --git a/spec/config_spec.rb b/spec/config_spec.rb +index 8aea427..5bcaa60 100644 +--- a/spec/config_spec.rb ++++ b/spec/config_spec.rb +@@ -17,7 +17,7 @@ describe YARD::Config do + + it "should overwrite options with data in ~/.yard/config" do + File.should_receive(:file?).with(YARD::Config::CONFIG_FILE).and_return(true) +- File.should_receive(:file?).with(YARD::Config::IGNORED_PLUGINS).and_return(true) ++ File.should_receive(:file?).with(YARD::Config::IGNORED_PLUGINS).and_return(false) + YAML.should_receive(:load_file).with(YARD::Config::CONFIG_FILE).and_return({'test' => true}) + YARD::Config.load + YARD::Config.options[:test].should be_true diff --git a/dev-ruby/yard/files/yard-0.6.4-yaml.patch b/dev-ruby/yard/files/yard-0.6.4-yaml.patch new file mode 100644 index 000000000000..2bdf8ef7ee01 --- /dev/null +++ b/dev-ruby/yard/files/yard-0.6.4-yaml.patch @@ -0,0 +1,30 @@ +commit 5557352a7793975bcaedf5f18b4e2c2883245f5b +Author: Akzhan Abdulin <akzhan.abdulin@gmail.com> +Date: Mon Jan 17 22:20:47 2011 +0300 + + Fix uninitialized constant RSpec::Core::ExampleGroup::Nested_2::Nested_1::YAML error + +diff --git a/spec/cli/config_spec.rb b/spec/cli/config_spec.rb +index 1ad52f4..4a5288e 100644 +--- a/spec/cli/config_spec.rb ++++ b/spec/cli/config_spec.rb +@@ -1,5 +1,7 @@ + require File.dirname(__FILE__) + '/../spec_helper' + ++require 'yaml' ++ + describe YARD::CLI::Config do + before do + @config = YARD::CLI::Config.new +diff --git a/spec/config_spec.rb b/spec/config_spec.rb +index 6e578fc..316d7b8 100644 +--- a/spec/config_spec.rb ++++ b/spec/config_spec.rb +@@ -1,5 +1,7 @@ + require File.join(File.dirname(__FILE__), "spec_helper") + ++require 'yaml' ++ + describe YARD::Config do + describe '.load' do + before do |