hbtrack 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c701ca5b2187759928514a35a48855eb185fbdc
-  data.tar.gz: 8ec5d9cc6b2b90ca2bef90c4d72e32e9fe096844
+  metadata.gz: 42e80f09161cc593527386d9d47f73364e6a69b6
+  data.tar.gz: 36ad20ec43500749a0261fa496e363efca27a648
 SHA512:
-  metadata.gz: c8c9ec66a9f2fc796ed2a9c0c8e113625ba57c9cef97b30f274333d78d0ab3bcc0168495778da4a53015d1391e2b35c9a2332c5059b3426ec1329fe713b2fa63
-  data.tar.gz: da70844a1d91bc5852b86d76c0ca66de58b77b0359d175dded7da052a7d8489a52df888a1bd4725637521e0ccebc4fad14826869a084545088437d107452b620
+  metadata.gz: 74bfb5ee6b795b000c856b851d88ef36a5ab634d4a07f5eeaedd8811de261778ebe146e2d5e922b70f0e08487783d2b84937c197d105b3626d10f03cabd5e942
+  data.tar.gz: b9b51aec3bd911037382fea14cf13a07ea115e68f00272a1375132f94c22ae37892d243d6ec0322962e74523941e904396e9532c9992e1bf7ea3b49f351b57fd

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/exe/hbtrack

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'hbtrack'
 Hbtrack.run(ARGV)

data/lib/hbtrack/habit.rb

@@ -5,7 +5,7 @@ require 'hbtrack/cli'
 
 module Hbtrack
   # Habit provide a rich library to track the
-  # progress of your habit.  
+  # progress of your habit.
   class Habit
     attr_accessor :name
     attr_reader :progress
@@ -42,8 +42,9 @@ module Hbtrack
         habit_name = arr.shift
         hash = {}
         arr.each do |s|
-          a = s.split(':')
-          hash[a[0].to_sym] = a[1]
+          a = s.split(': ')
+          value = a[1] ? a[1] : ''
+          hash[a[0].to_sym] = value
         end
         Habit.new(habit_name, hash)
       end
@@ -53,7 +54,7 @@ module Hbtrack
 
     def initialize(name,
                    progress = {
-                     Habit.get_progress_key_from(Date.today) => ' '
+                     Habit.get_progress_key_from(Date.today) => ''
                    })
       @name = name
       @progress = progress
@@ -63,9 +64,19 @@ module Hbtrack
       name.length
     end
 
+    def latest_key
+      Habit.get_progress_key_from(Date.today)
+    end
+
     def latest_progress
-      key = Habit.get_progress_key_from(Date.today)
-      progress[key]
+      progress[latest_key]
+    end
+
+    def longest_month
+      key = progress.keys.max_by do |x| 
+        get_month_from(x).length
+      end
+      get_month_from(key)
     end
 
     def done(done = true, date = Date.today)
@@ -75,66 +86,81 @@ module Hbtrack
     end
 
     def pretty_print_all
-      @progress.map do |key, value|
-        convert_key_to_date(key) + pretty_print_progress(value)
+      @progress.map do |key, _value|
+        space = longest_month.length - get_month_from(key).length 
+        convert_key_to_date(key, space) +
+        pretty_print_progress(key)
       end.join("\n")
     end
 
     def pretty_print_latest(no_of_space = 0)
       name.to_s + ' ' * no_of_space + ' : ' +
-        pretty_print_progress(latest_progress)
+        pretty_print_progress(latest_key)
     end
 
-    def pretty_print_progress(progress_value)
-      stat = progress_value.lstrip.split('').map do |x|
+    def pretty_print_progress(key)
+      stat = progress[key].split('').map do |x|
         x == '0' ? Hbtrack::CLI.red('*') : Hbtrack::CLI.green('*')
       end.join('')
