hbtrack 0.0.7 → 0.0.8

data/lib/hbtrack/command/import_command.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require 'hbtrack/command'
+require 'hbtrack/importer/streaks_importer'
+require 'hbtrack/importer/hbtrack_importer'
+require 'hbtrack/database/sequel_store'
+require 'hbtrack/util'
+
+module Hbtrack
+  # ImportCommand class is responsible for handling
+  # `hbtrack import` command in CLI
+  class ImportCommand < Command
+    def initialize(store_path, options)
+      @importer = Hbtrack::Importer::HbtrackImporter.new
+      super(store_path, options)
+    end
+
+    def execute
+      return import(@names[0])
+      super
+    end
+
+    def create_option_parser
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: hbtrack import <file_path> <options>'
+        opts.on('--streaks', 'Import data from streaks') do
+          @importer = Hbtrack::Importer::StreaksImporter.new
+        end
+      end
+    end
+
+    def import(file_path)
+      @importer.import_from(file_path)
+      @importer.store_in(local_store)
+      Hbtrack::Util.green "Succesfully imported from #{file_path}"
+    rescue => e
+      Hbtrack::Util.red "Error: #{e}"
+    end
+
+  end
+end
+

data/lib/hbtrack/command/list_command.rb

@@ -2,22 +2,19 @@
 
 require 'optparse'
 require 'hbtrack/command'
+require 'hbtrack/cli/view'
 
 module Hbtrack
   class ListCommand < Command
-    attr_reader :printer, :formatter
+    attr_reader :printer, :formatter, :month
 
-    def initialize(hbt, options)
-      @percentage = false
-
-      super(hbt, options)
-      @formatter = @percentage ? CompletionRateSF.new : CompleteSF.new
-      @printer = HabitPrinter.new(@formatter)
+    def initialize(store_path, options)
+      @month = Date.today.strftime("%Y,%-m").to_sym
+      super(store_path, options)
     end
 
     def execute
-      return list_all(@printer) if @all
-      return list(@names[0], @printer) unless @names.empty?
+      return list_from_db(local_store, @names)
       super
     end
 
@@ -27,12 +24,12 @@ module Hbtrack
         opts.separator ''
         opts.separator 'Options:'
 
-        opts.on('-p', '--percentage', 'List habit(s) with completion rate') do
-          @percentage = true
-        end
-
-        opts.on('-a', '--all', 'List all habits') do
-          @all = true
+        # TODO: Renamed to better describe the functionality
+        #       as in this case user are required toe enter
+        #       the input in the form of <year>,<month>
+        opts.on('-m', '--month MONTH', 'List habit(s) according to month provided') do |month|
+          @month = month.to_sym
+          @year, @mon = month.split(',')
         end
 
         opts.on_tail('-h', '--help', 'Prints this help') do
@@ -42,30 +39,27 @@ module Hbtrack
       end
     end
 
-    def list(name, printer)
-      habit = @hbt.find(name) do
-        return ErrorHandler.raise_habit_not_found(name)
-      end
-
-      title = Util.title habit.name
-      progress = printer.print_all_progress(habit)
-      footer = "\n" + habit.overall_stat_description(printer.formatter)
-
-      "#{title}#{progress}\n#{footer}"
+    def list_from_db(store, names)
+      habits = []
+      habits, entries = get_habits_from_db(store)
+      Hbtrack::CLI::View.list_all_habits(habits, entries, @month)
     end
 
-    def list_all(printer)
-      return Util.blue 'No habits added yet.' if @hbt.habits.empty?
-
-      title = Util.title Util.current_month
-      progress = @hbt.habits.each_with_index.map do |h, index|
-        space = @hbt.longest_name.length - h.name_length
-        "#{index + 1}. " \
-        "#{printer.print_latest_progress(h, space)}"
-      end.join("\n")
-      footer = "\n" + @hbt.overall_stat_description(@formatter)
+    def get_habits_from_db(store)
+      habits = []
+      entries = {}
+      habits = store.get_all_habits
+      habits.each do |habit|
+        entries[habit[:title]] = get_entry_from_db(store, habit[:id])
+      end
+      [habits, entries]
+    end
 
-      "#{title}#{progress}\n#{footer}"
+    def get_entry_from_db(store, id)
+      month = @mon.to_i >= 1 ? @mon.to_i : Date.today.month
+      year = @year.to_i >= 1 ? @year.to_i : Date.today.year
+      store.get_entries_of_month(id, month, year)
     end
+
   end
 end

data/lib/hbtrack/command/remove_command.rb

@@ -2,16 +2,15 @@
 
 require 'optparse'
 require 'hbtrack/command'
-require 'hbtrack/store'
 
 module Hbtrack
   class RemoveCommand < Command
-    def initialize(hbt, options)
-      super(hbt, options)
+    def initialize(store_path, options)
+      super(store_path, options)
     end
 
     def execute
-      return remove(@names) if @names
+      return remove_from_db(@names, local_store)
       super
     end
 
@@ -21,17 +20,15 @@ module Hbtrack
       end
     end
 
-    def remove(names)
-      names.each do |name|
-        habit = @hbt.find(name) do
-          return ErrorHandler.raise_if_habit_error(name)
-        end
+    def feedback(names)
+      Hbtrack::Util.blue("Remove #{names.join(',')}!")
+    end
 
-        @hbt.habits.delete(habit)
-      end
+    def remove_from_db(names, store)
+      status = store.delete_habit(names)
+      return ErrorHandler.raise_if_habit_error(names) if status == 0
 
-      Store.new(@hbt.habits, @hbt.output_file_name).save
-      Hbtrack::Util.blue("Remove #{names.join(',')}!")
+      feedback(names)
     end
   end
 end

data/lib/hbtrack/command/show_command.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require 'hbtrack/command'
+require 'hbtrack/cli/view'
+
+module Hbtrack
+  # ShowCommand class is responsible for handling
+  # `hbtrack import` command in CLI
+  class ShowCommand < Command
+    def initialize(store_path, options)
+      super(store_path, options)
+    end
+
+    def execute
+      return show(local_store, @names[0]) if @names[0]
+      super
+    end
+
+    def create_option_parser
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: hbtrack show <habit_name>'
+      end
+    end
+
+    def show(store, title)
+      habit = store.get_habit_by_title(title)
+      return ErrorHandler.raise_habit_not_found(title) unless habit
+
+      entries = get_entries_from_db(store, habit)
+      Hbtrack::CLI::View.show_habit(habit, entries)
+    end
+
+    def get_entries_from_db(store, habit)
+      entries = store.get_entries_of(habit[:id]).all
+      entries.group_by { |e| e[:timestamp].strftime('%Y-%m') }
+    end
+  end
+end
+

data/lib/hbtrack/command/update_command.rb

@@ -2,21 +2,19 @@
 
 require 'optparse'
 require 'hbtrack/command'
-require 'hbtrack/store'
 
 module Hbtrack
   class UpdateCommand < Command
-    def initialize(hbt, options, is_done)
-      @day = Date.today
+    def initialize(store_path, options, is_done)
+      @day = DateTime.now
       @is_done = is_done
-      @remaining = false
-      super(hbt, options)
+      @db = false
+      super(store_path, options)
     end
 
     def execute
-      return update_remaining(@day, @is_done) if @remaining
-      return update_all(@day, @is_done) if @all
-      return update(@names, @day, @is_done) if @names
+      return update_all_in_db(local_store, @day, @is_done) if @all
+      return update_in_db(local_store, @names, @day, @is_done)
       super
     end
 
@@ -26,18 +24,11 @@ module Hbtrack
         opts.banner = "Usage: hbtrack #{action.downcase} [<habit_name>] [options]"
         opts.separator ''
         opts.separator 'Options:'
+
         opts.on('-a', '--all', "#{action} all habits") do
           @all = true
         end
 
-        opts.on('-r', '--remaining', "#{action} remaining habits") do
-          @remaining = true
-        end
-
-        opts.on('-y', '--yesterday', "#{action} habit(s) for yesterday") do
-          @day = Date.today - 1
-        end
-
         opts.on('--day DAY', Integer, "#{action} habit(s) for specific day") do |day|
           @day = Date.new(Date.today.year, Date.today.month, day.to_i)
         end
@@ -49,46 +40,48 @@ module Hbtrack
       end
     end
 
-    def update(names, day, is_done)
-      names.each do |name|
-        habit = if is_done
-                  @hbt.find_or_create(name)
-                else
-                  @hbt.find(name) do
-                    return ErrorHandler.raise_if_habit_error(name)
-                  end
-                end
-
-        habit.done(is_done, day)
-      end
-
-      Store.new(@hbt.habits, @hbt.output_file_name).save
+    def update_in_db(store, name, day, is_done)
+      id = store.get_habit_id_for(name)
+      return ErrorHandler.raise_habit_not_found(name) unless id
 
-      Hbtrack::Util.green("#{action(is_done)} #{names.join(',')}!")
+      add_or_update_entry(store, id, day, is_done)
+      Hbtrack::Util.green("Update successfully!")
     end
 
-    def update_all(day, is_done)
-      @hbt.habits.each { |habit| habit.done(is_done, day) }
-
-      Store.new(@hbt.habits, @hbt.output_file_name).save
-
-      Hbtrack::Util.green("#{action(is_done)} all habits!")
+    def update_all_in_db(store, day, is_done)
+      habits = store.get_all_habits
+      habits.each do |h|
+        add_or_update_entry(store, h[:id], day, is_done)
+      end
+      Hbtrack::Util.green("Update successfully!")
     end
 
-    def update_remaining(day, is_done)
-      @hbt.habits.each do |habit|
-        habit.done(is_done, day) if habit.done_for(date: day).nil?
+    def add_or_update_entry(store, id, day, is_done)
+      entry = store.get_latest_entry_of(id)
+      type = is_done ? 'completed' : 'missed'
+      unless entry_exist?(entry, day)
+        entry = Hbtrack::Database::Entry.new(DateTime.now, type)
+        store.add_entry_of(id, entry)
+      else
+        store.update_entry_of(id, day, type)
       end
