tallyit 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fca7d5efd7cad56a817d894094fe7e45deaae7
-  data.tar.gz: 4cf6d538921e3b7b3d2a57086488736226425146
+  metadata.gz: 38ec3d1e23c22d5fe35efc72c2e5104bf38d08c6
+  data.tar.gz: a6934f2eca2b4f06fce2856521ad919631db2ff3
 SHA512:
-  metadata.gz: 1a0911c6e3e2d1764757ec0a8f8b03fe55eff069c41b86f055844aa3250855f945e79d7a9a5735a1bacbf459a4098de23c8e565f9bbb1da558ba7901e1590d15
-  data.tar.gz: aa49db46246218e3e66a9bfa39f6934263befdd99fbc3d14773bcdd94c96c9656cea24106cfac7cd064479398be0703f42b0661a602ab4cf55d5d4a97f310c14
+  metadata.gz: b7ef6f191e80bdef9c30f4995846c40b97dd262a1ece508638f1558d101ab62b37113cf4aede24a2db281e08b86267f340b6c98f7e71b0daa1a267974c0a9bb8
+  data.tar.gz: 10e40cdb9688d81bc16e50016105abecfcf7ea5b6427d891d96f0a8925c08e4116eb2804523282bf18f8ec798d3fd191c412ac3200f337f3549356450280958f

data/exe/tallyit

@@ -4,6 +4,7 @@ $LOAD_PATH << File.expand_path('../../lib/', __FILE__)
 
 require 'optparse'
 require 'tallyit'
+require 'rainbow'
 
 options = {
   :storage_file => File.absolute_path('.tallyit.txt', ENV['HOME']),
@@ -14,21 +15,29 @@ options = {
 option_parser = OptionParser.new do |opts|
   executable_name = File.basename($PROGRAM_NAME)
   opts.banner = "Usage: #{executable_name} [options] <command>"
-  opts.on('-i', '--[no-]income', 'it is a income tally') do |income|
+
+  opts.separator ""
+  opts.separator "Specific options:"
+
+  opts.on('-i', '--[no-]income', 'Tally type flag, income or expend') do |income|
     options[:type] = 'income' if income
   end
-  opts.on('-a AMOUNT', '--amount AMOUNT', Numeric, 'tally amount') do |amount|
+  opts.on('-a AMOUNT', '--amount AMOUNT', Numeric, 'Require a numeric amount') do |amount|
     options[:amount] = amount.round(2)
   end
-  opts.on('-m MSG', '--message MSG', 'tally message') do |msg|
+  opts.on('-m MSG', '--message MSG', 'Set message about the tally') do |msg|
     options[:msg] = msg
   end
-  opts.on('-l LINE', '--line LINE', Integer, 'choose tally line to delete') do |line|
+  opts.on('-l LINE', '--line LINE', Integer, 'Choose the lineno to delete') do |line|
     options[:line] = line
   end
-  opts.on('-f FORMAT', '--format FORMAT', 'output format') do |format|
+  opts.on('--format FORMAT', 'Set the output format "table" or "raw", default: "table"') do |format|
     options[:format] = format
   end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
   opts.on_tail('-h', '--help', 'Show help message') do
     puts opts
     exit
@@ -42,8 +51,8 @@ end
 begin
   option_parser.parse!
   if ARGV.empty?
-    puts "error: you should supply a command"
-    puts option_parser.help
+    STDERR.puts Rainbow("Error: you should supply a command").red.inverse
+    STDERR.puts option_parser
     exit 1
   else
     command = ARGV.shift
@@ -51,7 +60,7 @@ begin
     raise OptionParser::InvalidArgument.new("#{command}") unless all_commands.include?(command)
   end
 rescue OptionParser::InvalidArgument => ex
-  STDERR.puts ex.message
+  STDERR.puts Rainbow(ex.message).red.inverse
   STDERR.puts option_parser
   exit 1
 end

data/lib/tallyit/stat_tally.rb

@@ -12,18 +12,24 @@ module Tallyit
           File.open(file, 'r') do |file|
             file.each_with_index do |line, index|
               tmp = line.chomp.split(' | ')
-              tmp[0] == 'income' ? income_amount << tmp[1].to_f : expend_amount << tmp[1].to_f
+              if tmp[0] == 'income'
+                income_amount << tmp[1].to_f
+                tmp[1] = Rainbow(tmp[1]).green
+              else
+                expend_amount << tmp[1].to_f
+                tmp[1] = Rainbow(tmp[1]).red
+              end
               t << tmp.unshift(index + 1)
             end
           end
           income_total = income_amount.reduce(0, :+)
           expend_total = expend_amount.reduce(0, :+)
           t << :separator
-          t << ['Income total', income_total]
+          t << ['Income total', Rainbow(income_total).green]
           t << :separator
-          t << ['Expend total', expend_total]
+          t << ['Expend total', Rainbow(expend_total).red]
           t << :separator
-          t << ['Remaining', income_total - expend_total]
+          t << ['Remaining', Rainbow(income_total - expend_total).blue.inverse]
         end
         puts table
       elsif format == :raw

data/lib/tallyit/version.rb

@@ -1,3 +1,3 @@
 module Tallyit
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/tallyit.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "terminal-table", "~> 1.5"
+  spec.add_runtime_dependency "rainbow", "~> 2.1"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tallyit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - hzlu
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement