Skip to content
This repository
Browse code

Merge branch 'master' into issue/235

Conflicts:
	META.yml
  • Loading branch information...
commit 663bb5a5d88e491774ccabd46958b851358b8449 2 parents 990a7da + 19b0216
Michael G. Schwern authored March 18, 2013
2  Build.PL
@@ -12,7 +12,7 @@ my $builder = MyBuild->new(
12 12
     module_name => 'perl5i',
13 13
     license     => 'perl',
14 14
     dist_author => 'Michael G Schwern <schwern@pobox.com>',
15  
-    dist_version => "v2.11.0",
  15
+    dist_version => "v2.11.2",
16 16
 
17 17
     requires => {
18 18
         'perl'                    => '5.10.0',
19  Changes
... ...
@@ -1,4 +1,19 @@
1  
-2.11.0
  1
+2.11.3
  2
+  Doc Fixes
  3
+  * Document ->mo->as_yaml and ->mo->as_json [github #230] (Michael G. Schwern)
  4
+
  5
+2.11.2  Mon Mar 18 02:55:20 GMT 2013
  6
+  Distribution Fixes
  7
+  * perl5i::0 and perl5i::1 had internal packages outside the perl5i
  8
+    package which caused CPAN permissions problems.  This has been
  9
+    fixed. (Michael G. Schwern)
  10
+
  11
+2.11.1  Mon Mar 18 02:32:07 UTC 2013
  12
+  Distribution Fixes
  13
+  * Creating a new release with correct PAUSE permissions 
  14
+    (Nóirín Plunkett)
  15
+
  16
+2.11.0  Mon Mar 18 02:24:20 UTC 2013
2 17
   Bug Fixes
3 18
   * %hash->each({...}) iterator now uses Hash::StoredIterator
4 19
     to ensure that it's safe to nest calls to each(), and to use
@@ -8,7 +23,7 @@
8 23
   * Added new test template (Michael G. Schwern)
9 24
 
10 25
   New Features
11  
-  * ->mo->yaml and ->mo->json now allow you to dump a
  26
+  * ->mo->as_yaml and ->mo->as_json now allow you to dump a
12 27
     meta-object as yaml or json respectively [github #230] (Ben 
13 28
     Hengst)
14 29
 
50  META.json
@@ -84,25 +84,13 @@
84 84
       }
85 85
    },
86 86
    "provides" : {
87  
-      "DateTime::Format::CTime" : {
88  
-         "file" : "lib/perl5i/0/DateTime.pm",
89  
-         "version" : 0
90  
-      },
91  
-      "DateTime::time" : {
92  
-         "file" : "lib/perl5i/0/DateTime.pm",
93  
-         "version" : 0
94  
-      },
95  
-      "DateTime::y2038" : {
96  
-         "file" : "lib/perl5i/0/DateTime.pm",
97  
-         "version" : 0
98  
-      },
99 87
       "perl5i" : {
100 88
          "file" : "lib/perl5i.pm",
101  
-         "version" : "v2.11.0"
  89
+         "version" : "v2.11.2"
102 90
       },
103 91
       "perl5i::0" : {
104 92
          "file" : "lib/perl5i/0.pm",
105  
-         "version" : "v2.11.0"
  93
+         "version" : "v2.11.2"
106 94
       },
107 95
       "perl5i::0::ARRAY" : {
108 96
          "file" : "lib/perl5i/0/ARRAY.pm",
@@ -116,6 +104,18 @@
116 104
          "file" : "lib/perl5i/0/DateTime.pm",
117 105
          "version" : 0
118 106
       },
  107
+      "perl5i::0::DateTime::Format::CTime" : {
  108
+         "file" : "lib/perl5i/0/DateTime.pm",
  109
+         "version" : 0
  110
+      },
  111
+      "perl5i::0::DateTime::time" : {
  112
+         "file" : "lib/perl5i/0/DateTime.pm",
  113
+         "version" : 0
  114
+      },
  115
+      "perl5i::0::DateTime::y2038" : {
  116
+         "file" : "lib/perl5i/0/DateTime.pm",
  117
+         "version" : 0
  118
+      },
119 119
       "perl5i::0::HASH" : {
120 120
          "file" : "lib/perl5i/0/HASH.pm",
121 121
          "version" : 0
@@ -138,7 +138,7 @@
138 138
       },
139 139
       "perl5i::1" : {
140 140
          "file" : "lib/perl5i/1.pm",
141  
-         "version" : "v2.11.0"
  141
+         "version" : "v2.11.2"
142 142
       },
143 143
       "perl5i::1::ARRAY" : {
144 144
          "file" : "lib/perl5i/1/ARRAY.pm",
@@ -152,6 +152,18 @@
152 152
          "file" : "lib/perl5i/1/DateTime.pm",
153 153
          "version" : 0
154 154
       },
  155
+      "perl5i::1::DateTime::Format::CTime" : {
  156
+         "file" : "lib/perl5i/1/DateTime.pm",
  157
+         "version" : 0
  158
+      },
  159
+      "perl5i::1::DateTime::time" : {
  160
+         "file" : "lib/perl5i/1/DateTime.pm",
  161
+         "version" : 0
  162
+      },
  163
+      "perl5i::1::DateTime::y2038" : {
  164
+         "file" : "lib/perl5i/1/DateTime.pm",
  165
+         "version" : 0
  166
+      },
155 167
       "perl5i::1::HASH" : {
156 168
          "file" : "lib/perl5i/1/HASH.pm",
157 169
          "version" : 0
@@ -182,7 +194,7 @@
182 194
       },
183 195
       "perl5i::2" : {
184 196
          "file" : "lib/perl5i/2.pm",
185  
-         "version" : "v2.11.0"
  197
+         "version" : "v2.11.2"
186 198
       },
187 199
       "perl5i::2::ARRAY" : {
188 200
          "file" : "lib/perl5i/2/ARRAY.pm",
@@ -270,7 +282,7 @@
270 282
       },
271 283
       "perl5i::VERSION" : {
272 284
          "file" : "lib/perl5i/VERSION.pm",
273  
-         "version" : "v2.11.0"
  285
+         "version" : "v2.11.2"
274 286
       },
275 287
       "perl5i::cmd" : {
276 288
          "file" : "lib/perl5i/cmd.pm",
@@ -278,7 +290,7 @@
278 290
       },
279 291
       "perl5i::latest" : {
280 292
          "file" : "lib/perl5i/latest.pm",
281  
-         "version" : "v2.11.0"
  293
+         "version" : "v2.11.2"
282 294
       }
283 295
    },
284 296
    "release_status" : "stable",
@@ -294,5 +306,5 @@
294 306
       },