-      stat
+      stat + ' ' * (32 - progress[key].size) +
+        one_liner_progress_stat_output_for(key)
+    end
+
+    def convert_key_to_date(key, no_of_space)
+      year = key.to_s.split(",")[0]
+      ' ' * no_of_space + get_month_from(key) + 
+      " #{year}" + " : "
     end
 
-    def convert_key_to_date(key)
+    def get_month_from(key)
       key = key.to_s.split(',')
-      "#{Date::MONTHNAMES[key[1].to_i]} #{key[0]}: "
+      Date::MONTHNAMES[key[1].to_i]
     end
 
     # Get all of the progress of the habit in string form
     #
     # Example:
-    # 
+    #
     #   habit.progress_output
     #   # => "2017,5: 0010001010\n2017,6: 000010010\n"
     #
     def progress_output
       arr = @progress.map do |key, value|
-        "#{key}:#{value}\n"
+        "#{key}: #{value}\n"
       end
       arr.join('')
     end
 
     def progress_stat
-      @progress.map do |key, value|
-        convert_key_to_date(key) + "\n" + 
-        progress_stat_output_for(key)
+      @progress.map do |key, _value|
+        convert_key_to_date(key, 0) + "\n" +
+          progress_stat_output_for(key)
       end.join("\n")
     end
 
+    def one_liner_progress_stat_output_for(key)
+      hash = progress_stat_for(key)
+      "(All: #{progress[key].size}," \
+        " Done: #{hash[:done]}, Undone: #{hash[:undone]})"
+    end
+
     def progress_stat_output_for(key)
       hash = progress_stat_for(key)
       Hbtrack::CLI.green("Done: #{hash[:done]}") + "\n" +
-      Hbtrack::CLI.red("Undone: #{hash[:undone]}") + "\n"
+        Hbtrack::CLI.red("Undone: #{hash[:undone]}") + "\n"
     end
 
     # Get the stat of the progress.
-    # 
+    #
     # key - Key for the progress (hash)
     #
     # Example:
-    #   
+    #
     #   habit.progress_stat_for("2017,5".to_sym)
     #   # => { done: 5, undone: 2 }
     def progress_stat_for(key)
-      undone = @progress[key].split("").count { |x| x == '0'}
-      done = @progress[key].lstrip.length - undone
+      undone = @progress[key].split('').count { |x| x == '0' }
+      done = @progress[key].length - undone
       { done: done, undone: undone }
     end
 
@@ -147,11 +173,11 @@ module Hbtrack
     private
 
     def initialize_progress_hash_from(key)
-      @progress[key] = ' ' unless @progress.key? key
+      @progress[key] = '' unless @progress.key? key
     end
 
     def update_progress_for(key, day, done)
-      i = day - @progress[key].length
+      i = day - @progress[key].length - 1
       result = @progress[key].split('')
       i.times { result << '0' }
       result[day] = done ? '1' : '0'

data/lib/hbtrack/habit_tracker.rb

@@ -47,7 +47,7 @@ module Hbtrack
       @habits.max_by(&:name_length).name
     end
 
-    def method_missing(method_name, *arguments, &block)
+    def method_missing(*args)
       HabitTracker.help
     end
 
@@ -62,20 +62,28 @@ module Hbtrack
     def list(args)
       habit_name, _options = parse_options(args)
       habit = find(habit_name) do
-        @habits.each_with_index do |h, index|
-          space = longest_name.length - h.name_length
-          puts "#{index + 1}. #{h.pretty_print_latest(space)}"
+        if habit_name.nil?
+          list_all_habits
+        else
+         raise_habit_not_found(habit_name)
         end
         return
       end
       puts habit.pretty_print_all
     end
 
+    def list_all_habits 
+      @habits.each_with_index do |h, index|
+        space = longest_name.length - h.name_length
+        puts "#{index + 1}. #{h.pretty_print_latest(space)}"
+      end
+    end
+
     def add(args)
       habit_name, _options = parse_options(args)
       find(habit_name) do
         habit = create(habit_name)
