hbtrack 0.0.7 → 0.0.8

data/lib/hbtrack/importer/abstract_importer.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Hbtrack
+  module Importer
+    class AbstractImporter
+
+      def initialize
+        @habits = {}
+        @entries = {}
+      end
+
+      # Store in database
+      def store_in(store)
+        ids = {}
+        @habits.each do |id, habit|
+          ids[id] = store.add_habit(habit)
+        end
+
+        @entries.each do |key, entries|
+          id = ids[key]
+          entries.each do |entry|
+            store.add_entry_of(id, entry)
+          end
+        end
+      end
+
+      # Import and parse the CSV from Streaks
+      def import_from(file)
+        raise 'Not implemented'
+      end
+
+    end
+  end
+end

data/lib/hbtrack/importer/hbtrack_importer.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'hbtrack/importer/abstract_importer'
+require 'hbtrack/database/model'
+require 'date'
+
+module Hbtrack
+  module Importer
+    class HbtrackImporter < AbstractImporter
+      Habit = Hbtrack::Database::Habit
+      Entry = Hbtrack::Database::Entry
+
+      ENTRY_TYPE = {
+        '0' => 'missed',
+        '1' => 'completed',
+        ' ' => 'skip'
+      }
+
+      def initialize
+        super
+        @index = 1
+      end
+
+      # Import and parse the CSV from Streaks
+      def import_from(file)
+        raise 'File not found' unless File.exist?(file)
+        input = File.read(file).split(/\n\n/)
+        input.each_with_index do |collection, index|
+          extract_from(index, collection)
+        end
+
+        [@habits, @entries]
+      end
+
+      def extract_from(id, collection)
+        arr = collection.split("\n")
+
+        # Get habit name
+        habit_name = arr.shift
+        @habits[id] = create_habit(habit_name)
+
+        create_entries_of(id, arr)
+      end
+
+      # Create a Habit
+      def create_habit(habit)
+        habit = Habit.new(habit, @index)
+        @index += 1
+        habit
+      end
+
+      def create_entries_of(id, entries)
+        @entries[id] = entries.flat_map do |entry|
+          month, values = entry.split(': ')
+
+          values.split("").map.with_index(1) do |value, index|
+            create_entry(month, index, value)
+          end
+        end
+      end
+
+      def create_entry(month, day, value)
+        timestamp = create_timestamp_for(month, day)
+        type = ENTRY_TYPE[value]
+        Entry.new(timestamp, type)
+      end
+
+      def create_timestamp_for(month, day)
+        year, month = month.split(',').map(&:to_i)
+        time_zone = Time.new.zone
+        DateTime.new(year, month, day, 0, 0, 0, "#{time_zone}:00").to_s
+      end
+
+    end
+  end
+end

data/lib/hbtrack/importer/streaks_importer.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'hbtrack/importer/abstract_importer'
+require 'hbtrack/database/model'
+require 'csv'
+
+module Hbtrack
+  module Importer
+    class StreaksImporter < AbstractImporter
+      Habit = Hbtrack::Database::Habit
+      Entry = Hbtrack::Database::Entry
+
+      # Import and parse the  CSV from Streaks
+      def import_from(file)
+        raise 'File not found' unless File.exist?(file)
+        CSV.foreach(file, headers: true) do |row|
+          extract_streaks_data(row)
+        end
+        # Handle the parsed data
+        [@habits, @entries]
+      end
+
+      private
+      # Extract Streaks data from each line
+      def extract_streaks_data(line)
+        task_id = line.fetch('task_id')
+        find_or_create_habit(task_id, line)
+        create_entry(task_id, line)
+      end
+
+      # Find or create habit
+      def find_or_create_habit(id, line)
+        unless @habits.has_key? id
+          title = line.fetch('title').strip
+          page = line.fetch('page').to_i
+          display_order = line.fetch('display_order').to_i
+          display_order = page * display_order
+          @habits[id] = Habit.new(title, display_order)
+        end
+      end
+
+      # Create entry
+      def create_entry(task_id, line)
+        date = line.fetch('entry_date') # Get Date of entry
+        timestamp = line.fetch('entry_timestamp').split("T") # Get Time of entry
+        # Create timestamp
+        timestamp = DateTime.parse(date + "T" + timestamp[1]).to_s
+        type = line.fetch('entry_type')
+        @entries[task_id] = [] unless @entries[task_id]
+        @entries[task_id] << Entry.new(timestamp, type)
+      end
+
+    end
+  end
+end
+

