ccp 0.4.4 → 0.4.5

data/lib/ccp/utils/colorize.rb

@@ -5,6 +5,8 @@ module Ccp
       # Ccp::Utils::Colorize::Fore.red("hello")
       # Ccp::Utils::Colorize::Back.red("hello")
       # Ccp::Utils::Colorize.red("hello")        # same as Fore
+      # Ccp::Utils::Colorize.strip(ansi_color_string)
+      # Ccp::Utils::Colorize::Bar.success("[%s]", 10, 0.5)  # => "[||||    ]"
 
       module Fore
         CLEAR   = "\e[0m"
@@ -60,6 +62,79 @@ module Ccp
         extend self
       end
 
+      module Bar
+        class Progress
+          def initialize(colors, format, size, widths, chars = nil)
+            @colors = colors.must.coerced(Array, Symbol=>lambda{|x| [x, :black]}) # [:green, :black]
+            @format = format.must(String)               # "Mem[%sMB]"
+            @size   = size.must(Fixnum)                 # 73
+            @widths = widths.must(Fixnum, Float, Array) # [4004,24105]
+            @chars  = chars.must(Array)  { ["|", " "] }
+
+            if @widths.is_a?(Array) and @widths.size != 2
+              raise "widths.size expected %d, but got %d" % [2, @widths.size]
+            end
+            @chars.size  == 2 or raise "chars.size expected %d, but got %d" % [2, @chars.size]
+            @colors.size == 2 or raise "colors.size expected %d, but got %d" % [2, @colors.size]
+
+            @label  = label(@widths)                    # "4004/24105"
+            @rate   = rate(@widths)                     # 0.16
+          end
+
+          def to_s
+            rest = @size - @format.size + 2 - @label.size
+            return @format % @label if rest <= 0
+            return @format % (bar(rest) + @label)
+          end
+
+          private
+            def bar(max)
+              o = @chars.first * ((max * @rate).ceil)   # "||||"
+              x = @chars.last  * (max - o.size)         # "                  "
+              Colorize.__send__(@colors.first, o) + Colorize.__send__(@colors.last, x)
+            end
+
+            def label(width)
+              p = lambda{|x| x.is_a?(Float) ? ("%.1f" % x) : x.to_s }
+
+              case width
+              when Float
+                return("%.1f%%" % [width*100])
+              when Array
+                return width.map{|_| p[_]}.join("/")
+              else
+                return p[width] + "%"
+              end
+            end
+
+            def rate(x)
+              r = case x
+                  when Fixnum ; x / 100.0
+                  when Float  ; x
+                  when Array  ; (v, a) = x; rate(v.to_f/a)
+                  else ; raise "error: rate got #{x.class}"
+                  end
+              return [[0.0, r].max, 1.0].min
+            end
+        end
+
+        def green (*args) Progress.new(:green , *args).to_s; end
+        def blue  (*args) Progress.new(:blue  , *args).to_s; end
+        def yellow(*args) Progress.new(:yellow, *args).to_s; end
+        def red   (*args) Progress.new(:red   , *args).to_s; end
+
+        alias :success :green
+        alias :info    :blue
+        alias :warning :yellow
+        alias :danger  :red
+
+        extend self
+      end
+
+      def self.strip(string)
+        string.gsub(/\x1B\[[0-9;]*[mK]/, '')
+      end
+
       include Fore
       extend  Fore
     end

data/lib/ccp/utils/test_failed.rb

@@ -39,7 +39,7 @@ module Ccp
           raise Ccp::Failed, "#{cmd.class} should write #{key} but not found"
         end
         TestFailed::Differ.new(exp, got, key).execute
-        raise Ccp::Failed, "[FATAL] %s expected %s, but got %s" % [cmd.class, exp_type.inspect, got_type.inspect]
+        raise Ccp::Failed, "[FATAL] %s expected %s, but got %s" % [cmd.class, exp.class, got.class]
       }
     end
   end

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/utils/colorize_bar_spec.rb

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Ccp::Utils::Colorize::Bar do
+  delegate :strip, :to=>"Ccp::Utils::Colorize"
+  delegate :success, :to=>"Ccp::Utils::Colorize::Bar"
+
+  ######################################################################
+  ### API
+
+  subject { Ccp::Utils::Colorize::Bar }
+  it { should respond_to(:success) }
+  it { should respond_to(:info) }
+  it { should respond_to(:warning) }
+  it { should respond_to(:danger) }
+
+  it { should respond_to(:green) }
+  it { should respond_to(:blue) }
+  it { should respond_to(:yellow) }
+  it { should respond_to(:red) }
+
+  ######################################################################
+  ### Success
+
+  describe ".success" do
+    subject { strip(success(*args)) }
+
+    context '("Mem[%sMB]", 73, [4004,24105])' do
+      let(:args) { ["Mem[%sMB]", 73, [4004,24105]] }
+      it { should == "Mem[||||||||||                                              4004/24105MB]" }
+    end
+
+    context '("Mem[%s]", 73, 0.16)' do
+      let(:args) { ["Mem[%s]", 73, 0.16] }
+      it { should == "Mem[|||||||||||                                                    16.0%]" }
+    end
+
+    context '"Mem[%s]", 73, 16' do
+      let(:args) { ["Mem[%s]", 73, 16] }
+      it { should == "Mem[|||||||||||                                                      16%]" }
+    end
+
+    ######################################################################
+    ### invalid value
+
+    context '("Mem[%s]", 73, -10)' do
+      let(:args) { ["Mem[%s]", 73, -10] }
+      it { should == "Mem[                                                                -10%]" }
+    end
+
+    context '("Mem[%s]", 73, -1.2)' do
+      let(:args) { ["Mem[%s]", 73, -1.2] }
+      it { should == "Mem[                                                             -120.0%]" }
+    end
+
+    context '("Mem[%s]", 73, [-10, 30])' do
+      let(:args) { ["Mem[%s]", 73, [-10, 30]] }
+      it { should == "Mem[                                                              -10/30]" }
+    end
+
+    context '("Mem[%s]", 73, 300)' do
+      let(:args) { ["Mem[%s]", 73, 300] }
+      it { should == "Mem[||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||300%]" }
+    end
+
+    context '("Mem[%s]", 73, 1.5)' do
+      let(:args) { ["Mem[%s]", 73, 1.5] }
+      it { should == "Mem[||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||150.0%]" }
+    end
+
+    context '("Mem[%s]", 73, [1000, 50])' do
+      let(:args) { ["Mem[%s]", 73, [1000, 50]] }
+      it { should == "Mem[|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||1000/50]" }
+    end
+  end
+end

data/spec/utils/colorize_spec.rb

@@ -53,4 +53,13 @@ describe Ccp::Utils::Colorize do
     subject { Object.new.extend(Ccp::Utils::Colorize::Back) }
     it { should be }
   end
+
+  describe ".strip" do
+    delegate :green, :strip, :to=>"Ccp::Utils::Colorize"
+
+    specify "should strip ansi-color codes" do
+      strip(green("foo")).should == "foo"
+      strip(green("foo") + ":" + green("bar") + ";").should == "foo:bar;"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -308,6 +308,7 @@ files:
 - spec/spec_helper.rb
 - spec/storage/loadable_spec.rb
 - spec/storage/usecase_spec.rb
+- spec/utils/colorize_bar_spec.rb
 - spec/utils/colorize_spec.rb
 homepage: http://github.com/maiha/ccp
 licenses: