syncing to head of TFS. Tagging 0.9.3

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/BuiltinsOps.cs

@@ -322,16 +322,16 @@ public static class YamlRegexpOps {
         }
     }
 
-    [RubyModule(Extends = typeof(DateTime))]
-    public static class DateTimeOps {
+    [RubyModule(Extends = typeof(Time))]
+    public static class TimeOps {
         [RubyMethod("to_yaml_node", RubyMethodAttributes.PrivateInstance)]
-        public static Node/*!*/ ToYaml(DateTime self, [NotNull]RubyRepresenter/*!*/ rep) {
-            string format = (self.Millisecond != 0) ? "yyyy-MM-dd HH:mm:ss.fffffff K" : "yyyy-MM-dd HH:mm:ss K";
+        public static Node/*!*/ ToYaml(Time self, [NotNull]RubyRepresenter/*!*/ rep) {
+            string format = (self.DateTime.Millisecond != 0) ? "yyyy-MM-dd HH:mm:ss.fffffff K" : "yyyy-MM-dd HH:mm:ss K";
             return rep.Scalar(self, MutableString.CreateAscii(self.ToString(format, CultureInfo.InvariantCulture)));
         }
 
         [RubyMethod("taguri")]
-        public static MutableString/*!*/ TagUri(DateTime self) {
+        public static MutableString/*!*/ TagUri(Time self) {
             return MutableString.CreateAscii("tag:yaml.org,2002:timestamp");
         }
     }

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/Engine/BaseConstructor.cs

@@ -475,7 +475,7 @@ public class BaseConstructor : IEnumerable<object> {
                 int month_ymd = int.Parse(match.Groups[2].Value);
                 int day_ymd = int.Parse(match.Groups[3].Value);
 
-                return new DateTime(year_ymd, month_ymd, day_ymd);
+                return new Time(year_ymd, month_ymd, day_ymd);
             }
             throw new ConstructorException("Invalid tag:yaml.org,2002:timestamp#ymd value.");
         }
@@ -542,7 +542,7 @@ public class BaseConstructor : IEnumerable<object> {
                     dt = dt.AddMilliseconds(utcOffset - sign * zone);
                 }
             }
-            return dt;
+            return new Time(dt);
         }
 
         public static object ConstructYamlInt(BaseConstructor ctor, Node node) {

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/Initializer.Generated.cs

@@ -35,13 +35,13 @@ public sealed class YamlLibraryInitializer : IronRuby.Builtins.LibraryInitialize
             ExtendClass(typeof(IronRuby.Builtins.RubyModule), 0x00000000, null, LoadIronRuby__Builtins__RubyModule_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(IronRuby.Builtins.RubyRegex), 0x00000000, LoadIronRuby__Builtins__RubyRegex_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(IronRuby.Builtins.RubyStruct), 0x00000000, LoadIronRuby__Builtins__RubyStruct_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
+            ExtendModule(typeof(IronRuby.Builtins.Time), 0x00000000, LoadIronRuby__Builtins__Time_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(IronRuby.Builtins.TrueClass), 0x00000000, LoadIronRuby__Builtins__TrueClass_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendClass(typeof(IronRuby.StandardLibrary.Yaml.Node), 0x00000000, null, LoadIronRuby__StandardLibrary__Yaml__Node_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(Microsoft.Scripting.Math.BigInteger), 0x00000000, LoadMicrosoft__Scripting__Math__BigInteger_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(Microsoft.Scripting.Runtime.DynamicNull), 0x00000000, LoadMicrosoft__Scripting__Runtime__DynamicNull_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(Microsoft.Scripting.SymbolId), 0x00000000, LoadMicrosoft__Scripting__SymbolId_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             DefineGlobalClass("Out", typeof(IronRuby.StandardLibrary.Yaml.RubyRepresenter), 0x00000100, classRef0, LoadOut_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
-            ExtendModule(typeof(System.DateTime), 0x00000000, LoadSystem__DateTime_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(System.Double), 0x00000000, LoadSystem__Double_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendModule(typeof(System.Exception), 0x00000000, LoadSystem__Exception_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             ExtendClass(typeof(System.Object), 0x00000000, null, LoadSystem__Object_Instance, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
@@ -164,6 +164,17 @@ public sealed class YamlLibraryInitializer : IronRuby.Builtins.LibraryInitialize
 
         }
 
+        private static void LoadIronRuby__Builtins__Time_Instance(IronRuby.Builtins.RubyModule/*!*/ module) {
+            DefineLibraryMethod(module, "taguri", 0x11, 
+                new Func<IronRuby.Builtins.Time, IronRuby.Builtins.MutableString>(IronRuby.StandardLibrary.Yaml.TimeOps.TagUri)
+            );
+
+            DefineLibraryMethod(module, "to_yaml_node", 0x12, 
+                new Func<IronRuby.Builtins.Time, IronRuby.StandardLibrary.Yaml.RubyRepresenter, IronRuby.StandardLibrary.Yaml.Node>(IronRuby.StandardLibrary.Yaml.TimeOps.ToYaml)
+            );
+
+        }
+
         private static void LoadIronRuby__Builtins__TrueClass_Instance(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "taguri", 0x11, 
                 new Func<System.Object, IronRuby.Builtins.MutableString>(IronRuby.StandardLibrary.Yaml.YamlTrueOps.TagUri)
@@ -222,17 +233,6 @@ public sealed class YamlLibraryInitializer : IronRuby.Builtins.LibraryInitialize
 
         }
 
-        private static void LoadSystem__DateTime_Instance(IronRuby.Builtins.RubyModule/*!*/ module) {
-            DefineLibraryMethod(module, "taguri", 0x11, 
-                new Func<System.DateTime, IronRuby.Builtins.MutableString>(IronRuby.StandardLibrary.Yaml.DateTimeOps.TagUri)
-            );
-
-            DefineLibraryMethod(module, "to_yaml_node", 0x12, 
-                new Func<System.DateTime, IronRuby.StandardLibrary.Yaml.RubyRepresenter, IronRuby.StandardLibrary.Yaml.Node>(IronRuby.StandardLibrary.Yaml.DateTimeOps.ToYaml)
-            );
-
-        }
-
         private static void LoadSystem__Double_Instance(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "taguri", 0x11, 
                 new Func<System.Double, IronRuby.Builtins.MutableString>(IronRuby.StandardLibrary.Yaml.YamlDoubleOps.TagUri)

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/RubyYaml.cs

@@ -72,14 +72,14 @@ public static class BaseNode { }
             taggedClasses.Add(MutableString.CreateAscii("tag:ruby.yaml.org,2002:struct"), context.GetClass(typeof(RubyStruct)));
             taggedClasses.Add(MutableString.CreateAscii("tag:ruby.yaml.org,2002:sym"), context.GetClass(typeof(SymbolId)));
             taggedClasses.Add(MutableString.CreateAscii("tag:ruby.yaml.org,2002:symbol"), context.GetClass(typeof(SymbolId)));
-            taggedClasses.Add(MutableString.CreateAscii("tag:ruby.yaml.org,2002:time"), context.GetClass(typeof(DateTime)));
+            taggedClasses.Add(MutableString.CreateAscii("tag:ruby.yaml.org,2002:time"), context.GetClass(typeof(Time)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:binary"), context.GetClass(typeof(MutableString)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:float"), context.GetClass(typeof(Double)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:int"), context.GetClass(typeof(Integer)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:map"), context.GetClass(typeof(Hash)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:seq"), context.GetClass(typeof(RubyArray)));
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:str"), context.GetClass(typeof(MutableString)));
-            taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:timestamp"), context.GetClass(typeof(DateTime)));
+            taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:timestamp"), context.GetClass(typeof(Time)));
 
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:bool#no"), context.FalseClass);
             taggedClasses.Add(MutableString.CreateAscii("tag:yaml.org,2002:bool#yes"), context.TrueClass);

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/time/dst_tags.txt

@@ -0,0 +1 @@
+unstable:Time#dst? dst? returns whether time is during daylight saving time

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/time/isdst_tags.txt

@@ -0,0 +1 @@
+unstable:Time#isdst dst? returns whether time is during daylight saving time

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/time/yday_tags.txt

@@ -0,0 +1 @@
+unstable:Time#yday returns an integer representing the day of the year, 1..366

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/core/file/new_spec.rb

@@ -14,8 +14,12 @@
 
   after :each do
     @fh.close if @fh and not @fh.closed?
-    File.delete(@file) if File.exists?(@file)
     @fh = nil
+    begin
+      File.delete(@file) if File.exists?(@file)
+    rescue Errno::EACCES
+      File.delete(@file) if File.exists?(@file)
+    end
   end
 
   it "return a new File with mode string" do

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/core/file/utime_spec.rb

@@ -22,4 +22,10 @@
     File.atime(@file2).to_i.should be_close(@atime.to_i, 2)
     File.mtime(@file2).to_i.should be_close(@mtime.to_i, 2)
   end
+
+  it "treats nil times as Time.now" do
+    File.utime(nil, nil, @file1).should == 1
+    File.atime(@file1).to_i.should be_close(@atime.to_i, 2)
+    File.mtime(@file1).to_i.should be_close(@mtime.to_i, 2)
+  end
 end

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/core/time/shared/gmtime.rb

@@ -7,4 +7,11 @@
       t.should == Time.gm(2007, 1, 9, 12, 0, 0)
     end
   end
+
+  it "changes the receiver" do
+    t = Time.now
+    t.utc?.should be_false
+    t.send(@method)
+    t.utc?.should be_true
+  end
 end

Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/library/logger/logger/new_spec.rb

@@ -12,7 +12,11 @@
   after :each do
     @log_file.close unless @log_file.closed?
     @l.close if @l
-    File.unlink(@file_path) if File.exists?(@file_path)
+    begin
+      File.unlink(@file_path) if File.exists?(@file_path)
+    rescue Errno::EACCES
+      File.unlink(@file_path) if File.exists?(@file_path)
+    end
   end
 
    it "creates a new logger object" do

Merlin/Main/Config/Signed/App.config

@@ -7,7 +7,7 @@
   <microsoft.scripting>
     <languages>
       <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby" type="IronRuby.Runtime.RubyContext, IronRuby, Version=0.9.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby" type="IronRuby.Runtime.RubyContext, IronRuby, Version=0.9.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     </languages>
 
     <options>

Merlin/Main/Config/Unsigned/App.config

@@ -7,7 +7,7 @@
   <microsoft.scripting>
     <languages>
       <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=null" />
-      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby" type="IronRuby.Runtime.RubyContext, IronRuby, Version=0.9.2.0, Culture=neutral, PublicKeyToken=null" />
+      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby" type="IronRuby.Runtime.RubyContext, IronRuby, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null" />
     </languages>
 
     <options>

Merlin/Main/Hosts/SilverLight/Chiron/App.config

@@ -91,14 +91,20 @@
     2. the urlPrefix will be added to relative assembly paths
   If externalUrlPrefix is set:
     1. language extensions are added at the end of Deployment.ExternalParts
+    
+  Note that "ExternalCallersFromCrossDomain" is set to "ScriptableOnly" so
+  having the XAP file cross-domain can access the caller's DOM:
+  http://msdn.microsoft.com/en-us/library/cc645023%28VS.95%29.aspx
   -->
   <AppManifest.xaml>
     <Deployment 
       xmlns="http://schemas.microsoft.com/client/2007/deployment" 
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
       RuntimeVersion="2.0.31005.0"
       EntryPointAssembly="Microsoft.Scripting.Silverlight" 
-      EntryPointType="Microsoft.Scripting.Silverlight.DynamicApplication">
+      EntryPointType="Microsoft.Scripting.Silverlight.DynamicApplication"
+      ExternalCallersFromCrossDomain="ScriptableOnly"
+      >
 
       <!-- Add assembly references here -->
       <Deployment.Parts>