Hokkaido 0.0.5 → 0.0.6

data/lib/Hokkaido/version.rb

@@ -1,3 +1,3 @@
 module Hokkaido
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/term/ansicolor.rb

@@ -1,127 +1,102 @@
-Motion::Project::App.setup do |app|
-  app.files << File.expand_path(File.join(File.dirname(__FILE__),'ansicolor.rb'))
-end
-module Hokkaido
-  module Term
-    # The ANSIColor module can be used for namespacing and mixed into your own
-    # classes.
-    module ANSIColor
-      # :stopdoc:
-      ATTRIBUTES = [
-        [ :clear        ,   0 ], 
-        [ :reset        ,   0 ],     # synonym for :clear
-        [ :bold         ,   1 ], 
-        [ :dark         ,   2 ], 
-        [ :italic       ,   3 ],     # not widely implemented
-        [ :underline    ,   4 ], 
-        [ :underscore   ,   4 ],     # synonym for :underline
-        [ :blink        ,   5 ], 
-        [ :rapid_blink  ,   6 ],     # not widely implemented
-        [ :negative     ,   7 ],     # no reverse because of String#reverse
-        [ :concealed    ,   8 ], 
-        [ :strikethrough,   9 ],     # not widely implemented
-        [ :black        ,  30 ], 
-        [ :red          ,  31 ], 
-        [ :green        ,  32 ], 
-        [ :yellow       ,  33 ], 
-        [ :blue         ,  34 ], 
-        [ :magenta      ,  35 ], 
-        [ :cyan         ,  36 ], 
-        [ :white        ,  37 ], 
-        [ :on_black     ,  40 ], 
-        [ :on_red       ,  41 ], 
-        [ :on_green     ,  42 ], 
-        [ :on_yellow    ,  43 ], 
-        [ :on_blue      ,  44 ], 
-        [ :on_magenta   ,  45 ], 
-        [ :on_cyan      ,  46 ], 
-        [ :on_white     ,  47 ], 
-      ]
-
-      ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
-      # :startdoc:
-
-      # Returns true, if the coloring function of this module
-      # is switched on, false otherwise.
-      def self.coloring?
-        @coloring
-      end
-
-      # Turns the coloring on or off globally, so you can easily do
-      # this for example:
-      #  Cucumber::Term::ANSIColor::coloring = STDOUT.isatty
-      def self.coloring=(val)
-        @coloring = val
-      end
-      self.coloring = true
+#require 'term/ansicolor/version'
 
-      ATTRIBUTES.each do |c, v|
-# Module#eval is disabled in motion#         eval %Q{
-            def #{c}(string = nil)
-              result = ''
-              result << "\e[#{v}m" if Hokkaido::Term::ANSIColor.coloring?
-              if block_given?
-                result << yield
-              elsif string
-                result << string
-              elsif respond_to?(:to_str)
-                result << to_str
-              else
-                return result #only switch on
-              end
-              result << "\e[0m" if Hokkaido::Term::ANSIColor.coloring?
-              result
-            end
-        }
-      end
+module Term
+  # The ANSIColor module can be used for namespacing and mixed into your own
+  # classes.
+  module ANSIColor
+    # :stopdoc:
+    ATTRIBUTES = [
+      [ :clear        ,   0 ], 
+      [ :reset        ,   0 ],     # synonym for :clear
+      [ :bold         ,   1 ], 
+      [ :dark         ,   2 ], 
+      [ :italic       ,   3 ],     # not widely implemented
+      [ :underline    ,   4 ], 
+      [ :underscore   ,   4 ],     # synonym for :underline
+      [ :blink        ,   5 ], 
+      [ :rapid_blink  ,   6 ],     # not widely implemented
+      [ :negative     ,   7 ],     # no reverse because of String#reverse
+      [ :concealed    ,   8 ], 
+      [ :strikethrough,   9 ],     # not widely implemented
+      [ :black        ,  30 ], 
+      [ :red          ,  31 ], 
+      [ :green        ,  32 ], 
+      [ :yellow       ,  33 ], 
+      [ :blue         ,  34 ], 
+      [ :magenta      ,  35 ], 
+      [ :cyan         ,  36 ], 
+      [ :white        ,  37 ], 
+      [ :on_black     ,  40 ], 
+      [ :on_red       ,  41 ], 
+      [ :on_green     ,  42 ], 
+      [ :on_yellow    ,  43 ], 
+      [ :on_blue      ,  44 ], 
+      [ :on_magenta   ,  45 ], 
+      [ :on_cyan      ,  46 ], 
+      [ :on_white     ,  47 ], 
+    ]
 
-      # Regular expression that is used to scan for ANSI-sequences while
-      # uncoloring strings.
-      COLORED_REGEXP = /\e\[(?:[34][0-7]|[0-9])?m/
+    ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
+    # :startdoc:
 
+    # Returns true, if the coloring function of this module
+    # is switched on, false otherwise.
+    def self.coloring?
+      @coloring
+    end
 
-      def self.included(klass)
-        if version_is_greater_than_18? and klass == String
-          ATTRIBUTES.delete(:clear)
-          ATTRIBUTE_NAMES.delete(:clear)
-        end
-      end
+    # Turns the coloring on or off globally, so you can easily do
+    # this for example:
+    #  Term::ANSIColor::coloring = STDOUT.isatty
+    def self.coloring=(val)
+      @coloring = val
+    end
+    self.coloring = true
 
-      # Returns an uncolored version of the string, that is all
-      # ANSI-sequences are stripped from the string.
-      def uncolored(string = nil) # :yields:
-        if block_given?
-          yield.gsub(COLORED_REGEXP, '')
-        elsif string
-          string.gsub(COLORED_REGEXP, '')
-        elsif respond_to?(:to_str)
-          to_str.gsub(COLORED_REGEXP, '')
-        else
-          ''
-        end
-      end
+    ATTRIBUTES.each do |c, v|
+      eval %Q{
+          def #{c}(string = nil)
+            result = ''
+            result << "\e[#{v}m" if Term::ANSIColor.coloring?
+            if block_given?
+              result << yield
+            elsif string
+              result << string
+            elsif respond_to?(:to_str)
+              result << to_str
+            else
+              return result #only switch on
+            end
+            result << "\e[0m" if Term::ANSIColor.coloring?
+            result
+          end
+      }
+    end
 
-      module_function
+    # Regular expression that is used to scan for ANSI-sequences while
+    # uncoloring strings.
+    COLORED_REGEXP = /\e\[(?:[34][0-7]|[0-9])?m/
 
-      # Returns an array of all Hokkaido::Term::ANSIColor attributes as symbols.
-      def attributes
-        ATTRIBUTE_NAMES
+    # Returns an uncolored version of the string, that is all
+    # ANSI-sequences are stripped from the string.
+    def uncolored(string = nil) # :yields:
+      if block_given?
+        yield.gsub(COLORED_REGEXP, '')
+      elsif string
+        string.gsub(COLORED_REGEXP, '')
+      elsif respond_to?(:to_str)
+        to_str.gsub(COLORED_REGEXP, '')
+      else
+        ''
       end
-      extend self
+    end
 
-      private
+    module_function
 
-      def version_is_greater_than_18?
-        version = RUBY_VERSION.split('.')
-        version.map! &:to_i
-        version[0] >= 1 && version[1] > 8
-      end
+    # Returns an array of all Term::ANSIColor attributes as symbols.
+    def attributes
+      ATTRIBUTE_NAMES
     end
-  end
-end
-
-class String
-  def colorize(sym)
-    Hokkaido::Term::ANSIColor.send(sym, self)
+    extend self
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Hokkaido
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: