hbtrack 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d2ea881a273459943278a8ed55e05162544426
-  data.tar.gz: 05f7cb9199065ab8eca1f558a4d7bda5dc971341
+  metadata.gz: d846c3fab2b780d7be575138918e3cbf97b6dc7d
+  data.tar.gz: 8b329428683139a92294fa6ba8bebc1b5611ab1f
 SHA512:
-  metadata.gz: 17b23168d92bb400ff17d5b6685268fb5aafbf3ed2f27e9a8685dea89e56316e3af7a4af0ab23f93ce1b525aab0d9746b84ac76714df560eb33ea03cf22cb5ba
-  data.tar.gz: 73b292c9e40a08ed498879ebba2c1c88f82f17a5d902c84aa4074f404341b01e457bbdcfe96729bf32c8f2de87dedb80bc78e92ee3792a4c5a18d736633d68e4
+  metadata.gz: b845ed06eb8ae37e4857bda84bc691fee6f81f007bfb95f3ddf9e47691a762d88839e098834a22067fc838b6ab31144dea04151760b1026a1d6b1afd89a19f47
+  data.tar.gz: 880729c315b22e13509a0fe1cc9bbf20a4ada8f0255d4f10082649f0e3772fd107d4a7fb2ceed035cfa71cc42c11da09cfe26afd41c91dc600bf176763d9da47

data/README.md