data/lib/hbtrack/stat_formatter.rb

@@ -36,7 +36,7 @@ module Hbtrack
     # @return [String] formatted result
     def format(hash)
       percentage = to_percentage(hash)[:done]
-      sprintf('Completion rate: %.2f%', percentage)
+      sprintf("Completion rate: %.2f%%", percentage)
     end
 
     # Convert the value in the hash into percentage

data/lib/hbtrack/util.rb

@@ -4,7 +4,7 @@ module Hbtrack
   # This class contains the methods that
   # are used to format the progress of a Habit
   # into string
-  class Util
+  module Util
     FONT_COLOR = {
       green: "\e[32m",
       red: "\e[31m",
@@ -19,7 +19,7 @@ module Hbtrack
           value + string + "\e[0m"
         end
       end
-      
+
       # Format the string with title style.
       #
       # @param string [String] the string to be styled as title
@@ -54,16 +54,9 @@ module Hbtrack
           " #{year}" + ' : '
       end
 
-      # Format the current month and year into string
-      #
-      # @return [String] Month and Year in String.
-      #
-      # == Example
-      #
-      #  Util.current_month
-      #  #=> "August 2017"
-      def current_month
-        Date.today.strftime('%B %Y')
+      def get_date_from(key:)
+        date_component = key.to_s.split(',').map(&:to_i)
+        Date.new(date_component[0], date_component[1], 1)
       end
 
       # Get the month in string form from given key

data/lib/hbtrack/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbtrack
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kw7oe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Habit Tracker CLI
 email:
 - choongkwern@hotmail.com
@@ -68,21 +110,27 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/irb
 - exe/hbtrack
 - hbtrack.gemspec
 - lib/hbtrack.rb
+- lib/hbtrack/cli/cli.rb
+- lib/hbtrack/cli/view.rb
 - lib/hbtrack/command.rb
 - lib/hbtrack/command/add_command.rb
+- lib/hbtrack/command/import_command.rb
 - lib/hbtrack/command/list_command.rb
 - lib/hbtrack/command/remove_command.rb
+- lib/hbtrack/command/show_command.rb
 - lib/hbtrack/command/update_command.rb
 - lib/hbtrack/config.rb
+- lib/hbtrack/database/model.rb
+- lib/hbtrack/database/sequel_store.rb
 - lib/hbtrack/error_handler.rb
-- lib/hbtrack/habit.rb
-- lib/hbtrack/habit_printer.rb
-- lib/hbtrack/habit_tracker.rb
+- lib/hbtrack/importer/abstract_importer.rb
+- lib/hbtrack/importer/hbtrack_importer.rb
+- lib/hbtrack/importer/streaks_importer.rb
 - lib/hbtrack/stat_formatter.rb
-- lib/hbtrack/store.rb
 - lib/hbtrack/util.rb
 - lib/hbtrack/version.rb
 homepage: https://github.com/kw7oe/hbtrack
@@ -105,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A CLI to track your habits.

data/lib/hbtrack/habit.rb

@@ -1,182 +0,0 @@
-# frozen_string_literal: true
-
-require 'date'
-require 'hbtrack/util'
-
-module Hbtrack
-  # Habit class
-  class Habit
-    attr_accessor :name, :progress
-    # Class Methods
-
-    class << self
-      # Generate hash key for progress based
-      # on date.
-      #
-      # Example
-      #
-      #   Habit.get_progress_key_from(Date.new(2017, 7, 18))
-      #   # => :"2017,7"
-      def get_progress_key_from(date)
-        date.strftime('%Y,%-m').to_sym
-      end
-
-      # Initialize Habit object from string.
-      #
-      # @param string [String] The string to be parse.
-      # @return [Habit] a habit object
-      #
-      # == Example
-      #
-      #   Habit.initialize_from_string("workout\n2017,6:1001")
-      #   # => #<Habit:0x007f9be6041b70 @name="workout",
-      #   #    @progress={:"2017,6"=>"1001"}>
-      #
-      #   Habit.initialize_from_string("")
-      #   # => nil
-      def initialize_from_string(string)
-        return nil if string.empty?
-        arr = string.split("\n")
-        habit_name = arr.shift
-        hash = {}
-        arr.each do |s|
-          a = s.split(': ')
-          value = a[1] ? a[1] : ''
-          hash[a[0].to_sym] = value
-        end
-        Habit.new(habit_name, hash)
-      end
-    end
-
-    def initialize(name,
-                   progress = {
-                     Habit.get_progress_key_from(Date.today) => ''
-                   })
-      @name = name
-      @progress = progress
-    end
-
-    # The length of the habit name.
-    #
-    # @return [Numeric] length of the habit name
-    def name_length
-      name.length
-    end
-
-    # Get the latest progress key.
-    #
-    # @return [Symbol] latest progress key
-    def latest_key
-      key = Habit.get_progress_key_from(Date.today)
-      initialize_progress_hash_from(key) if progress[key].nil?
-      key
-    end
-
-    # Get the latest progress.
-    #
-    # @return [String] value of the progress
-    def latest_progress
-      progress[latest_key]
-    end
-
-    # Get the stat for the latest progress.
-    #
-    # @return [Hash] stat for the progress.
-    def latest_stat
-      stat_for_progress(latest_key)
-    end
-
-    # Find the month in progress with
-    # the longest name
-    #
-    # @return [String] month
-    def longest_month
-      key = progress.keys.max_by do |x|
-        Util.get_month_from(x).length
-      end
-      Util.get_month_from(key)
-    end
-
-    # Update the status of the progress
-    #
-    # @param done [true, false] If true, it is marked as done.
-    #   Else, marked as undone.
-    # @param date [Date] The date of the progress
-    # @return [void]
-    def done(done = true, date = Date.today)
-      key = Habit.get_progress_key_from(date)
-      initialize_progress_hash_from(key)
-      update_progress_for(key, date.day, done)
-    end
-
-    # TODO: test needed
-    # Get the done status for specific date
-    #
-    # @return [Integer]
-    def done_for(date:) # TODO: Test needed
-      latest_progress.split('')[date.day - 1]
-    end
-
-    # Get the stat of the progress.
-    #
-    # @param key [Symbol] key for the progress
-    # @return [Hash] stat of the progress in the form of
-    # == Example:
-    #
-    #   habit.stat_for_progress("2017,5".to_sym)
-    #   # => { done: 5, undone: 2 }
-    def stat_for_progress(key)
-      undone = @progress[key].split('').count { |x| x == '0' }
-      done = @progress[key].split('').count { |x| x == '1' }
-      { done: done, undone: undone }
-    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"
-      end
-      arr.join('')
-    end
-
-    def overall_stat
-      done = 0
-      undone = 0
-      @progress.each do |key, _value|
-        stat = stat_for_progress(key)
-        done += stat[:done]
-        undone += stat[:undone]
-      end
-      { done: done, undone: undone }
-    end
-
-    def overall_stat_description(formatter)
-      Util.title('Total') +
-        formatter.format(overall_stat)
-    end
-
-    def to_s
-      "#{name}\n" + progress_output + "\n"
-    end
-
-    private
-
-    def initialize_progress_hash_from(key)
-      @progress[key] = '' unless @progress.key? key
-    end
-
-    def update_progress_for(key, day, done)
-      i = day - @progress[key].length - 1
-      result = @progress[key].split('')
-      i.times { result << ' ' }
-      result[day - 1] = done ? '1' : '0'
-      @progress[key] = result.join('')
-    end
-  end
-end