-
-      Store.new(@hbt.habits, @hbt.output_file_name).save
-
-      Hbtrack::Util.green("#{action(is_done)} remaining habit(s)!")
     end
 
-    private
+    # Check if the entry timestamp are within
+    # the same day
+    def entry_exist?(entry, day)
+      return false unless entry
+      year, month , day = extract_date(day)
+      time = entry[:timestamp]
+      y, m, d = extract_date(time)
+      return y == year && m == month && d == day
+    end
 
-    def action(is_done)
-      is_done ? 'Done' : 'Undone'
+    # Extract out the year, month and day of
+    # a Date or Time object.
+    def extract_date(day)
+      [day.year, day.month, day.day]
     end
+
   end
 end

data/lib/hbtrack/config.rb

@@ -10,4 +10,7 @@ module Hbtrack
 
   # File to store your data
   FILE_NAME = Dir.home + '/.habit'
+
+  # DB file
+  DB_PATH = Dir.home + '/.habit.db'
 end

data/lib/hbtrack/database/model.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Hbtrack
+  module Database
+    # Data Abstraction
+    Habit = Struct.new(:title, :display_order)
+    Entry = Struct.new(:timestamp, :type)
+  end
+end

data/lib/hbtrack/database/sequel_store.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+module Hbtrack
+  module Database
+    class SequelStore
+      require 'sequel'
+
+      attr_reader :db
+      def initialize(name: 'hbtrack.db')
+        @db = Sequel.sqlite(name)
+        create_table?
+      end
+
+      # Add a habit
+      def add_habit(habit)
+        habits.insert(
+          title: habit.title,
+          display_order: habit.display_order
+        )
+      end
+
+      # Delete a habit
+      def delete_habit(title)
+        habits.where(title: title).delete
+      end
+
+      # Get habit by id
+      def get_habit(id)
+        habits.filter(id: id).first
+      end
+
+      # Get ID of a habit by title
+      def get_habit_id_for(title)
+        get_habit_by_title(title)&.fetch(:id)
+      end
+
+      # Get habit by title
+      def get_habit_by_title(title)
+        habits.filter(title: title).first
+      end
+
+      # Get all habits
+      def get_all_habits
+        habits.all
+      end
+
+      # Get count of habits
+      def get_habits_count
+        habits.count
+      end
+
+      # Data Abstrack for Entry
+      # Entry = Struct.new(:timestamp, :type, :habit_id)
+
+      # Add a entry of a habit
+      def add_entry_of(habit_id, entry)
+        entries.insert(
+          timestamp: entry.timestamp,
+          type: entry.type,
+          habit_id: habit_id
+        )
+      end
+
+      def update_entry_of(habit_id, time, type)
+        entries.where(habit_id: habit_id)
+          .where(timestamp: day_range_for(time))
+          .update(type: type, timestamp: time)
+      end
+
+      def get_latest_entry_of(habit_id)
+        entries.where(habit_id: habit_id)
+          .order(Sequel.desc(:timestamp)).first
+      end
+
+      # Get all entries of a habit
+      def get_entries_of(habit_id)
+        entries.where(habit_id: habit_id)
+      end
+
+      # Get entries count of a habit
+      def get_entries_count_of(habit_id)
+        get_entries_of(habit_id).count
+      end
+
+      # Get entries of a habit in a period of month
+      # according to month and year given.
+      def get_entries_of_month(habit_id, month, year)
+        get_entries_of(habit_id)
+          .where(timestamp: month_range(month, year))
+          .all
+      end
+
+      # Create a range of date from the first day
+      # to the last day of a month
+      def month_range(month, year)
+        next_month = month == 12 ? 1 : month + 1
+        next_year = month == 12 ? year + 1 : year
+        Date.new(year, month, 1)..Date.new(next_year, next_month, 1)
+      end
+
+      # Create a range from the start of a day
+      # to the end of a day according to the
+      # DateTime object given.
+      def day_range_for(time)
+        year = time.year
+        month = time.month
+        day = time.day
+        timezone = Time.new.zone
+
+        Range.new(
+          DateTime.new(year, month, day, 0, 0, 0, timezone),
+          DateTime.new(year, month, day, 23, 59, 59, timezone)
+        )
+      end
+
+      private
+      # Create Habits and Entries table if doesn't exist
+      def create_table?
+        db.create_table? :habits do
+          primary_key :id
+          String :title
+          Integer :display_order
+        end
+
+        db.create_table? :entries do
+          primary_key :id
+          String :type
+          DateTime :timestamp
+          foreign_key :habit_id, :habits, on_delete: :cascade
+        end
+      end
+
+      # Get Habits dataset
+      def habits
+        return @habits if @habit
+        @habits = db[:habits]
+      end
+
+      # Get Entries dataset
+      def entries
+        return @entries if @entries
+        @entries = db[:entries]
+      end
+    end
+  end
+end