devlog 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f476f2c6ab76e00904a225dde4bb72747bd5fc4
-  data.tar.gz: ea182129ccc5398cec398a4019695d2b8f6c38a2
+  metadata.gz: 839f5c63004556d46fb81536bb83d211f35fba56
+  data.tar.gz: e24ff4540d187bec26a6f8879a329d2bb7266f47
 SHA512:
-  metadata.gz: 2dd9c1464366e4739406f15c18338737710009f808af2fea868b697cc05b23bbbdac6e937e6887ad41a5d04e517ddd946df9d4a43c7188bebd933160b60ceb91
-  data.tar.gz: ae709d70274481ab35dea6981313cfb35a2c9600588721f13331b0958d4ff27ffd12dc80c9197af35a129c2e01c6c2783f7a02df420185ea8a21326e26664962
+  metadata.gz: 420cc743b4dd152b7f3e57f77738e23d7b55b6aa6eb211a290a9d90bfa3fc54c9433d12cefc1739ca80630a59b3ed895e68e7a9013a03d434ffd5d135437e3ca
+  data.tar.gz: 851b1462545d70be06f06dfbe1fbca097ea24cb1c92452e1295a6f2cc6286c5469d31c8d59b715ad503bc418c9d1dbcf7386dbb412c252f70d139f2c89bf0f2f

data/.travis.yml

@@ -2,5 +2,7 @@ language: ruby
 rvm:
  - "1.9.3"
  - "2.3.0"
+before_install:
+  - bundle update rdoc
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
-gem "activesupport", ">= 4.1"
+gem "activesupport", "~> 4.1"
 
 group :development, :test do
-  gem "test-unit"
+  gem "test-unit", "~> 3.1"
   gem "jeweler", "~> 2.0"
 end

data/Gemfile.lock

@@ -62,9 +62,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 4.1)
+  activesupport (~> 4.1)
   jeweler (~> 2.0)
-  test-unit
+  test-unit (~> 3.1)
 
 BUNDLED WITH
    1.11.2

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/devlog

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'benchmark'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib devlog.rb]))
-USAGE= <<-EOF
+USAGE = <<-EOF
 #{Devlog.display_version}
 This software is intended to parse and present information within devlog.markdown development logs. It also helps You to write the devlog.
 
@@ -13,7 +13,7 @@ Using with a file, for parsing and seeing the information summary:
 
 or in a folder with a 'devlog.markdown' file in it:
 
-  #{'devlog'.green} 
+  #{'devlog'.green}
 
 write commands for the current folder, the top three:
 
@@ -32,40 +32,54 @@ exporting devlog into a book, which can be read top down, like normal books:
   #{'devlog'.green} x ~ exports into devlog.txt
 
 EOF
-#arguments
+
+# arguments
 $:.unshift File.join(File.dirname(__FILE__))
 @in_file_or_cmd = ARGV[0]
+
+def print_backtrace(exception)
+  exception.backtrace.join("\n\t").to_s.blue
+end
+
 def print_usage
   puts USAGE
 end
-def parse_now(devlog_file='devlog.markdown', msg='')
+
+def parse_now(devlog_file = 'devlog.markdown', msg = '')
   puts msg
   t = parse_devlog_now(devlog_file)
   puts t.validation_string
   puts t.to_info_string
   puts is_session_open(devlog_file) ? "\nSession is open...".yellow : "\nNo open session.".green
 end
-def export_now(devlog_file='devlog.markdown', msg='')
+
+def export_now(devlog_file = 'devlog.markdown', msg = '')
   puts msg
   exported_file = export_devlog_now(devlog_file)
   puts "\nExported to #{exported_file}.".yellow
 end
+
+include Devlog
+
 def dodo
-  include Devlog
+  load_settings('.devlog.yml')
+  default_devlog_file = devlog_file_setting
   time = Benchmark.realtime do
-
-    if @in_file_or_cmd == 'help'
+    if @in_file_or_cmd =~ /.(markdown|md)$/ # devlog_file is passed directly via CLI
+      @settings = nil
+      parse_now(@in_file_or_cmd, "Parsing #{@in_file_or_cmd}!".red)
+    elsif @in_file_or_cmd == 'help'
       print_usage
     elsif @in_file_or_cmd == 'x'
-      export_now('devlog.markdown',"Exporting devlog.markdown in current folder...".green)
+      export_now(default_devlog_file, "Exporting #{default_devlog_file}...".green)
     elsif @in_file_or_cmd == 'commit'
       `git commit -am 'devlog';git push`
     elsif @in_file_or_cmd == 'b'
       puts "CodingSession::BEGIN"
-      start_coding_session("devlog.markdown")
+      start_coding_session(default_devlog_file)
     elsif @in_file_or_cmd == 'e'
       puts "CodingSession::END"
-      stop_coding_session("devlog.markdown")
+      stop_coding_session(default_devlog_file)
     elsif @in_file_or_cmd == 'i'
       puts "Save info.markdown"
       save_info("devlog.markdown")
@@ -77,29 +91,27 @@ def dodo
       `git push`
     elsif @in_file_or_cmd == 'save'
       puts "Save info.markdown and Commit and push git"
-      save_info("devlog.markdown")
+      save_info(default_devlog_file)
       `git commit -am "devlog" && git push`
     elsif @in_file_or_cmd == 'saver'
       puts "Save info.markdown, copy devlog to README.markdown and Commit and push git"
-      save_info("devlog.markdown")
-      save_to_readme("devlog.markdown")
+      save_info(default_devlog_file)
+      save_to_readme(default_devlog_file)
       `git commit -am "devlog" && git push`
     elsif @in_file_or_cmd == 's'
-      puts is_session_open("devlog.markdown") ? "Session is open..." : "No open session."
-    elsif @in_file_or_cmd =~ /markdown/
-      parse_now(@in_file_or_cmd, "Parsing #{@in_file_or_cmd}...".red)
+      puts is_session_open(default_devlog_file) ? "Session is open..." : "No open session."
     else
-      parse_now('devlog.markdown', "Parsing devlog.markdown in current folder...".green)
+      parse_now(default_devlog_file, "Parsing #{default_devlog_file}...".green)
     end
-
- end
- puts "\n\n"
- #puts "\nRealtime: #{time}sec\n\n"
+  end
+  puts "\n\n"
+  puts "\nRealtime: #{time}sec\n\n"
 end
-#devlog run
+
+# devlog run
 begin
   dodo
-rescue Exception => e
-    puts "\nRuntime exception: #{e.message.to_s.blue}\n"
-    print_usage
-end
+rescue StandardError => e
+  puts "\nRuntime exception: #{e.message.to_s.blue}\nBacktrace:\n#{print_backtrace(e)}"
+  print_usage
+end

data/devlog.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devlog 0.2.0 ruby lib
+# stub: devlog 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "devlog"
-  s.version = "0.2.0"
+  s.name = "devlog".freeze
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["mihael"]
-  s.date = "2016-01-24"
-  s.description = "devlog.markdown time&space extractor"
-  s.email = "kitschmaster@gmail.com"
-  s.executables = ["devlog"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["mihael".freeze]
+  s.date = "2018-01-08"
+  s.description = "devlog.markdown time&space extractor".freeze
+  s.email = "kitschmaster@gmail.com".freeze
+  s.executables = ["devlog".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -32,9 +32,8 @@ Gem::Specification.new do |s|
     "bin/devlog",
     "devlog.gemspec",
     "devlog.markdown",
-    "empty_devlog.markdown",
     "lib/devlog.rb",
-    "sublime_text/.DS_Store",
+    "lib/devlog_settings.rb",
     "sublime_text/devlog.tmbundle/Snippets/begin.tmSnippet",
     "sublime_text/devlog.tmbundle/Snippets/combegin.tmSnippet",
     "sublime_text/devlog.tmbundle/Snippets/comend.tmSnippet",
@@ -45,36 +44,43 @@ Gem::Specification.new do |s|
     "sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet",
     "sublime_text/devlog.tmbundle/info.plist",
     "sublime_text/tu.py",
+    "test/devlog_file_test.rb",
+    "test/devlog_settings_test.rb",
     "test/devlog_test.rb",
+    "test/test_devlogs/.devlog.yml",
+    "test/test_devlogs/empty_devlog.markdown",
+    "test/test_devlogs/test_devlog.markdown",
+    "test/test_devlogs/test_devlog_export.markdown",
+    "test/test_devlogs/test_invalid_date_devlog.markdown",
+    "test/test_devlogs/test_negative_devlog.markdown",
+    "test/test_devlogs/test_open_devlog.markdown",
+    "test/test_devlogs/test_settings.yml",
+    "test/test_devlogs/test_single_devlog.markdown",
+    "test/test_devlogs/test_stats_devlog.markdown",
     "test/test_helper.rb",
-    "test_devlog.markdown",
-    "test_devlog_export.markdown",
-    "test_negative_devlog.markdown",
-    "test_open_devlog.markdown",
-    "test_single_devlog.markdown",
-    "test_stats_devlog.markdown"
+    "tmp/.gitignore"
   ]
-  s.homepage = "http://github.com/mihael/devlog"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "takes devlog.markdown and gives info"
+  s.homepage = "http://github.com/mihael/devlog".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "takes devlog.markdown and gives info".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 4.1"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 4.1"])
+      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 4.1"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<activesupport>.freeze, ["~> 4.1"])
+      s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 4.1"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<activesupport>.freeze, ["~> 4.1"])
+    s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
   end
 end
 

data/devlog.markdown

@@ -1,3 +1,35 @@
+#08.01.2018 21:56:04 CodingSession::END
+
+doing some more work on settings.
+
+the idea is to optionally have a file with the following name `.devlog.yml` in a folder where You want to work with devlog. this allows writing the devlog in an arbitrary folder relative to the settings file.
+
+ii was also thinking about doing convention, simply always look for a `devlog.markdown` in the current folder, and then one up and so on... but ended up going with a setting. so by default `devlog.markdown` is expected to live in the folder where the CLI command is spawned: `devlog`. if there's a settings file instead, and it overrides `devlog_file` path, then that is used instead (but only if it exists).
+
+done. this is already nice, now I can finally run `devlog` from the project folder and keep my devlog out of it.
+
+now, it would be good to also publish this to the world.
+
+so let's see... this time I can actually create a PR and reference an [issue](https://github.com/mihael/devlog/issues/7) for it.
+
+the new version will be 0.3.0.
+
+#08.01.2018 20:01:28 CodingSession::BEGIN
+
+#14.06.2017 00:28:08 CodingSession::END
+
+ah, well, still not done. cleaning up some more...
+
+#14.06.2017 00:00:01 CodingSession::BEGIN
+
+#13.06.2017 23:59:11 CodingSession::END
+
+doing some cleanup... have a bunch of Issues that need to be implemented.
+
+but starting with invalid date parsing problem, want to see the line that caused it. done.
+
+#13.06.2017 22:30:56 CodingSession::BEGIN
+
 #24.01.2016 20:44:45 CodingSession::END
 
 ii can now export the devlog. the top session becomes the bottom one, and a human can read the devlog like a book: top down...

data/lib/devlog.rb

@@ -1,7 +1,9 @@
 #require "time"
 #require "date"
 require "active_support/all"
+require_relative "./devlog_settings"
 
+# Colors for devlog
 class String
   def red; colorize(self, "\e[1m\e[31m"); end
   def green; colorize(self, "\e[1m\e[32m"); end
@@ -12,59 +14,70 @@ class String
   def pur; colorize(self, "\e[1m\e[35m"); end
   def colorize(text, color_code) "#{color_code}#{text}\e[0m" end
 end
+
+# The devlog module with all the mumbo
 module Devlog
   # :stopdoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   VERSION = File.open(File.join(File.dirname(__FILE__), %w[.. VERSION]), 'r').read
+
   # :startdoc:
   # Returns the version string for the library.
   #
   def self.version
     VERSION
   end
+
   # Returns the library path for the module. If any arguments are given,
   # they will be joined to the end of the libray path using
   # <tt>File.join</tt>.
   #
-  def self.libpath( *args )
+  def self.libpath(*args)
     args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
   end
+
   # Returns the lpath for the module. If any arguments are given,
   # they will be joined to the end of the path using
   # <tt>File.join</tt>.
   #
-  def self.path( *args )
+  def self.path(*args)
     args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
+
   # Utility method used to require all files ending in .rb that lie in the
   # directory below this file that has the same name as the filename passed
   # in. Optionally, a specific _directory_ name can be passed in such that
   # the _filename_ does not have to be equivalent to the directory.
   #
-  def self.require_all_libs_relative_to( fname, dir = nil )
+  def self.require_all_libs_relative_to(fname, dir = nil)
     dir ||= ::File.basename(fname, '.*')
     search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+      ::File.join(::File.dirname(fname), dir, '**', '*.rb')
+    )
 
-    Dir.glob(search_me).sort.each {|rb| require rb}
+    Dir.glob(search_me).sort.each { |rb| require rb }
   end
+
   def self.display_version
     "\n#{'Devlog'.green} v#{Devlog.version}\n"
   end
-  # Write siple console log
+
+  # Write simple console log
   def self.log(txt)
     puts "#{txt}"
   end
 
-  #parsing datetime
-  DATETIME_FORMAT = "%d.%m.%Y %H:%M:%S"
+  # Parsing datetime
+  DATETIME_FORMAT = '%d.%m.%Y %H:%M:%S'.freeze
   def parse_datetime(line)
     parts = line[1..-1].split
     DateTime.strptime("#{parts[0]} #{parts[1]}", DATETIME_FORMAT)
+  rescue StandardError
+    abort "\nError\nCan not parse line with invalid date:\n\n#{line}".to_s.blue
   end
 
-  def parse_devlog_now(devlog=nil)
+  def parse_devlog_now(devlog = nil)
     t = Parsing.new
     t.devlog_file = devlog
 
@@ -79,17 +92,17 @@ module Devlog
     temp_zezzion = nil
 
     line_number = 0
-    File.open(devlog, "r").each do |line|
-      line_number+=1
+    File.open(devlog, 'r').each do |line|
+      line_number += 1
 
       if line =~ /-NOCHARGE/
-        in_session = false #do not count nocharge sessions, this is a secret feature
+        in_session = false # do not count nocharge sessions, this is a secret feature
       elsif line =~ /\A#/ && line =~ /CodingSession::END/
         in_session = true
         timeEnd = parse_datetime(line)
         timeEnd_line_number = line_number
 
-        #zezzion
+        # zezzion
         temp_zezzion = Zezzion.new
         temp_zezzion.zzend = timeEnd
         temp_zezzion.zzend_line_number = timeEnd_line_number
@@ -100,11 +113,11 @@ module Devlog
           timeBegin = parse_datetime(line)
           timeBegin_line_number = line_number
 
-          #cs_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
+          # cs_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
           delta = (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
           t.coding_session_time += delta
 
-          #zezzion
+          # zezzion
           temp_zezzion.coding_session_time += delta
           temp_zezzion.zzbegin = timeBegin
           temp_zezzion.zzbegin_line_number = timeBegin_line_number
@@ -117,7 +130,7 @@ module Devlog
         timeEnd = parse_datetime(line)
         timeEnd_line_number = line_number
 
-        #zezzion
+        # zezzion
         temp_zezzion = Zezzion.new(Zezzion::COM)
         temp_zezzion.zzend = timeEnd
         temp_zezzion.zzend_line_number = timeEnd_line_number
@@ -131,7 +144,7 @@ module Devlog
           delta = (timeEnd - timeBegin).to_f * 24
           t.com_session_time += delta
 
-          #zezzion
+          # zezzion
           temp_zezzion.coding_session_time += delta
           temp_zezzion.zzbegin = timeBegin
           temp_zezzion.zzbegin_line_number = timeBegin_line_number
@@ -143,7 +156,7 @@ module Devlog
         delta = line.to_f
         t.com_session_time += delta
 
-        #zezzion
+        # zezzion
         if temp_zezzion
           temp_zezzion.com_session_time += delta
         else
@@ -153,7 +166,7 @@ module Devlog
         delta = (line.to_f / 60)
         t.com_session_time += delta
 
-        #zezzion
+        # zezzion
         if temp_zezzion
           temp_zezzion.com_session_time += delta
         else
@@ -163,77 +176,32 @@ module Devlog
         delta = (line.to_f)
         t.payed_time += delta
 
-        #zezzion
+        # zezzion
         if temp_zezzion
           temp_zezzion.payed_time += delta
         else
           puts "error adding temp_zezzion delta time at line: #{line}"
         end
       end
-
     end
-    #return the Parsing object
+    # return the Parsing object
     t
   end
 
-  #this is just a historic event, not used
-  def parse_devlog(devlog=nil)
-    t = Tajm.new
-    return t unless devlog
-
-    timeEnd = nil
-    timeBegin = nil
-    in_session = false
+  # Workflow methods
 
-    File.open(devlog, "r").each do |line|
-      if line =~ /-NOCHARGE/
-        in_session = false #do not count nocharge sessions
-      elsif line =~ /\A#/ && line =~ /CodingSession::END/
-        in_session = true
-        timeEnd = parse_datetime(line)
-      elsif line =~ /\A#/ && line =~ /CodingSession::BEGIN/
-        if in_session
-          in_session = false
-          timeBegin = parse_datetime(line)
-          #cs_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
-          t.coding_session_time += (timeEnd - timeBegin).to_f * 24 #hours *60 #minutes *60 #seconds
-        end
-      elsif line =~ /\A#/ && line =~ /ComSession::END/
-        in_session = true
-        timeEnd = parse_datetime(line)
-      elsif line =~ /\A#/ && line =~ /ComSession::BEGIN/
-        if in_session
-          in_session = false
-          timeBegin = parse_datetime(line)
-          t.com_session_time += (timeEnd - timeBegin).to_f * 24
-        end
-      elsif line =~ /\A\+[0-9]+[h]/
-        t.com_session_time += line.to_f
-      elsif line =~ /\A\+[0-9]+[m]/
-        t.com_session_time += (line.to_f / 60)
-      elsif line =~ /\A\-[0-9]+[h]/
-        t.payed_time += (line.to_f)
-      end
-
-    end
-    #return the Tajm object
-    t
-  end
-
-  #workflow methods
-
-  #helper for the time entries
-  def devlog_session_entry(session_type='Coding', begin_end='BEGIN')
+  # Helper for the time entries
+  def devlog_session_entry(session_type = 'Coding', begin_end = 'BEGIN')
     "\n##{Time.now.strftime(DATETIME_FORMAT)} #{session_type}Session::#{begin_end}\n"
   end
 
-  #prepend a string to a text file
-  #def prepend_string(t="\n", devlog_file='devlog.markdown')
-  #  system "echo '#{t}' | cat - #{devlog_file} > #{devlog_file}.tmp && mv #{devlog_file}.tmp #{devlog_file}"
-  #end
+  # Prepend a string to a text file
+  # def prepend_string(t="\n", devlog_file='devlog.markdown')
+  #   system "echo '#{t}' | cat - #{devlog_file} > #{devlog_file}.tmp && mv #{devlog_file}.tmp #{devlog_file}"
+  # end
 
   require 'tempfile'
-  def prepend_string(string="\n", path)
+  def prepend_string(path, string = "\n")
     Tempfile.open File.basename(path) do |tempfile|
       tempfile << string
       File.open(path, 'r+') do |file|
@@ -245,17 +213,17 @@ module Devlog
   end
 
   #insert a new session
-  def start_coding_session(devlog_file='devlog.markdown')
-    prepend_string(devlog_session_entry('Coding', 'BEGIN'), devlog_file)
+  def start_coding_session(devlog_file = 'devlog.markdown')
+    prepend_string(devlog_file, devlog_session_entry('Coding', 'BEGIN'))
   end
 
   #close the current session, if any
-  def stop_coding_session(devlog_file='devlog.markdown')
-    prepend_string(devlog_session_entry('Coding', 'END'), devlog_file)
+  def stop_coding_session(devlog_file = 'devlog.markdown')
+    prepend_string(devlog_file, devlog_session_entry('Coding', 'END'))
     save_info(devlog_file)
   end
 
-  def save_info(devlog_file='devlog.markdown', info_file='info.markdown')
+  def save_info(devlog_file = 'devlog.markdown', info_file = 'info.markdown')
     info = parse_devlog_now(devlog_file)
     if info.has_info?
       File.open(File.join(File.dirname(devlog_file), info_file), 'w') {|f| f.write(info.to_info_string(short=true)) }
@@ -264,17 +232,17 @@ module Devlog
     end
   end
 
-  def save_to_readme(devlog_file='devlog.markdown')
+  def save_to_readme(devlog_file = 'devlog.markdown')
     `cp #{devlog_file} #{File.join(File.dirname(devlog_file), 'README.markdown')}`
   end
 
-  #if the first non empty line is not and END entry then session is open (or malformed file)
-  def is_session_open(devlog_file='devlog.markdown')
+  # If the first non empty line is not and END entry then session is open (or malformed file)
+  def is_session_open(devlog_file = 'devlog.markdown')
     is_open = true
     File.open(devlog_file, 'r') do |f|
       loop do
-        break if not line = f.gets #exit on end of file, read line
-        if (line.strip.size>0) #non empty line
+        break if not line = f.gets # exit on end of file, read line
+        if (line.strip.size>0) # non empty line
           if (line =~ /Session::END/)
             is_open = false
             break
@@ -287,21 +255,21 @@ module Devlog
     is_open
   end
 
-  def export_devlog_now(devlog_file='devlog.markdown')
+  def export_devlog_now(devlog_file = 'devlog.markdown')
     devlog_export_file = File.join(File.dirname(devlog_file), 'devlog_book.markdown')
-    #`sed -n '1!G;h;$p' #{devlog_file} > #{devlog_export_file}` #not what we want! , we want just the sessions upside down, but text intact
-    #so need to parse all sessions and print them out in reverse!
+    # `sed -n '1!G;h;$p' #{devlog_file} > #{devlog_export_file}` #not what we want! , we want just the sessions upside down, but text intact
+    # so need to parse all sessions and print them out in reverse!
 
     sessionEnd = ''
     sessionMidd = ''
     sessionBegin = ''
     in_session = false
 
-    #the ends are the begins, the begins are the ends
+    # The ends are the begins, the begins are the ends
 
     File.new(devlog_export_file, 'wb')
 
-    File.open(devlog_file, "r").each do |line|
+    File.open(devlog_file, 'r').each do |line|
       if line =~ /-NOCHARGE/
         in_session = false #do not export nocharge sessions
       elsif line =~ /\A#/ && (line =~ /CodingSession::END/ || line =~ /ComSession::END/ )
@@ -312,8 +280,8 @@ module Devlog
           in_session = false
           sessionBegin = line
           s = sessionBegin + sessionMidd + sessionEnd
-          #system "echo '#{s}' | cat - #{devlog_export_file} > #{devlog_export_file}.tmp && mv #{devlog_export_file}.tmp #{devlog_export_file}"
-          prepend_string(s, devlog_export_file)
+          # system "echo '#{s}' | cat - #{devlog_export_file} > #{devlog_export_file}.tmp && mv #{devlog_export_file}.tmp #{devlog_export_file}"
+          prepend_string(devlog_export_file, s)
           sessionEnd = ''
           sessionMidd = ''
           sessionBegin = ''
@@ -326,23 +294,23 @@ module Devlog
     devlog_export_file
   end
 
-  #the parsing object
+  # The parsing object
   class Parsing
-    #this is the total time, but each session has these same params
+    # this is the total time, but each session has these same params
     attr_accessor :coding_session_time, :com_session_time, :payed_time #backward compatible object with Tajm, from devlog 0.0.0
 
     attr_accessor :zezzions, :devlog_file
 
-    def initialize(viewing_time_current_date=DateTime.now)
+    def initialize(viewing_time_current_date = DateTime.now)
       @viewing_time_current_date = viewing_time_current_date
       @zezzions = []
 
-      #backward compatible object with Tajm, from devlog 0.0.0
+      # backward compatible object with Tajm, from devlog 0.0.0
       @coding_session_time = 0.0
       @com_session_time = 0.0
       @payed_time = 0.0
 
-      @devlog_file = ""
+      @devlog_file = ''
     end
 
     def has_info?
@@ -353,68 +321,70 @@ module Devlog
       @zezzions << zezzion
     end
 
-    #global devlog start, first entry
+    # global devlog start, first entry
     def devlog_begin
       @zezzions.last.zzbegin
     end
 
-    #global devlog end, last entry
+    # global devlog end, last entry
     def devlog_end
       @zezzions.first.zzend
     end
 
-    #how much time between first session begin and last session end
-    #in seconds
-    #def devlog_time
-    #  (self.devlog_end.to_time - self.devlog_begin.to_time)/60.0/60.0
-    #end
+    # how much time between first session begin and last session end
+    # in seconds
+    # def devlog_time
+    #   (self.devlog_end.to_time - self.devlog_begin.to_time)/60.0/60.0
+    # end
 
     def session_time
-      @zezzions.inject(time=0){|time, zezzion| time+zezzion.session_time}.round(2)
+      @zezzions.inject(0) { |time, zezzion| time + zezzion.session_time }.round(2)
     end
 
-    #how many days devlog spans
+    # how many days devlog spans
     def devlog_days
-      count_time(:days=>1)
-      #(self.devlog_end - self.devlog_begin).to_i + 1 #counting days like this, would not account for daylight saving changes
+      count_time( :days => 1)
+      # (self.devlog_end - self.devlog_begin).to_i + 1 #counting days like this, would not account for daylight saving changes
     end
 
-    #how many weeks devlog spans
+    # how many weeks devlog spans
     def devlog_weeks
       (devlog_days/7.0).round(2)
     end
 
     def devlog_months
-      count_time(:months=>1)
+      count_time( :months => 1)
     end
 
-    #hours per day
+    # hours per day
     def per_day
       (self.session_time/self.devlog_days).round(2)
     end
+
     def per_week
       (self.session_time/self.devlog_weeks).round(2)
     end
+
     def per_month
       (self.session_time/self.devlog_months).round(2)
     end
 
-    #total charge time in hours, coding plus communication sessions
+    # total charge time in hours, coding plus communication sessions
     def charge_time
       (coding_session_time + com_session_time).round(2)
     end
 
-    #total charge time in hours, coding plus communication sessions - payed hours
+    # total charge time in hours, coding plus communication sessions - payed hours
     def unpayed_time
       (coding_session_time + com_session_time + payed_time).round(2)
     end
 
-    #return hours worked for the last X days, from beginTime
-    def hours_for_last(days, beginTime=DateTime.now)
+    # return hours worked for the last X days, from beginTime
+    def hours_for_last(days, beginTime = DateTime.now)
       endTime = beginTime.to_time - days.days
-      selected_zezzions = @zezzions.select{|z| z.zzbegin.to_time<beginTime && z.zzend>=endTime}
-      #puts("Selected sessons from #{beginTime} to #{endTime}: #{selected_zezzions.size}")
-      selected_zezzions.inject(time=0){|time, z| time+z.session_time}.round(2)
+      selected_zezzions = @zezzions.select { |z| z.zzbegin.to_time < beginTime && z.zzend >= endTime }
+      # puts("Selected sessons from #{beginTime} to #{endTime}: #{selected_zezzions.size}")
+      selected_zezzions.inject(0) { |time, z| time + z.session_time }.round(2)
     end
 
     def longest_session
@@ -442,26 +412,26 @@ module Devlog
     end
 
     def last_session
-      @zezzions.first #devlog_begin
+      @zezzions.first # devlog_begin
     end
 
     def first_session
-      @zezzions.last #devlog_end
+      @zezzions.last # devlog_end
     end
 
-    #return all sessions
+    # return all sessions
     def devlog_sessions
       @zezzions
     end
 
     def validation_string
-      vs = ""
+      vs = ''
       vs << (@zezzions.any? ? '' : "No sessions recorded, add some first...\n".red)
-      vs << (File.exist?(self.devlog_file) ? '' : "No such file #{self.devlog_file}...\n".red)
+      vs << (File.exist?(devlog_file) ? '' : "No such file #{devlog_file}...\n".red)
     end
 
     def to_info_string(short=false)
-      s = ""
+      s = ''
       s <<  "\nSession::Time:      = #{self.session_time} [h]\n"
       s << ("\nCodingSession::Time = %.1f [h]\n" % self.coding_session_time)
       s << ("\nComSession::Time    = %.1f [h]\n" % self.com_session_time)
@@ -498,11 +468,12 @@ module Devlog
     end
 
     private
+
       def sessions_to_s(sessions)
         "\n" + sessions.collect{|session| "                      " + session.to_s}.join("\n")
       end
 
-      #count :weeks=>1, or :days=>1, or :years=>1
+      # count :weeks=>1, or :days=>1, or :years=>1
       def count_time(options)
         num = 0
         cur = self.devlog_begin
@@ -510,20 +481,18 @@ module Devlog
           num += 1
           cur = cur.advance(options)
         end
-        return num
+        num
       end
-
   end
 
-
   class Zezzion
-    COM = 1 #communication session
-    COD = 0 #coding session
+    COM = 1 # communication session
+    COD = 0 # coding session
     attr_accessor :zzbegin, :zzend, :zzbegin_title, :zzend_title, :zztype
     attr_accessor :coding_session_time, :com_session_time, :payed_time
     attr_accessor :zzend_line_number, :zzbegin_line_number
 
-    def initialize(zztype=COD)
+    def initialize(zztype = COD)
       @zztype = zztype
       @zzbegin = nil
       @zzend = nil
@@ -537,33 +506,33 @@ module Devlog
       @zzend_line_number = 0
     end
 
-    #in seconds
+    # in seconds
     def time
       @zzend.to_time -  @zzbegin.to_time
     end
 
-    #zezzion_time in days
+    # zezzion_time in days
     def days
       min = self.time / 60
       hours = min / 60
       days = hours / 24
     end
 
-    #the whole coding session time
+    # the whole coding session time
     def session_time
       @coding_session_time + @com_session_time #in seconds
     end
 
-    #hours per day
+    # hours per day
     def per_day
-      #whole time over number of days the parsing covers
+      # whole time over number of days the parsing covers
       session_time/days
     end
     def per_week
-      #todo
+      # todo
     end
     def per_month
-      #todo
+      # todo
     end
 
     def type
@@ -583,9 +552,7 @@ module Devlog
       @com_session_time = 0.0
       @payed_time = 0.0
     end
-
   end
-
 end
 
 module DateTimeAgoInWords
@@ -616,6 +583,7 @@ module DateTimeAgoInWords
     pair.compact
   end
 end
+
 class DateTime
   include DateTimeAgoInWords
-end
+end

data/lib/devlog_settings.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+require 'ostruct'
+# require 'pry'
+
+#
+module Devlog
+  # Settings - keeping it simple.
+  # Allow settings.key besides settings[:key]
+  # If the method name exists as a key within this Hash, fetch it.
+  class Settings < Hash
+    def method_missing(m, *args, &block)
+      if key?(m)
+        fetch m
+      elsif key?(m.to_s)
+        fetch m.to_s
+      else
+        super
+      end
+    end
+  end
+
+  def load_settings(file)
+    yaml = YAML.load_file(file)
+    @settings = yaml ? Settings[yaml] : Settings.new
+  end
+
+  def settings
+    @settings
+  end
+
+  # The default is the current folder with devlog.markdown in it.
+  DEVLOG_FILE = 'devlog.markdown'.freeze
+
+  # Calculate a devlog_file path.
+  def devlog_file_setting
+    return DEVLOG_FILE unless @settings
+    devlog_file_setting = @settings['devlog_file']
+    if devlog_file_setting && File.exists?(File.join(Dir.pwd, devlog_file_setting))
+      devlog_file_setting
+    else
+      DEVLOG_FILE
+    end
+  end
+end

data/test/devlog_file_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+# Test the devlog_file_setting override
+class DevlogFileTest < Test::Unit::TestCase
+  def setup
+    load_settings(File.join(File.dirname(__FILE__),
+                        TEST_FILES_PATH, '.devlog.yml'))
+  end
+
+  def test_devlog_file_returns_the_overriden_devlog_file
+    x = "overridden setting should be returned, but was #{devlog_file_setting}"
+    assert(devlog_file_setting == 'test/test_devlogs/test_devlog.markdown', x)
+  end
+end

data/test/devlog_settings_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+# Test the settings
+class DevlogSettingsTest < Test::Unit::TestCase
+  def setup
+    load_settings(File.join(File.dirname(__FILE__),
+                        TEST_FILES_PATH, 'test_settings.yml'))
+  end
+
+  def test_settings
+    assert(settings.is_a?(Settings) == true, 'settings is a Hash')
+  end
+
+  def test_adding_setting
+    settings[:new_setting] = 'added'
+    assert(settings.new_setting == 'added', 'new_setting should be defined')
+  end
+
+  def test_changing_setting_on_the_fly
+    settings[:new_setting] = 'added'
+    assert(settings.new_setting == 'added', 'new_setting should be defined')
+    settings[:new_setting] = 'mod'
+    assert(settings.new_setting == 'mod', 'new_setting should be modified')
+  end
+
+  def test_loading_from_yaml
+    assert(settings.devlog_file == 'development_log.markdown',
+           'example setting should be loaded')
+  end
+
+  def test_devlog_file_setting_returns_default_when_overriden_devlog_file_does_not_exist
+    assert(devlog_file_setting == 'devlog.markdown',
+           'default setting should be returned, since the example setting does not exist')
+  end
+
+  def test_nested_settings_are_possible_but_not_encouraged
+    assert_raise(NoMethodError) { settings.nested.setting == 'xyz' }
+    assert(settings.nested['setting'] == 'xyz', 'xyz should be defined')
+  end
+end

data/test/devlog_test.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class DevlogTest < Test::Unit::TestCase
-
   def test_empty_devlog
-    @tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', 'empty_devlog.markdown'))
+    @tajm = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'empty_devlog.markdown'))
     puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
     assert(@tajm.coding_session_time==0, "time is money is love")
     assert(@tajm.com_session_time==0, "selftalk")
@@ -35,6 +34,12 @@ class DevlogTest < Test::Unit::TestCase
     assert(@tajm_test.charge_time==5.5, "wrong charge wrong")
   end
 
+  def test_devlog_invalid_date
+    assert_raise(SystemExit) do
+      parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_invalid_date_devlog.markdown'))
+    end
+  end
+
   def test_p_session_time
     p = Parsing.new
     zezzion = Zezzion.new
@@ -111,7 +116,6 @@ class DevlogTest < Test::Unit::TestCase
     load_devlog_stat
     hours = @tajm_stat.hours_for_last(1, parse_datetime("#09.03.2014 11:00:00"))
     assert(hours==1, "should be 1, but is #{hours}")
-
   end
 
   def test_session_count
@@ -136,7 +140,7 @@ class DevlogTest < Test::Unit::TestCase
   end
 
   def test_start_coding_session
-    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp1_devlog.markdown')
+    @empty_devlog = File.join(File.dirname(__FILE__), TEMP_PATH, 'tmp1_devlog.markdown')
     File.open(@empty_devlog, 'w') {|f| f.puts('empty')}
     start_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::BEGIN/).size>0, "should insert CodingSession::BEGIN at top of file")
@@ -145,7 +149,7 @@ class DevlogTest < Test::Unit::TestCase
   end
 
   def test_stop_coding_session
-    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp2_devlog.markdown')
+    @empty_devlog = File.join(File.dirname(__FILE__), TEMP_PATH, 'tmp2_devlog.markdown')
     File.delete(@empty_devlog) if File.exist?(@empty_devlog)
     File.open(@empty_devlog, 'w') {|f| f.puts('empty')}
     stop_coding_session(@empty_devlog)
@@ -155,14 +159,14 @@ class DevlogTest < Test::Unit::TestCase
   end
 
   def test_save_info_after_stop_coding_session
-    @devlog_info  = File.join(File.dirname(__FILE__), '..', 'info.markdown')
-    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp3_devlog.markdown')
+    @devlog_info  = File.join(File.dirname(__FILE__), TEMP_PATH, 'info.markdown')
+    @empty_devlog = File.join(File.dirname(__FILE__), TEMP_PATH, 'tmp3_devlog.markdown')
     #File.delete(@empty_devlog) if File.exist?(@empty_devlog)
     File.new(@empty_devlog, 'w').puts('\n')
     start_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::BEGIN/).size>0, "should insert CodingSession::BEGIN at top of file")
     assert(is_session_open(@empty_devlog)==true, "should be true, session should be open after starting")
-    prepend_string('+1h', @empty_devlog)
+    prepend_string(@empty_devlog, '+1h')
     sleep(1)
     stop_coding_session(@empty_devlog)
     assert(File.readlines(@empty_devlog).grep(/CodingSession::END/).size>0, "should insert CodingSession::END at top of file")
@@ -177,14 +181,14 @@ class DevlogTest < Test::Unit::TestCase
   end
 
   def test_is_session_open
-    @closed_devlog = File.join(File.dirname(__FILE__), '..', 'test_devlog.markdown')
+    @closed_devlog = File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_devlog.markdown')
     assert(is_session_open(@closed_devlog)==false, "should be false, session should be closed")
-    @open_devlog = File.join(File.dirname(__FILE__), '..', 'test_open_devlog.markdown')
+    @open_devlog = File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_open_devlog.markdown')
     assert(is_session_open(@open_devlog)==true, "should be true, session should be open")
   end
 
   def test_devlog_export
-    @exported_devlog = export_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_devlog_export.markdown'))
+    @exported_devlog = export_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_devlog_export.markdown'))
     assert(File.exists?(@exported_devlog))
     assert(File.size(@exported_devlog)>0, "file should not be empty")
     File.open(@exported_devlog, "r") do |f|
@@ -200,4 +204,7 @@ class DevlogTest < Test::Unit::TestCase
     File.delete(@exported_devlog) if File.exist?(@exported_devlog)
   end
 
+  def test_default_devlog_file_setting
+    assert(devlog_file_setting == 'devlog.markdown', 'should return default')
+  end
 end

data/test/test_devlogs/.devlog.yml

@@ -0,0 +1 @@
+devlog_file: "test/test_devlogs/test_devlog.markdown"

data/test/test_devlogs/test_invalid_date_devlog.markdown

@@ -0,0 +1,11 @@
+#01.06.2017 18:20:50 CodingSession::END
+
+let's see how it goes today.
+
+#01.06.2017 09:38:35 CodingSession::BEGIN
+
+#31.06.2017 18:20:50 CodingSession::END
+
+nevermind, just do it...
+
+#31.05.2017 09:38:35 CodingSession::BEGIN

data/test/test_devlogs/test_settings.yml

@@ -0,0 +1,5 @@
+# Override the default location of the_project_folder_path/../info/devlog.markdown
+devlog_file: development_log.markdown
+
+nested:
+  setting: xyz

data/test/test_helper.rb

@@ -9,38 +9,41 @@ class Test::Unit::TestCase
   include Devlog
 end
 
+TEST_FILES_PATH = 'test_devlogs'.freeze
+TEMP_PATH = '../tmp'.freeze
+
 def load_devlog
-  @tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
+  @tajm = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
   puts "#{@tajm.coding_session_time} #{@tajm.com_session_time} #{@tajm.payed_time}"
-  assert(@tajm.coding_session_time>0, "no time no money no love")
-  assert(@tajm.com_session_time>0, "no selftalk")
-  assert(@tajm.payed_time<0, "no selfpay")
+  assert(@tajm.coding_session_time>0, "truth love simplicity")
+  assert(@tajm.com_session_time>0, "selftalk")
+  assert(@tajm.payed_time<0, "selfpay")
 end
 
 def load_devlog_now
   @tajm_now = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'devlog.markdown'))
   puts "#{@tajm_now.coding_session_time} #{@tajm_now.com_session_time} #{@tajm_now.payed_time}"
-  assert(@tajm_now.coding_session_time>0, "no time no money no love")
-  assert(@tajm_now.com_session_time>0, "no selftalk")
-  assert(@tajm_now.payed_time<0, "no selfpay")
+  assert(@tajm_now.coding_session_time>0, "truth love simplicity")
+  assert(@tajm_now.com_session_time>0, "selftalk")
+  assert(@tajm_now.payed_time<0, "selfpay")
 end
 
 def load_devlog_test
-  @tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_devlog.markdown'))
+  @tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_devlog.markdown'))
   puts "#{@tajm_test.coding_session_time} #{@tajm_test.com_session_time} #{@tajm_test.payed_time}"
-  assert(@tajm_test.coding_session_time>0, "no time no money no love")
-  assert(@tajm_test.com_session_time>0, "no selftalk")
-  assert(@tajm_test.payed_time<0, "no selfpay")
+  assert(@tajm_test.coding_session_time>0, "truth love simplicity")
+  assert(@tajm_test.com_session_time>0, "selftalk")
+  assert(@tajm_test.payed_time<0, "selfpay")
 end
 
 def load_devlog_stat
-  @tajm_stat = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_stats_devlog.markdown'))
+  @tajm_stat = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_stats_devlog.markdown'))
 end
 
 def load_devlog_single
-  @tajm_single = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_single_devlog.markdown'))
+  @tajm_single = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_single_devlog.markdown'))
 end
 
 def load_devlog_negative
-  @tajm_negative = parse_devlog_now(File.join(File.dirname(__FILE__), '..', 'test_negative_devlog.markdown'))
+  @tajm_negative = parse_devlog_now(File.join(File.dirname(__FILE__), TEST_FILES_PATH, 'test_negative_devlog.markdown'))
 end

data/tmp/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - mihael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +73,8 @@ files:
 - bin/devlog
 - devlog.gemspec
 - devlog.markdown
-- empty_devlog.markdown
 - lib/devlog.rb
-- sublime_text/.DS_Store
+- lib/devlog_settings.rb
 - sublime_text/devlog.tmbundle/Snippets/begin.tmSnippet
 - sublime_text/devlog.tmbundle/Snippets/combegin.tmSnippet
 - sublime_text/devlog.tmbundle/Snippets/comend.tmSnippet
@@ -86,14 +85,21 @@ files:
 - sublime_text/devlog.tmbundle/Snippets/tu.tmSnippet
 - sublime_text/devlog.tmbundle/info.plist
 - sublime_text/tu.py
+- test/devlog_file_test.rb
+- test/devlog_settings_test.rb
 - test/devlog_test.rb
+- test/test_devlogs/.devlog.yml
+- test/test_devlogs/empty_devlog.markdown
+- test/test_devlogs/test_devlog.markdown
+- test/test_devlogs/test_devlog_export.markdown
+- test/test_devlogs/test_invalid_date_devlog.markdown
+- test/test_devlogs/test_negative_devlog.markdown
+- test/test_devlogs/test_open_devlog.markdown
+- test/test_devlogs/test_settings.yml
+- test/test_devlogs/test_single_devlog.markdown
+- test/test_devlogs/test_stats_devlog.markdown
 - test/test_helper.rb
-- test_devlog.markdown
-- test_devlog_export.markdown
-- test_negative_devlog.markdown
-- test_open_devlog.markdown
-- test_single_devlog.markdown
-- test_stats_devlog.markdown
+- tmp/.gitignore
 homepage: http://github.com/mihael/devlog
 licenses:
 - MIT
@@ -114,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: takes devlog.markdown and gives info