term_canvas 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d343b9c662b9a2613d77e82f2cd905103e78416715e6c26044f5605169a847
-  data.tar.gz: 1feb22194cfa0a56d7ef10d6e01b270976cfba79e89711a52049e1b8460766d0
+  metadata.gz: 033fa3247733631e6e4132b06ab0a7265c6f9f04a89cba1beda888c8af4d5de8
+  data.tar.gz: b16b6ed27e7a240346c6f0eaa4f3a9af2ac96d4444e02bba799a448e696c4c2d
 SHA512:
-  metadata.gz: 052d7fac4a035d0257c196ed36b637dec5ff03e39dcde2dc60096a32b34cfe0bb82fa6fab79c14f036f5670b817ce0eb56d19997bd25f9ec00821f5fbaedbd27
-  data.tar.gz: 7821d72cfa812494e3a098f0ad14453cf3b610ea53dee76d74a6a4c254e300ef45fa74937f9fe898a65d4199048500c8cfc34d47cc7df02301d4e9569d025b0a
+  metadata.gz: 69c4ef931f14020aacffc18351cfd7a0d57350ef0f00eaff8af2c606a08da6924c87085f5bfd37cb3ef7b3f46c692f894b6c4709f7cf5609c9c8daa9ab1746dc
+  data.tar.gz: a6308cdf09d6584c303ba1020a214826da0503629ed7ce97d3d242fdff567d380ca0b75efd7cbf6c69942f718fab2146d8d68b15e4ffcac7278b37c959ec3c73

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    term_canvas (0.1.0)
+    term_canvas (0.2.0)
       curses
 
 GEM
   remote: https://rubygems.org/
   specs:
-    curses (1.2.7)
+    curses (1.3.1)
     diff-lcs (1.3)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   rake (~> 10.0)
   rspec (~> 3.0)
   term_canvas!

data/README.md

@@ -1,6 +1,6 @@
 # TermCanvas
 Wrapper library for `curses` of ruby.
-You can handle colors easily.
+You can easily draw text on your terminal and handle colors easily.
 
 ## Installation
 

data/lib/term_canvas/base_screen.rb

@@ -1,78 +1,80 @@
 require 'singleton'
 require 'curses'
-class BaseScreen
-  include Singleton
+module TermCanvas
+  class BaseScreen
+    include Singleton
 
-  def initialize
-    Curses.init_screen
-    Curses::noecho
-    Curses.curs_set(0)
-    Curses.stdscr.nodelay = 1
-    Curses.start_color
-    Curses.use_default_colors
-    @color_struct = Struct.new(:id, :r, :g, :b)
-    @color_pair_struct = Struct.new(:id, :fc_id, :bc_id)
-    @color_pairs = [@color_pair_struct.new(0, 1, 0)]
-    @colors = [@color_struct.new(0, 0, 0, 0)]
-    @color_id_offset = 16
-  end
+    def initialize
+      Curses.init_screen
+      Curses::noecho
+      Curses.curs_set(0)
+      Curses.stdscr.nodelay = 1
+      Curses.start_color
+      Curses.use_default_colors
+      @color_struct = Struct.new(:id, :r, :g, :b)
+      @color_pair_struct = Struct.new(:id, :fc_id, :bc_id)
+      @color_pairs = [@color_pair_struct.new(0, 1, 0)]
+      @colors = [@color_struct.new(0, 0, 0, 0)]
+      @color_id_offset = 16
+    end
 
-  # @param foreground_color [Hash]
-  #   :r Red element of color of text.
-  #   :g Green element of color of text.
-  #   :b Blue element of color of text.
-  # @param background_color [Hash]
-  #   :r Red element of color of background.
-  #   :g Green element of color of background.
-  #   :b Blue element of color of background.
-  def find_or_create_color_pair(foreground_color: nil, background_color:)
-    response_color_pair = nil
-    fc_id = find_or_create_color(
-      @color_struct.new(*foreground_color&.values_at(*@color_struct.members))
-    ).id
-    bc_id = find_or_create_color(
-      @color_struct.new(*background_color&.values_at(*@color_struct.members))
-    ).id
-    @color_pairs.each do |cp|
-      if cp.fc_id == fc_id && cp.bc_id == bc_id
-        response_color_pair = cp
-        break
+    # @param foreground_color [Hash]
+    #   :r Red element of color of text.
+    #   :g Green element of color of text.
+    #   :b Blue element of color of text.
+    # @param background_color [Hash]
+    #   :r Red element of color of background.
+    #   :g Green element of color of background.
+    #   :b Blue element of color of background.
+    def find_or_create_color_pair(foreground_color: nil, background_color:)
+      response_color_pair = nil
+      fc_id = find_or_create_color(
+        @color_struct.new(*foreground_color&.values_at(*@color_struct.members))
+      ).id
+      bc_id = find_or_create_color(
+        @color_struct.new(*background_color&.values_at(*@color_struct.members))
+      ).id
+      @color_pairs.each do |cp|
+        if cp.fc_id == fc_id && cp.bc_id == bc_id
+          response_color_pair = cp
+          break
+        end
       end
+      return response_color_pair || create_color_pair(fc_id, bc_id)
     end
-    return response_color_pair || create_color_pair(fc_id, bc_id)
-  end
 
-  private
+    private
 
-    def find_or_create_color(color)
-      return @colors.find { |c| c.id == 0 } if color.r.nil?
-      response_color = nil
-      @colors.each do |_color|
-        if same_color?(color, _color)
-          response_color = _color
-          break
+      def find_or_create_color(color)
+        return @colors.find { |c| c.id == 0 } if color.r.nil?
+        response_color = nil
+        @colors.each do |_color|
+          if same_color?(color, _color)
+            response_color = _color
+            break
+          end
         end
+        return response_color || create_color(r: color.r, g: color.g, b: color.b)
       end
-      return response_color || create_color(r: color.r, g: color.g, b: color.b)
-    end
 
-    def create_color(r:, g:, b:)
-      new_color_id = @colors.count + @color_id_offset
-      new_color = @color_struct.new(new_color_id, r, g, b)
-      Curses.init_color(*new_color)
-      @colors << new_color
-      return new_color
-    end
+      def create_color(r:, g:, b:)
+        new_color_id = @colors.count + @color_id_offset
+        new_color = @color_struct.new(new_color_id, r, g, b)
+        Curses.init_color(*new_color)
+        @colors << new_color
+        return new_color
+      end
 
-    def create_color_pair(fc_id, bc_id)
-      new_color_pair_id = @color_pairs.count
-      new_color_pair = @color_pair_struct.new(new_color_pair_id, fc_id, bc_id)
-      Curses.init_pair(*new_color_pair)
-      @color_pairs << new_color_pair
-      return new_color_pair
-    end
+      def create_color_pair(fc_id, bc_id)
+        new_color_pair_id = @color_pairs.count
+        new_color_pair = @color_pair_struct.new(new_color_pair_id, fc_id, bc_id)
+        Curses.init_pair(*new_color_pair)
+        @color_pairs << new_color_pair
+        return new_color_pair
+      end
 
-    def same_color?(color1, color2)
-      return color1.r == color2.r && color1.g == color2.g && color1.b == color2.b
-    end
+      def same_color?(color1, color2)
+        return color1.r == color2.r && color1.g == color2.g && color1.b == color2.b
+      end
+  end
 end

data/lib/term_canvas/object.rb

@@ -1,8 +1,10 @@
-class Object::TermCanvas
-  attr_reader :index
+module TermCanvas
+  class Object
+    attr_reader :index
 
-  # @param index [Integer]
-  def set_index(index)
-    @object_index = index
+    # @param index [Integer]
+    def set_index(index)
+      @object_index = index
+    end
   end
 end

data/lib/term_canvas/rect.rb

@@ -1,35 +1,37 @@
-class Rect < Object::TermCanvas
-  attr_reader :background_color
+module TermCanvas
+  class Rect < TermCanvas::Object
+    attr_reader :background_color
 
-  # @param x [Integer] Horizontal position of the object.
-  # @param y [Integer] Vertical position of the object.
-  # @param background_color [Hash] :r Red element of color of background.
-  # @param background_color [Hash] :g Green element of color of background.
-  # @param background_color [Hash] :b Blue element of color of background.
-  def initialize(x:, y:, width:, height:, background_color:)
-    @x = x
-    @y = y
-    @width = width
-    @height = height
-    @background_color = background_color
-  end
+    # @param x [Integer] Horizontal position of the object.
+    # @param y [Integer] Vertical position of the object.
+    # @param background_color [Hash] :r Red element of color of background.
+    # @param background_color [Hash] :g Green element of color of background.
+    # @param background_color [Hash] :b Blue element of color of background.
+    def initialize(x:, y:, width:, height:, background_color:)
+      @x = x
+      @y = y
+      @width = width
+      @height = height
+      @background_color = background_color
+    end
 
-  def foreground_color
-    nil
-  end
+    def foreground_color
+      nil
+    end
 
-  # @param win [Curses::Window] Window to draw
-  def draw(win)
-    color_pair_id = BaseScreen.instance.find_or_create_color_pair(
-      background_color: @background_color,
-    ).id
-    color_pair = Curses.color_pair(color_pair_id)
-    win.setpos(@y, @x)
-    win.attron(color_pair)
-    @height.times do
-      win.addstr(" " * @width)
-      win.setpos(win.cury + 1, @x)
+    # @param win [Curses::Window] Window to draw
+    def draw(win)
+      color_pair_id = TermCanvas::BaseScreen.instance.find_or_create_color_pair(
+        background_color: @background_color,
+      ).id
+      color_pair = Curses.color_pair(color_pair_id)
+      win.setpos(@y, @x)
+      win.attron(color_pair)
+      @height.times do
+        win.addstr(" " * @width)
+        win.setpos(win.cury + 1, @x)
+      end
+      win.attroff(color_pair)
     end
-    win.attroff(color_pair)
   end
 end

data/lib/term_canvas/text.rb

@@ -1,35 +1,37 @@
-class Text < Object::TermCanvas
-  attr_reader :foreground_color, :background_color
+module TermCanvas
+  class Text < Object::TermCanvas
+    attr_reader :foreground_color, :background_color
 
-  # @param x [Integer] Horizontal position of the object.
-  # @param y [Integer] Vertical position of the object.
-  # @param body [String] Text body.
-  # @param foreground_color [Hash]
-  #   :r Red element of color of text.
-  #   :g Green element of color of text.
-  #   :b Blue element of color of text.
-  # @param background_color [Hash]
-  #   :r Red element of color of background.
-  #   :g Green element of color of background.
-  #   :b Blue element of color of background.
-  def initialize(x:, y:, body:, foreground_color:, background_color:)
-    @x = x
-    @y = y
-    @body = body
-    @foreground_color = foreground_color
-    @background_color = background_color
-  end
+    # @param x [Integer] Horizontal position of the object.
+    # @param y [Integer] Vertical position of the object.
+    # @param body [String] Text body.
+    # @param foreground_color [Hash]
+    #   :r Red element of color of text.
+    #   :g Green element of color of text.
+    #   :b Blue element of color of text.
+    # @param background_color [Hash]
+    #   :r Red element of color of background.
+    #   :g Green element of color of background.
+    #   :b Blue element of color of background.
+    def initialize(x:, y:, body:, foreground_color:, background_color:)
+      @x = x
+      @y = y
+      @body = body
+      @foreground_color = foreground_color
+      @background_color = background_color
+    end
 
-  # @param win [Curses::Window] Window to draw
-  def draw(win)
-    color_pair_id = BaseScreen.instance.find_or_create_color_pair(
-      foreground_color: @foreground_color,
-      background_color: @background_color,
-    ).id
-    color_pair = Curses.color_pair(color_pair_id)
-    win.setpos(@y, @x)
-    win.attron(color_pair)
-    win.addstr(@body)
-    win.attroff(color_pair)
+    # @param win [Curses::Window] Window to draw
+    def draw(win)
+      color_pair_id = TermCanvas::BaseScreen.instance.find_or_create_color_pair(
+        foreground_color: @foreground_color,
+        background_color: @background_color,
+      ).id
+      color_pair = Curses.color_pair(color_pair_id)
+      win.setpos(@y, @x)
+      win.attron(color_pair)
+      win.addstr(@body)
+      win.attroff(color_pair)
+    end
   end
 end

data/lib/term_canvas/version.rb

@@ -1,3 +1,3 @@
 module TermCanvas
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/term_canvas.rb

@@ -11,7 +11,7 @@ class TermCanvas
   # @param w [Integer] Width of the window.
   # @param h [Integer] Height of the window.
   def initialize(x:, y:, w:, h:)
-    BaseScreen.instance
+    TermCanvas::BaseScreen.instance
     @win = Curses::Window.new(h, w, y, x)
     @x = x
     @y = y
@@ -55,7 +55,7 @@ class TermCanvas
   # Add text object to the window but not display.
   # @param object [Text] Text instance
   def text(object)
-    raise 'The argument must be Text' if !(Text === object)
+    raise 'The argument must be Text' if !(TermCanvas::Text === object)
     object.set_index(@object_index)
     @objects << object
     @object_index += 1
@@ -63,7 +63,7 @@ class TermCanvas
 
   # Add rect object to the window but not display.
   def rect(object)
-    raise 'The argument must be Rect' if !(Rect === object)
+    raise 'The argument must be Rect' if !(TermCanvas::Rect === object)
     object.set_index(@object_index)
     @objects << object
     @object_index += 1

data/term_canvas.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "curses"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term_canvas
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kthatoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,12 +81,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _examples/curses.rb
+- _examples/simplified_chart.rb
+- _examples/test.rb
 - bin/console
 - bin/setup
 - bin/update
-- examples/curses.rb
-- examples/simplified_chart.rb
-- examples/test.rb
 - lib/term_canvas.rb
 - lib/term_canvas/base_screen.rb
 - lib/term_canvas/object.rb