Merge pull request #147 from ancorgs/fix_core_ext

Fixes in the new Yast::CoreExt functionality
yast · Jun 18, 2015 · 453c4cf · 453c4cf
2 parents 06d926b + 236bb41
commit 453c4cf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-ruby-bindings.changes b/package/yast2-ruby-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 18 11:41:32 UTC 2015 - ancor@suse.com
+
+- Fixes in the new Yast::CoreExt functionality (part of the fix
+  for bnc#921233)
+- 3.1.36
+
 -------------------------------------------------------------------
 Wed Jun 17 16:45:11 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-ruby-bindings.spec b/package/yast2-ruby-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ruby-bindings
-Version:        3.1.35
+Version:        3.1.36
 Url:            https://github.com/yast/yast-ruby-bindings
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/ruby/CMakeLists.txt b/src/ruby/CMakeLists.txt
@@ -2,7 +2,9 @@ add_definitions(-DY2LOG=\"Ruby\")
 
 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*/*.rb")
 FILE(GLOB rspec "${CMAKE_CURRENT_SOURCE_DIR}/yast/rspec/*.rb")
+FILE(GLOB core_ext "${CMAKE_CURRENT_SOURCE_DIR}/yast/core_ext/*.rb")
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/yast.rb DESTINATION ${RUBY_VENDORLIB_DIR} )
 INSTALL(FILES ${files} DESTINATION ${RUBY_VENDORLIB_DIR}/yast)
 INSTALL(FILES ${rspec} DESTINATION ${RUBY_VENDORLIB_DIR}/yast/rspec)
+INSTALL(FILES ${core_ext} DESTINATION ${RUBY_VENDORLIB_DIR}/yast/core_ext)
 
diff --git a/src/ruby/yast/core_ext/ansi_string.rb b/src/ruby/yast/core_ext/ansi_string.rb
@@ -1,7 +1,7 @@
 module Yast
   module CoreExt
     module AnsiString
-      refine String do
+      refine ::String do
         # Removes color and cursor escape codes (modifying the string)
         # http://en.wikipedia.org/wiki/ANSI_escape_code
         def remove_ansi_sequences