diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-07-28 17:50:04 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-07-29 11:12:01 -0400 |
commit | 0d51058ce13c8cb76c9260bb4a501288e5fd5437 (patch) | |
tree | a895e9c8de0d5878397f810d10baa122e4f1e2e4 /meta-openstack | |
parent | 824f453c088e69f03b7a917d53561d7f75c1bf07 (diff) | |
download | meta-cloud-services-0d51058ce13c8cb76c9260bb4a501288e5fd5437.tar.gz |
pry: upgrade 0.9.12.6 -> 0.10.1
1) Modify rdoc-fixup-opt.banner-heredoc.patch,since the contents
has been changed.
2) Update the checksum of LICENSE,since the date in it has been changed,
but the LICENSE has not been changed.
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-heredoc.patch | 56 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/pry_git.bb | 8 |
2 files changed, 33 insertions, 31 deletions
diff --git a/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-heredoc.patch b/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-heredoc.patch index b6612c9..32adfb6 100644 --- a/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-heredoc.patch +++ b/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-heredoc.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 55f81df0bb27c68d2a817cade5e0eb472acf24e5 Mon Sep 17 00:00:00 2001 | 1 | From 40f78c9ae1c8f37e382d2da3498e1670c1a321dd Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Wed, 14 May 2014 10:43:04 -0400 | 3 | Date: Sat, 25 Jul 2015 03:13:50 +0900 |
4 | Subject: [PATCH] rdoc: fixup opt.banner heredoc | 4 | Subject: [PATCH] rdoc: fixup opt.banner heredoc |
5 | 5 | ||
6 | rdoc has some quirks with heredoc which in this case would | 6 | rdoc has some quirks with heredoc which in this case would |
@@ -13,39 +13,41 @@ Fixup the heredoc to use a more standard format which is known | |||
13 | not to mess up rdoc processing. | 13 | not to mess up rdoc processing. |
14 | 14 | ||
15 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 15 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
16 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
16 | --- | 17 | --- |
17 | lib/pry/commands/ls.rb | 34 +++++++++++++++++----------------- | 18 | lib/pry/commands/ls.rb | 35 ++++++++++++++++------------------- |
18 | 1 file changed, 17 insertions(+), 17 deletions(-) | 19 | 1 file changed, 16 insertions(+), 19 deletions(-) |
19 | 20 | ||
20 | diff --git a/lib/pry/commands/ls.rb b/lib/pry/commands/ls.rb | 21 | diff --git a/lib/pry/commands/ls.rb b/lib/pry/commands/ls.rb |
21 | index 6ce49bb..b78f7e1 100644 | 22 | index 9f0e68f..eda7a53 100644 |
22 | --- a/lib/pry/commands/ls.rb | 23 | --- a/lib/pry/commands/ls.rb |
23 | +++ b/lib/pry/commands/ls.rb | 24 | +++ b/lib/pry/commands/ls.rb |
24 | @@ -6,23 +6,23 @@ class Pry | 25 | @@ -28,25 +28,22 @@ class Pry |
26 | description 'Show the list of vars and methods in the current scope.' | ||
25 | command_options :shellwords => false, :interpolate => false | 27 | command_options :shellwords => false, :interpolate => false |
26 | 28 | ||
27 | def options(opt) | 29 | - banner <<-'BANNER' |
28 | - opt.banner unindent <<-'BANNER' | 30 | - Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] |
29 | - Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] | 31 | - ls [-g] [-l] |
30 | - ls [-g] [-l] | 32 | - |
33 | - ls shows you which methods, constants and variables are accessible to Pry. By | ||
34 | - default it shows you the local variables defined in the current shell, and any | ||
35 | - public methods or instance variables defined on the current object. | ||
31 | - | 36 | - |
32 | - ls shows you which methods, constants and variables are accessible to Pry. By | 37 | - The colours used are configurable using Pry.config.ls.*_color, and the separator |
33 | - default it shows you the local variables defined in the current shell, and any | 38 | - is Pry.config.ls.separator. |
34 | - public methods or instance variables defined on the current object. | ||
35 | - | 39 | - |
36 | - The colours used are configurable using Pry.config.ls.*_color, and the separator | 40 | - Pry.config.ls.ceiling is used to hide methods defined higher up in the |
37 | - is Pry.config.ls.separator. | 41 | - inheritance chain, this is by default set to [Object, Module, Class] so that |
42 | - methods defined on all Objects are omitted. The -v flag can be used to ignore | ||
43 | - this setting and show all methods, while the -q can be used to set the ceiling | ||
44 | - much lower and show only methods defined on the object or its direct class. | ||
38 | - | 45 | - |
39 | - Pry.config.ls.ceiling is used to hide methods defined higher up in the | 46 | - Also check out `find-method` command (run `help find-method`). |
40 | - inheritance chain, this is by default set to [Object, Module, Class] so that | 47 | - BANNER |
41 | - methods defined on all Objects are omitted. The -v flag can be used to ignore | 48 | + opt.banner = <<-EOF |
42 | - this setting and show all methods, while the -q can be used to set the ceiling | ||
43 | - much lower and show only methods defined on the object or its direct class. | ||
44 | - BANNER | ||
45 | + opt.banner = <<-EOF | ||
46 | +Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] | 49 | +Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] |
47 | + ls [-g] [-l] | 50 | + ls [-g] [-l] |
48 | + | ||
49 | +ls shows you which methods, constants and variables are accessible to Pry. By | 51 | +ls shows you which methods, constants and variables are accessible to Pry. By |
50 | +default it shows you the local variables defined in the current shell, and any | 52 | +default it shows you the local variables defined in the current shell, and any |
51 | +public methods or instance variables defined on the current object. | 53 | +public methods or instance variables defined on the current object. |
@@ -60,8 +62,8 @@ index 6ce49bb..b78f7e1 100644 | |||
60 | +much lower and show only methods defined on the object or its direct class. | 62 | +much lower and show only methods defined on the object or its direct class. |
61 | + EOF | 63 | + EOF |
62 | 64 | ||
63 | opt.on :m, :methods, "Show public methods defined on the Object (default)" | 65 | |
64 | opt.on :M, "instance-methods", "Show methods defined in a Module or Class" | 66 | def options(opt) |
65 | -- | 67 | -- |
66 | 1.8.3.2 | 68 | 1.8.4.2 |
67 | 69 | ||
diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb index 37d4497..a4eb63c 100644 --- a/meta-openstack/recipes-devtools/ruby/pry_git.bb +++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb | |||
@@ -7,18 +7,18 @@ for Ruby. It is written from scratch to provide a number of advanced \ | |||
7 | features." | 7 | features." |
8 | 8 | ||
9 | LICENSE = "MIT" | 9 | LICENSE = "MIT" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d1a6fbb73f604e1e716380490938bd4" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dde93753687e16ab0c4669232fd27fd0" |
11 | 11 | ||
12 | PR = "r0" | 12 | PR = "r0" |
13 | 13 | ||
14 | BPV = "0.9.12.6" | 14 | BPV = "0.10.1" |
15 | PV = "${BPV}" | 15 | PV = "${BPV}" |
16 | SRCREV = "047788c4225b25bb0462e06715616964e4f0da15" | 16 | SRCREV = "191dc519813402acd6db0d7f73e652ed61f8111f" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | SRC_URI = " \ | 20 | SRC_URI = " \ |
21 | git://github.com/pry/pry.git;branch=0-9-12-stable \ | 21 | git://github.com/pry/pry.git \ |
22 | file://rdoc-fixup-opt.banner-heredoc.patch \ | 22 | file://rdoc-fixup-opt.banner-heredoc.patch \ |
23 | " | 23 | " |
24 | 24 | ||