295 307
       "x_Chat" : "irc://irc.perl.org/#perl5i"
296 308
    },
297  
-   "version" : "v2.11.0"
  309
+   "version" : "v2.11.2"
298 310
 }
42  META.yml
@@ -29,21 +29,12 @@ no_index:
29 29
     - lib/perl5i/0/SCALAR.pm
30 30
     - lib/perl5i/VERSION.pm
31 31
 provides:
32  
-  DateTime::Format::CTime:
33  
-    file: lib/perl5i/0/DateTime.pm
34  
-    version: 0
35  
-  DateTime::time:
36  
-    file: lib/perl5i/0/DateTime.pm
37  
-    version: 0
38  
-  DateTime::y2038:
39  
-    file: lib/perl5i/0/DateTime.pm
40  
-    version: 0
41 32
   perl5i:
42 33
     file: lib/perl5i.pm
43  
-    version: v2.11.0
  34
+    version: v2.11.2
44 35
   perl5i::0:
45 36
     file: lib/perl5i/0.pm
46  
-    version: v2.11.0
  37
+    version: v2.11.2
47 38
   perl5i::0::ARRAY:
48 39
     file: lib/perl5i/0/ARRAY.pm
49 40
     version: 0
@@ -53,6 +44,15 @@ provides:
53 44
   perl5i::0::DateTime:
