adapt to latest changes in y2r

src/ruby/ycp/ycp.rb

@@ -52,29 +52,21 @@ def deep_copy object
   alias_method :copy_arg, :deep_copy
 
   def self.include(target, path)
-    path_without_suffix = path.sub("\.rb$","")
+    path_without_suffix = path.sub(/\.rb$/,"")
     module_name = path_without_suffix.
       gsub(/^./)     { |s| s.upcase }.
-      gsub(/\/./)    { |s| "::" + s[1].upcase }.
+      gsub(/\/./)    { |s| s[1].upcase }.
       gsub(/[-_.]./) { |s| s[1].upcase } +
       "Include"
 
-    name_parts = module_name.split("::")
-
-    parent = YCP
-    loaded = name_parts.all? do |name_part|
-      next false unless parent.constants.include? name_part.to_sym
-      parent = parent.const_get name_part
-    end
+    loaded = YCP.constants.include? module_name.to_sym
 
     unless loaded
       path = find_include_file path
       require path
     end
 
-    mod = name_parts.reduce(YCP) do |parent, module_name|
-      YCP.const_get module_name
-    end
+    mod = YCP.const_get module_name
 
     return if target.class.include? mod