-        save_to_file(habit, "Add") unless habit.nil?
+        save_to_file(habit, 'Add') unless habit.nil?
         return
       end
       puts Hbtrack::CLI.blue("#{habit_name} already existed!")
@@ -85,7 +93,7 @@ module Hbtrack
       habit_name, options = parse_options(args)
       day = get_day_based_on(options)
       habit = find_or_create(habit_name)
-      save_to_file(habit, "Done") do 
+      save_to_file(habit, 'Done') do
         habit.done(true, day)
       end
     end
@@ -93,34 +101,39 @@ module Hbtrack
     def undone(args)
       habit_name, options = parse_options(args)
       day = get_day_based_on(options)
-      habit = find(habit_name) { raise_habit_not_found(habit_name) }
-      save_to_file(habit, "Undone", "blue") do 
+      habit = find(habit_name) { raise_if_habit_error(habit_name) }
+      save_to_file(habit, 'Undone', 'blue') do
         habit.done(false, day)
       end
     end
 
     def remove(args)
       habit_name, _options = parse_options(args)
-      habit = find(habit_name) { raise_habit_not_found(habit_name) }
-      save_to_file(habit, "Remove", "blue") do 
+      habit = find(habit_name) { raise_if_habit_error(habit_name) }
+      save_to_file(habit, 'Remove', 'blue') do
         @habits.delete(habit)
-      end      
+      end
     end
 
     def find_or_create(habit_name)
       habit = find(habit_name) do
-        habit = create(habit_name)       
+        habit = create(habit_name)
         return habit
       end
     end
 
     def create(habit_name)
-      unless habit_name.nil? || habit_name =~ /\s+/
+      unless invalid_habit_name?(habit_name)
         habit = Hbtrack::Habit.new(habit_name)
         @habits << habit
         return habit
       end
-      puts Hbtrack::CLI.red("Invalid argument: habit_name is expected.")
+
+      if habit_name && habit_name.length > 11 
+        raise_habit_name_too_long
+      else
+        raise_invalid_arguments
+      end
     end
 
     def parse_options(args)
@@ -134,10 +147,31 @@ module Hbtrack
       Date.today - 1
     end
 
+    def raise_error_msg(msg)
+      puts Hbtrack::CLI.red msg 
+      return
+    end
+
+    def raise_if_habit_error(habit_name)       
+      return raise_invalid_arguments if habit_name.nil? 
+      raise_habit_not_found(habit_name)
+    end        
+
     def raise_habit_not_found(habit_name)
-      last_words = habit_name ? 'not found' : 'is expected'
-      habit_name ||= "habit_name"
-      puts Hbtrack::CLI.red "Invalid argument: #{habit_name} #{last_words}."
+      raise_error_msg "Invalid argument: #{habit_name} not found."
+    end
+
+    def raise_invalid_arguments 
+      raise_error_msg "Invalid argument: habit_name is expected."
+    end
+
+    def raise_habit_name_too_long
+      raise_error_msg "habit_name too long."
+    end
+
+    def invalid_habit_name?(habit_name)
+      habit_name.nil? || habit_name =~ /\s+/ || 
+      habit_name.length > 11
     end
 
     def save
@@ -148,7 +182,7 @@ module Hbtrack
       end
     end
 
-    def save_to_file(habit, action, color = "green") 
+    def save_to_file(habit, action, color = 'green')
       unless habit.nil?
         yield if block_given?
         save
@@ -158,5 +192,3 @@ module Hbtrack
     end
   end
 end
-
-

data/lib/hbtrack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hbtrack
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/hbtrack.rb

@@ -4,7 +4,7 @@ require 'hbtrack/habit_tracker'
 
 module Hbtrack
   class << self
-    def run *args
+    def run(*args)
       if ARGV.empty?
         HabitTracker.help
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbtrack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kw7oe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Habit Tracker CLI
+description: Habit Tracker CLI. A CLI to track your habits.
 email:
 - choongkwern@hotmail.com
 executables:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A CLI to track your habits.