54 45
     file: lib/perl5i/0/DateTime.pm
55 46
     version: 0
  47
+  perl5i::0::DateTime::Format::CTime:
  48
+    file: lib/perl5i/0/DateTime.pm
  49
+    version: 0
  50
+  perl5i::0::DateTime::time:
  51
+    file: lib/perl5i/0/DateTime.pm
  52
+    version: 0
  53
+  perl5i::0::DateTime::y2038:
  54
+    file: lib/perl5i/0/DateTime.pm
  55
+    version: 0
56 56
   perl5i::0::HASH:
57 57
     file: lib/perl5i/0/HASH.pm
58 58
     version: 0
@@ -70,7 +70,7 @@ provides:
70 70
     version: 0
71 71
   perl5i::1:
72 72
     file: lib/perl5i/1.pm
73  
-    version: v2.11.0
  73
+    version: v2.11.2
74 74
   perl5i::1::ARRAY:
75 75
     file: lib/perl5i/1/ARRAY.pm
76 76
     version: 0
@@ -80,6 +80,15 @@ provides:
80 80
   perl5i::1::DateTime:
81 81
     file: lib/perl5i/1/DateTime.pm
82 82
     version: 0
  83
+  perl5i::1::DateTime::Format::CTime:
  84
+    file: lib/perl5i/1/DateTime.pm
  85
+    version: 0
  86
+  perl5i::1::DateTime::time:
  87
+    file: lib/perl5i/1/DateTime.pm
  88
+    version: 0
  89
+  perl5i::1::DateTime::y2038:
  90
+    file: lib/perl5i/1/DateTime.pm
  91
+    version: 0
83 92
   perl5i::1::HASH:
84 93
     file: lib/perl5i/1/HASH.pm
85 94
     version: 0
@@ -103,7 +112,7 @@ provides:
103 112
     version: 0
104 113
   perl5i::2:
105 114
     file: lib/perl5i/2.pm
106  
-    version: v2.11.0
  115
+    version: v2.11.2
107 116
   perl5i::2::ARRAY:
108 117
     file: lib/perl5i/2/ARRAY.pm
109 118
     version: 0
@@ -169,13 +178,13 @@ provides:
169 178
     version: 0
170 179
   perl5i::VERSION:
171 180
     file: lib/perl5i/VERSION.pm
172  
-    version: v2.11.0
  181
+    version: v2.11.2
173 182
   perl5i::cmd:
174 183
     file: lib/perl5i/cmd.pm
175 184
     version: 0
176 185
   perl5i::latest:
177 186
     file: lib/perl5i/latest.pm
178  
-    version: v2.11.0
  187
+    version: v2.11.2
179 188
 requires:
180 189
   CLASS: 1.00
181 190
   Capture::Tiny: 0.06
@@ -219,4 +228,5 @@ resources:
219 228
   license: http://dev.perl.org/licenses/
220 229
   repository: http://github.com/schwern/perl5i/tree/master
221 230
   x_Chat: irc://irc.perl.org/#perl5i
222  
-version: v2.11.0
  231
+version: v2.11.2
  232
+
2  lib/perl5i/0.pm
@@ -21,7 +21,7 @@ use Encode ();
21 21
 
22 22
 use perl5i::VERSION; our $VERSION = perl5i::VERSION->VERSION;
23 23
 
24  
-our $Latest = perl5i::VERSION->latest;
  24
+our $Latest = 'perl5i::0';
25 25
 
26 26
 
27 27
 # This works around their lexical nature.
18  lib/perl5i/0/DateTime.pm
@@ -18,14 +18,14 @@ sub dt_gmtime (;$) {
18 18
     $year += 1900;
19 19
 
20 20
     require DateTime;
21  
-    return DateTime::y2038->new(
  21
+    return perl5i::0::DateTime::y2038->new(
22 22
         year            => $year,
23 23
         month           => $mon,
24 24
         day             => $mday,
25 25
         hour            => $hour,
26 26
         minute          => $min,
27 27
         second          => $sec,
28  
-        formatter       => "DateTime::Format::CTime"
  28
+        formatter       => "perl5i::0::DateTime::Format::CTime"
29 29
     );
30 30
 }
31 31
 
@@ -40,7 +40,7 @@ sub dt_localtime (;$) {
40 40
     $year += 1900;
41 41
 
42 42
     require DateTime;
43  
-    return DateTime::y2038->new(
  43
+    return perl5i::0::DateTime::y2038->new(
44 44
         year            => $year,
45 45
         month           => $mon,
46 46
         day             => $mday,
@@ -48,7 +48,7 @@ sub dt_localtime (;$) {
48 48
         minute          => $min,
49 49
         second          => $sec,
50 50
         time_zone       => "local",
51  
-        formatter       => "DateTime::Format::CTime"
  51
+        formatter       => "perl5i::0::DateTime::Format::CTime"
52 52
     );
53 53
 }
54 54
 
@@ -59,7 +59,7 @@ sub dt_time () {
59 59
     state $formatter = DateTime::Format::Epoch->new( epoch => DateTime->from_epoch( epoch => 0 ) );
60 60
 
61 61
     require DateTime;
62  
-    return DateTime::time->from_epoch(
  62
+    return perl5i::0::DateTime::time->from_epoch(
63 63
         epoch     => time,
64 64
         formatter => $formatter
65 65
     );
@@ -67,7 +67,7 @@ sub dt_time () {
67 67
 
68 68
 
69 69
 {
70  
-    package DateTime::y2038;
  70
+    package perl5i::0::DateTime::y2038;
71 71
 
72 72
     # Don't load DateTime until we need it.
73 73
     our @ISA = qw(DateTime);
@@ -113,9 +113,9 @@ sub dt_time () {
113 113
 
114 114
 {
115 115
 
116  
-    package DateTime::time;
  116
+    package perl5i::0::DateTime::time;
117 117
 
118  
-    use parent -norequire, qw(DateTime::y2038);
  118
+    use parent -norequire, qw(perl5i::0::DateTime::y2038);
119 119
 
120 120
     use overload
121 121
       "0+" => sub { $_[0]->epoch },
@@ -157,7 +157,7 @@ sub dt_time () {
157 157
 
158 158
 {
159 159
 
160  
-    package DateTime::Format::CTime;
  160
+    package perl5i::0::DateTime::Format::CTime;
161 161
 
162 162
     use CLASS;
163 163
 
2  lib/perl5i/1.pm
@@ -17,7 +17,7 @@ use perl5i::1::autobox;
17 17
 
18 18
 use perl5i::VERSION; our $VERSION = perl5i::VERSION->VERSION;
19 19
 
20  
-our $Latest = perl5i::VERSION->latest;
  20
+our $Latest = 'perl5i::1';
21 21
 
22 22
 
23 23
 # This works around their lexical nature.
18  lib/perl5i/1/DateTime.pm
@@ -31,14 +31,14 @@ sub dt_gmtime (;$) {
31 31
     $year += 1900;
32 32
 
33 33
     require DateTime;
34  
-    return DateTime::y2038->new(
  34
+    return perl5i::1::DateTime::y2038->new(
35 35
         year            => $year,
36 36
         month           => $mon,
37 37
         day             => $mday,
38 38
         hour            => $hour,
39 39
         minute          => $min,
40 40
         second          => $sec,
41  
-        formatter       => "DateTime::Format::CTime"
  41
+        formatter       => "perl5i::1::DateTime::Format::CTime"
42 42
     );
43 43
 }
44 44
 
@@ -83,7 +83,7 @@ sub dt_localtime (;$) {
83 83
     state $tz = _get_datetime_timezone();
84 84
 
85 85
     require DateTime;
86  
-    return DateTime::y2038->new(
  86
+    return perl5i::1::DateTime::y2038->new(
87 87
         year            => $year,
88 88
         month           => $mon,
89 89
         day             => $mday,
@@ -91,7 +91,7 @@ sub dt_localtime (;$) {
91 91
         minute          => $min,
92 92
         second          => $sec,
93 93
         time_zone       => $tz,
94  
-        formatter       => "DateTime::Format::CTime"
  94
+        formatter       => "perl5i::1::DateTime::Format::CTime"
95 95
     );
96 96
 }
97 97
 
@@ -102,7 +102,7 @@ sub dt_time () {
102 102
     state $formatter = DateTime::Format::Epoch->new( epoch => DateTime->from_epoch( epoch => 0 ) );
103 103
 
104 104
     require DateTime;
105  
-    return DateTime::time->from_epoch(
  105
+    return perl5i::1::DateTime::time->from_epoch(
106 106
         epoch     => time,
107 107
         formatter => $formatter
108 108
     );
@@ -110,7 +110,7 @@ sub dt_time () {
110 110
 
111 111
 
112 112
 {
113  
-    package DateTime::y2038;
  113
+    package perl5i::1::DateTime::y2038;
114 114
 
115 115
     # Don't load DateTime until we need it.
116 116
     our @ISA = qw(DateTime);
@@ -170,9 +170,9 @@ sub dt_time () {
170 170
 
171 171
 {
172 172
 
173  
-    package DateTime::time;
  173
+    package perl5i::1::DateTime::time;
174 174
 
175  
-    use parent -norequire, qw(DateTime::y2038);
  175
+    use parent -norequire, qw(perl5i::1::DateTime::y2038);
176 176
 
177 177
     use overload
178 178
       "0+" => sub { $_[0]->epoch },
@@ -214,7 +214,7 @@ sub dt_time () {
214 214
 
215 215
 {
216 216
 
217  
-    package DateTime::Format::CTime;
  217
+    package perl5i::1::DateTime::Format::CTime;
218 218
 
219 219
     use CLASS;
220 220
 
20  lib/perl5i/Meta.pod
Source Rendered
@@ -266,10 +266,26 @@ Examples:
266 266
 
267 267
 =head3 perl
268 268
 
269  
-    my $dump = $object->mo->perl;
  269
+Same as L<as_perl>.  For backwards compatibility.
  270
+
  271
+=head3 as_perl
  272
+
  273
+    my $dump = $object->mo->as_perl;
270 274
 
271 275
 Dumps the contents of the $object as Perl in a string, like Data::Dumper.
272 276
 
  277
+=head3 as_json
  278
+
  279
+    my $json = $object->mo->as_json;
  280
+
  281
+Return the contents of the $object as JSON.
  282
+
  283
+=head3 as_yaml
  284
+
  285
+    my $json = $object->mo->as_yaml;
  286
+
  287
+Return the contents of the $object as YAML.
  288
+
273 289
 =head3 dump
274 290
 
275 291
     my $dump = $object->mo->dump( format => $format );
@@ -279,3 +295,5 @@ Dumps the contents of the $object as a string in whatever format you like.
279 295
 Possible formats are yaml, json and perl.
280 296
 
281 297
 $format defaults to "perl" which is equivalent to C<< $object->mo->perl >>.
  298
+
  299
+This is simply the long form of C<as_perl>, C<as_json> and C<as_yaml>.
2  lib/perl5i/VERSION.pm
@@ -5,7 +5,7 @@ package perl5i::VERSION;
5 5
 use strict;
6 6
 use warnings;
7 7
 
8  
-use version 0.77; our $VERSION = qv("v2.11.0");
  8
+use version 0.77; our $VERSION = qv("v2.11.2");
9 9
 
10 10
 sub latest { "perl5i::2" };     # LATEST HERE (for automated update)
11 11
 

0 notes on commit 663bb5a

Please sign in to comment.
Something went wrong with that request. Please try again.