@@ -1,4 +1,8 @@
-# Hbtrack [![Gem Version](https://badge.fury.io/rb/hbtrack.svg)](https://badge.fury.io/rb/hbtrack) [![Build Status](https://travis-ci.org/kw7oe/hbtrack.svg?branch=master)](https://travis-ci.org/kw7oe/hbtrack)
+# Hbtrack 
+[![Gem Version](https://badge.fury.io/rb/hbtrack.svg)](https://badge.fury.io/rb/hbtrack) 
+[![Build Status](https://travis-ci.org/kw7oe/hbtrack.svg?branch=master)](https://travis-ci.org/kw7oe/hbtrack) 
+[![Code Climate](https://codeclimate.com/github/kw7oe/hbtrack/badges/gpa.svg)](https://codeclimate.com/github/kw7oe/hbtrack)
+
 
 `hbtrack` is a simple command lines tool to keep track of your daily habits. The functionality of the current version is very limited.
 
@@ -35,7 +39,7 @@ Options:
   - remaining habits of as done/undone
   - habit(s) as done for specific day with `--day DAY`
 - [x] Remove single or multiple habits at once
-- [x] Generate report in HTML format. *(In Progress)*
+- [ ] Generate report in HTML format. *(In Progress)*
 
 ## Output
 

data/hbtrack.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'minitest', '~> 5.10'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/hbtrack/command/update_command.rb

@@ -38,7 +38,7 @@ module Hbtrack
           @day = Date.today - 1
         end
 
-        opts.on('--day DAY', OptionParser::OctalInteger, "#{action} habit(s) for specific day") do |day|
+        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
 

data/lib/hbtrack/habit_tracker.rb

@@ -52,17 +52,11 @@ module Hbtrack
     end
 
     def done_count_for(date:)
-      habits.reduce(0) do |a, habit|
-        val = habit.done_for(date: date) == '1' ? 1 : 0
-        a + val
-      end
+      count_for(date, '1')
     end
 
     def undone_count_for(date:)
-      habits.reduce(0) do |a, habit|
-        val = habit.done_for(date: date) == '0' ? 1 : 0
-        a + val
-      end
+      count_for(date, '0')
     end
 
     def overall_stat_description(formatter)
@@ -85,5 +79,13 @@ module Hbtrack
       habit_name.nil? || habit_name =~ /\s+/ ||
         habit_name.length > 11
     end
+
+    private def count_for(d, value)
+      habits.reduce(0) do |a, habit|
+        val = habit.done_for(date: d) == value ? 1 : 0
+        a + val
+      end
+    end
+
   end
 end

data/lib/hbtrack/util.rb

@@ -19,6 +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

data/lib/hbtrack/version.rb

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

data/lib/hbtrack.rb

@@ -9,7 +9,6 @@ require 'hbtrack/command/list_command'
 require 'hbtrack/command/update_command'
 require 'hbtrack/command/remove_command'
 require 'hbtrack/command/add_command'
-require 'hbtrack/report/generator'
 require 'hbtrack/error_handler'
 
 module Hbtrack
@@ -27,9 +26,6 @@ module Hbtrack
                   RemoveCommand.new(hbt, args)
                 when 'add'
                   AddCommand.new(hbt, args)
-                when 'generate'
-                  Generator.new(hbt).generate
-                  exit
                 else
                   help
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbtrack
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kw7oe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,9 +81,6 @@ files:
 - lib/hbtrack/habit.rb
 - lib/hbtrack/habit_printer.rb
 - lib/hbtrack/habit_tracker.rb
-- lib/hbtrack/report/calendar.rb
-- lib/hbtrack/report/generator.rb
-- lib/hbtrack/report/report.html.erb
 - lib/hbtrack/stat_formatter.rb
 - lib/hbtrack/store.rb
 - lib/hbtrack/util.rb

data/lib/hbtrack/report/calendar.rb

@@ -1,84 +0,0 @@
-module Hbtrack
-  class Calendar
-
-    WEEKDAYS = [
-      "Mon", 
-      "Tue", 
-      "Wed", 
-      "Thu",
-      "Fri",
-      "Sat",
-      "Sun"
-    ]
-
-    # Generate weeks of the current month, 
-    # which contains 7 days.
-    def self.weeks(date)
-      range = date.beginning_of_month..date.end_of_month
-      result = range.chunk_while { |date| date.cwday < 7 }.to_a
-
-      if result.first.length < 7 
-        (7 - result.first.length).times do 
-          result.first.unshift(NullDay.new)
-        end
-      end
-
-      if result.last.length < 7 
-        (7 - result.last.length).times do 
-          result.last.push(NullDay.new)
-        end
-      end
-      
-      result
-    end
-
-    # Generate <td> elements for days
-    def self.td_for(date, progress)
-      progress = progress.split("")
-
-      className = if date.day.nil?
-        "null_day"      
-      elsif progress[date.day - 1] == "1"
-        "done"
-      elsif progress[date.day - 1] == "0"
-        "undone"
-      end
-      
-      string = <<~EOF
-      <td>
-        <p class="#{className}">
-          #{add_padding_to(date.day)}
-        </p>
-      </td>
-      EOF
-    end
-
-    def self.add_padding_to(day)
-      return nil if day.nil?
-      return "0#{day}" if day < 10 
-      day.to_s
-    end
-
-  end
-
-  # Null Object Pattern
-  class NullDay 
-    attr_reader :day
-    def initialize
-      @day = nil
-    end
-  end
-
-
-end
-
-# Extend Date Class
-class Date
-  def beginning_of_month
-    Date.new(self.year, self.month, 1)
-  end
-
-  def end_of_month
-    Date.new(self.year, self.month, -1)
-  end
-end

data/lib/hbtrack/report/generator.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'erb'
-require 'hbtrack/report/calendar'
-
-module Hbtrack
-  class Generator 
-    def initialize(hbt)
-      @hbt = hbt
-      initialize_stat
-      @week_days = Hbtrack::Calendar::WEEKDAYS
-      @weeks = Hbtrack::Calendar.weeks(Date.today)
-    end
-
-    def initialize_stat
-      @stat = @hbt.total_habits_stat
-      @stat[:total] = @stat[:done] + @stat[:undone]
-      @stat[:percentage] = (@stat[:done] / @stat[:total].to_f).round(2) * 100
-    end
-
-    def td_for(date)
-      Hbtrack::Calendar.td_for(date, @hbt.habits.last.latest_progress)
-    end
-
-    def generate
-      file_path = File.expand_path("../report.html.erb", __FILE__)
-      renderer = ERB.new(File.read(file_path))
-      File.write('report.html', renderer.result(binding))
-    end    
-  end
-end

data/lib/hbtrack/report/report.html.erb

@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title></title>
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.5.2/css/bulma.min.css">
-
-    <style type="text/css"> 
-      .text-center { margin-top: 10%; text-align: center; }
-
-      .calender { margin: 0 auto; width: 400px; height: 374.8571428571px; padding: 16px 18px; border: 1px solid #B3B3B3; overflow: hidden; }
-      .calender table { border-collapse: collapse; }
-      .calender .weekdays th { text-align: center; vertical-align: middle; text-transform: uppercase; height: 57.1428571429px; width: 57.1428571429px; }
-      .calender .days { height: 57.1428571429px; width: 57.1428571429px; }
-      .calender .days td { text-align: center; cursor: pointer; }
-      .calender .days td p { border-radius: 50%; width: 44px; height: 44px; margin: 0; display: inline-block; text-align: center; padding: 10px; }
-      .calender .days td p.null_day { display: none; }
-      .calender .days td p.undone { color: white; background-color: #FF1654; }
-      .calender .days td p.done { color: white; background-color: #70C1B3; }
-      .calender .days td:hover p { background-color: #E6E6E6; }
-      .calender .days td:hover p.undone { background-color: #CC1243; }
-      .calender .days td:hover p.done { background-color: #549187; }
-    </style>
-  </head>
-
-  <body>
-    <!-- Title -->
-    <section class="section">
-      <div class="container">
-        <div class="columns is-centered">
-          <h1 class="title">Hbtrack</h1>
-        </div>
-      </div>
-    </section>
-
-    <!-- Calendar -->
-    <section class="section>">
-    <div  class = "calender">
-      <table>
-        <!-- Generate Week Days -->
-        <tr class = "weekdays">
-          <% @week_days.each do |day| %>
-            <th><%= day %></th>
-          <% end %>
-        </tr>
-
-        <!-- Generate Days -->
-        <% @weeks.each do |week| %>
-          <tr class = "days">
-          <% week.each do |day| %>
-            <%= td_for(day) %>
-          <% end %>
-          </tr>
-        <% end %>
-      </table>
-    </div>
-    </section>
-
-    <!-- Stat -->
-    <section class="section">
-    <nav class="level">
-      <div class="level-item has-text-centered">
-        <div>
-          <p class="heading">Total</p>
-          <p class="title"><%= @stat[:total] %></p>
-        </div>
-      </div>
-      <div class="level-item has-text-centered">
-        <div>
-          <p class="heading">Done</p>
-          <p class="title"><%= @stat[:done] %></p>
-        </div>
-      </div>
-      <div class="level-item has-text-centered">
-        <div>
-          <p class="heading">Undone</p>
-          <p class="title"><%= @stat[:undone] %></p>
-        </div>
-      </div>
-      <div class="level-item has-text-centered">
-        <div>
-          <p class="heading">Completion Rate</p>
-          <p class="title"><%= @stat[:percentage] %>%</p>
-        </div>
-      </div>
-    </nav>
-    </section>
-    <!-- End of Stat -->
-  </body>
-</html>