piece_of_wax 0.0.2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683908a54cb7a603677d40b86d375486d3c32f52a0d6630ceb24ac1c91a953eb
-  data.tar.gz: 6eeb3aef9b284a8086a32ab70248b4ea53bfd9614e417293734fc2f49bd8ccc2
+  metadata.gz: 818b72b11bd06930c11e17c07e72512f9a4b1864dfb00090c681226414b720a3
+  data.tar.gz: f2423eb394952af0fadd964245b4637e5e2b58267933442459ea89dbe3203640
 SHA512:
-  metadata.gz: 4da0542b0d656c49f6278fedfa449966a1a07d0fda7fc3c02d33679b3108605d614237c1ae7c524d498cfc6d3b50ca14439e52dad8a7175baf0bc37a20bf5f3a
-  data.tar.gz: d610bdae2c2fa0125e1691ba3bc83d7f5051aa5a6455985ac69055d45996a4dcb46ee1a2410f9639c271049513ff91dd485d08a01addccf41f28f6eacf554fe0
+  metadata.gz: 105bd336b6d5d5ed58b53263fe05ed542f3b1dc35c2d346239f469d2935a9e73b2ad05249db8e984d28843b077b3a1850f5ab456825a43813b3673c48294bb51
+  data.tar.gz: 20b656e3e4fb4bb5a53e69ee010a0bcf87845479e437c267a549855cfca70be9a12393d5787c2d507fc66526d499e47599e36a5fc44f0d9e8fa7bb05446ad709

data/bin/piece_of_wax

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/piece_of_wax'
-PieceOfWax.start(ARGV)
+require 'piece_of_wax'
+PieceOfWax::CLI.start(ARGV)

data/lib/piece_of_wax.rb

@@ -1,68 +1,38 @@
+require "json"
+require "piece_of_wax/cli_options"
+require "piece_of_wax/date_time"
+require "piece_of_wax/date_time_decorator/error_message_display"
+require "piece_of_wax/logfile"
 require "thor"
-require "date"
 
-class PieceOfWax < Thor
-  desc "activity _activity_", "log activity"
-  def activity(x)
-    write_to_file("#{Time.now} - #{x}")
-    puts "wrote #{x} to file"
-  end
+module PieceOfWax
+  class CLI < Thor
+    desc 'activity "_activity_"', "log activity (wrap multi-word entries in quotation marks)"
+    option :time, aliases: :t, desc: 'time when activity was started'
+    def activity(str)
+      CLIOptions.instance.set(options)
+      time = DateTime.safe_parse(options[:time]) || DateTime.current_time
+      Logfile.new(DateTime.current_date).add_activity(time, str)
+      $stdout.puts "wrote #{str} to file"
+    end
 
-  desc "read [date]", "print activities on given [date] (yesterday by default)"
-  def read(date = Date.today.strftime('%Y-%m-%d'))
-    output =
-      begin
-        generate_output(File.open(filename(date)).readlines)
-      rescue Errno::ENOENT
-        "Sorry, I couldn't find any logs for #{print_date(date)}."
+    desc "read [date]", "print activities on given [date] (yesterday by default)"
+    option :military, aliases: :m, desc: 'render time in military (24-hour) format'
+    def read(date_str = '')
+      CLIOptions.instance.set(options)
+      date = DateTime.safe_parse(date_str) || DateTime.current_date
+      logfile = Logfile.new(date)
+      if logfile.contents
+        $stdout.puts logfile
+      else
+        $stderr.puts "Sorry, I couldn't find any logs for #{DateTimeDecorator::ErrorMessageDisplay.new(date)}."
       end
-    puts output
-  end
-
-  private
-
-  def write_to_file(str)
-    today = Time.now.strftime("%y%m%d")
-    File.open("#{today}.txt", "a+") do |f|
-      f.puts(str)
     end
-  end
 
-  def filename(date)
-    "%s.txt" % Date.parse(date).strftime("%y%m%d")
-  end
+    private
 
-  def print_date(date)
-    if date == Date.today.prev_day
-      'yesterday'
-    else
-      date
+    def exit_on_failure?
+      true
     end
   end
-
-  def generate_output(lines)
-    date = date_format(lines[0].split(' ')[0])
-    result =
-      lines.each_cons(2).reduce([date]) do |output, (line1, line2)|
-        output << output_line(line1, line2)
-      end
-    result << output_line(lines.last, "#{date} 05:45:00 -0500 - #{lines.last.split(' - ')[1]}")
-  end
-
-  def output_line(line1, line2)
-    date_info1, activity1 = line1.split(' - ')
-    date_info2, _activity2 = line2.split(' - ')
-    _date1, time1, _time_delta1 = date_info1.split(' ')
-    _date2, time2, _time_delta2 = date_info2.split(' ')
-    "#{time_format(time1)}-#{time_format(time2)}    - #{activity1}"
-  end
-
-  def date_format(str)
-    year, month, day = str.split('-').map(&:to_i)
-    Date.new(year, month, day).strftime('%-m/%-d/%y')
-  end
-
-  def time_format(str)
-    str.split(':').first(2).join(':')
-  end
 end

data/lib/piece_of_wax/logfile.rb

@@ -0,0 +1,64 @@
+require 'erb'
+require 'json'
+require 'piece_of_wax/file_io'
+require 'piece_of_wax/output_line/activity'
+require 'piece_of_wax/output_line/date'
+
+module PieceOfWax
+  class Logfile
+    def initialize(date)
+      filename = "%s.txt" % date.strftime("%y%m%d")
+      @file_io = FileIO.new(filename)
+    end
+
+    def contents
+      return unless raw_content = @file_io.read
+      JSON.parse(raw_content)
+    end
+
+    def add_activity(time, description)
+      data =
+        { datetime: time, description: description }
+      obj =
+        if contents
+          contents.insert(proper_index(time), data)
+        else
+          [data]
+        end
+      str = obj.to_json
+      @file_io.overwrite_with(str)
+    end
+
+    def to_s
+      output =
+        ERB.new(<<~ERB).result(binding)
+          <%= OutputLine::Date.new(first_entry['datetime']) %>
+          <% contents.each_cons(2).map do |line1, line2| %>
+          <%= OutputLine::Activity.new(line1['datetime'], line2['datetime'], line1['description']) %>
+          <% end.join("\n") %>
+          <%= OutputLine::Activity.new(last_entry['datetime'], "17:45:00 -0500", last_entry['description']) %>
+        ERB
+      # Unsure why ERB is inserting the double linebreaks after each
+      # iteration of `contents.each_cons(2)`. For now, subbing single linebreak
+      # to eliminate doubles.
+      output.gsub("\n\n", "\n")
+    end
+
+    private
+
+    def proper_index(time)
+      contents.each_with_index do |line, i|
+        return i if Time.parse(line['datetime']) > time
+      end
+      return contents.length
+    end
+
+    def first_entry
+      contents.first
+    end
+
+    def last_entry
+      contents.last
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piece_of_wax
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Ben Stegeman
@@ -14,28 +14,98 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pry-remote
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 description: ''
@@ -47,6 +117,7 @@ extra_rdoc_files: []
 files:
 - bin/piece_of_wax
 - lib/piece_of_wax.rb
+- lib/piece_of_wax/logfile.rb
 homepage: 
 licenses:
 - MIT
@@ -62,9 +133,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6