devlog 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17dd2cce02aef60e7d7bc439502746a2fe7ae91
-  data.tar.gz: 6c6dc8f2d7ecdb2d891680a39505f623dd712d9f
+  metadata.gz: 19e13234e260fdcf4a605fed718d18e38582b527
+  data.tar.gz: cb768c8e8fd307785e5fb5c500614296967a0abe
 SHA512:
-  metadata.gz: 380f4bc48f1de2d19d58d5a9a34c46d0150567deb3f4859c0d84fa106daaa4354ff043664df17e20c8e8c9ba3563ee1461f7df578f23115eb665e000352fa2be
-  data.tar.gz: 3aa058eefadc8f68692ad7d04f2091b52d9e6fcdecb453fa38fb1094d9964f1689054040f93819c66e29b9564eb6104059fa11c27cc49e51e29003380d92367c
+  metadata.gz: 84575cdfb6b41b2392823f592b4d5231d0560b11c170afe60cde836637c4f67f15135b803b705ab7a2ec8951dad29a8fc6c1f4abe5f6cd76778fb17f44b466a1
+  data.tar.gz: 7a71510e171eec5a56e0be41f1c806bb97eb24dc7a6376fe977a563334cbdac49b5b7bff042af16e45c291612bd22e4ea3140b0ab930c99850e1549bdb221998

data/.ruby-version

@@ -1,3 +1,3 @@
-ruby-2.0.0
+2.2.0
 
 

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
+gem "activesupport", "~> 4.1.8"
 
-#group :development, :test do
+group :development, :test do
   gem "jeweler", "~> 2.0"
-  #gem "rspec", '~> 1.3'
-  gem "activesupport", "~> 3.2"
-#end
+end

data/Gemfile.lock

@@ -1,9 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.1.9)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     addressable (2.3.5)
     builder (3.2.2)
     descendants_tracker (0.0.3)
@@ -20,7 +23,7 @@ GEM
       oauth2
     hashie (2.0.5)
     highline (1.6.20)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -34,6 +37,7 @@ GEM
     jwt (0.1.11)
       multi_json (>= 1.5)
     mini_portile (0.5.2)
+    minitest (5.5.1)
     multi_json (1.8.4)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -49,10 +53,13 @@ GEM
     rake (10.1.1)
     rdoc (4.1.1)
       json (~> 1.4)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.2)
+  activesupport (~> 4.1.8)
   jeweler (~> 2.0)

data/README.md

@@ -8,21 +8,59 @@ structure
 
 a devlog consists of many coding or communication sessions. 
 
-the current session is always written on the top of the file.
+the current development session is written at the top of the file.
 
 older sessions are towards the end of the file. 
 
-the first session is the most down, scroll down at the end of the file.
+the first session is the one at the bottom, scroll down at the end of the file.
 
 sessions are separated with beginning and end "devlog DSL" entries, 
 
 these must be entered at the start of the line.
 
+how to write?
+=============
+
+like a book, top down, but always start a new session on top of the file, so that Your customer sees the latest entry there.
 
 devlog DSL
 ==========
 
+
+#DD.MM.YYYY HH:MM:SS CodingSession::END
+
+devlog text...
+
 #DD.MM.YYYY HH:MM:SS CodingSession::BEGIN
 
-syntax
-======
+using the devlog binary
+===================
+
+to parse a devlog file explicitly:
+
+`devlog /path/devlog_file.markdown`
+
+to run in current folder (default), expecting file `devlog.markdown` to be present in it:
+
+`devlog`
+
+run in current folder and spawn coding session:
+
+`devlog begin`
+
+run in current folder and finish coding session:
+
+`devlog end`
+
+run in current folder and commit to git repo (if any):
+
+`devlog commit`
+
+run in current folder and push to git repo (if any):
+
+`devlog push`
+
+run in current folder and commit&push git repo (if any):
+
+`devlog save`
+

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/devlog

@@ -11,45 +11,68 @@ Using with a file:
 
   #{'devlog'.red} /path/to/devlog.markdown
 
-or just in a folder with a 'devlog.markdown' file:
+or in a folder with a 'devlog.markdown' file in it:
 
   #{'devlog'.green} 
 
+commands for the current folder:
+
+  #{'devlog'.green} b ~ starts coding session
+  #{'devlog'.green} e ~ stops coding session
+  #{'devlog'.green} s ~ status of coding session
+  #{'devlog'.green} save ~ commit & push git repo
+  #{'devlog'.green} commit ~ commit git repo
+  #{'devlog'.green} push ~ push git repo
+
 EOF
 #arguments
 $:.unshift File.join(File.dirname(__FILE__))
-@in_file = ARGV[0]
+@in_file_or_cmd = ARGV[0]
 def print_usage
   puts USAGE
 end
+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 dodo
   include Devlog
   time = Benchmark.realtime do 
-    if @in_file
-      puts "Parsing #{@in_file}...".red
-      t = parse_devlog_now(@in_file)
-      puts t.validation_string
-      puts t.to_info_string
+
+    if @in_file_or_cmd == 'commit'
+      `git commit -am 'devlog';git push`
+    elsif @in_file_or_cmd == 'b'
+      start_coding_session("devlog.markdown")
+    elsif @in_file_or_cmd == 'e'
+      stop_coding_session("devlog.markdown")
+    elsif @in_file_or_cmd == 'commit'
+      puts "Commit git"
+      `git commit -am "devlog"`
+    elsif @in_file_or_cmd == 'push'
+      puts "Push git"
+      `git push`
+    elsif @in_file_or_cmd == 'save'
+      puts "Commit and push git"
+      `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)
     else
-      puts "Parsing devlog.markdown in current folder...".green
-      t = parse_devlog_now("devlog.markdown") #try default file
-      puts t.validation_string
-      puts t.to_info_string
+      parse_now('devlog.markdown', "Parsing devlog.markdown in current folder...".green)
     end
+
  end
- puts "\nRealtime used : #{time}sec\n\n"
+ puts "\n\n"
+ #puts "\nRealtime: #{time}sec\n\n"
 end
-
+#devlog run
 begin
-
-  if ARGV.size > 0
-    dodo
-  else
-      dodo
-  end
-
-rescue
+  dodo
+rescue Exception => e
+    puts "\nRuntime exception: #{e.message.to_s.blue}\n"
     print_usage
-end
-
-#exit
+end

data/devlog.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: devlog 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devlog"
-  s.version = "0.0.3"
+  s.version = "0.1.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 = "2014-08-15"
+  s.date = "2015-02-02"
   s.description = "devlog.markdown time&space extractor"
   s.email = "kitschmaster@gmail.com"
   s.executables = ["devlog"]
@@ -46,28 +48,28 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test_devlog.markdown",
     "test_negative_devlog.markdown",
+    "test_open_devlog.markdown",
     "test_single_devlog.markdown",
     "test_stats_devlog.markdown"
   ]
   s.homepage = "http://github.com/mihael/devlog"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.4.5"
   s.summary = "takes devlog.markdown and gives info"
 
   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<jeweler>, ["~> 2.0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.2"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.1.8"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
+      s.add_dependency(%q<activesupport>, ["~> 4.1.8"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.2"])
     end
   else
+    s.add_dependency(%q<activesupport>, ["~> 4.1.8"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.2"])
   end
 end
 

data/devlog.markdown

@@ -1,3 +1,18 @@
+
+#02.02.2015 17:53:20 CodingSession::END
+
+cleaning up a little... enhancing the devlog executable features...
+
+if You now put Your devlog.markdown under git, You can simply go to Your devlog dir and say: devlog save, and it will commit and push the git repository with default message: "devlog".
+
+getting this: /Users/mihael/.rvm/gems/ruby-2.2.0@devlog/gems/activesupport-3.2.16/lib/active_support/values/time_zone.rb:270: warning: circular argument reference - now ... [which is obviously related to this](https://github.com/rails/rails/issues/18201)
+
+next time ii work on this code want to also get rid of activesupport dependency... for now changed the gem required version in the Gemfile...
+
+releasing a minor new version...
+
+#02.02.2015 11:04:30 CodingSession::BEGIN
+
 #15.08.2014 19:14:21 CodingSession::END
 
 adding some nice stuff... can now see negative and zero sessions, which are basically error entries with zero or negative time.
@@ -108,7 +123,7 @@ of communication hours to this devlog, so that tests can be written...
 
 and start a new session higher up, after ii take some breaths...
 
-as text gets written down, at the end of the session ii scroll to the top again and insert the ending command like: #02.02.2014 17:05:50 CodingSession::END
+as text gets written down, at the end of the session ii scroll to the top again and insert the ending command.
 
 #02.02.2014 13:53:37 CodingSession::BEGIN
 

data/lib/devlog.rb

@@ -1,5 +1,7 @@
-require "date"
+#require "time"
+#require "date"
 require "active_support/all"
+
 class String
   def red; colorize(self, "\e[1m\e[31m"); end
   def green; colorize(self, "\e[1m\e[32m"); end
@@ -55,9 +57,11 @@ module Devlog
     puts "#{txt}"
   end
   
+  #parsing datetime
+  DATETIME_FORMAT = "%d.%m.%Y %H:%M:%S"
   def parse_datetime(line)
     parts = line[1..-1].split
-    DateTime.strptime("#{parts[0]} #{parts[1]}","%d.%m.%Y %H:%M:%S")
+    DateTime.strptime("#{parts[0]} #{parts[1]}", DATETIME_FORMAT)
   end
 
   def parse_devlog_now(devlog=nil)
@@ -172,6 +176,7 @@ module Devlog
     t
   end
   
+  #this is just a historic event, not used
   def parse_devlog(devlog=nil)
     t = Tajm.new
     return t unless devlog
@@ -215,6 +220,48 @@ module Devlog
     t
   end
 
+  #workflow methods
+
+  #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
+
+  #insert a new session 
+  def start_coding_session(devlog_file='devlog.markdown')
+    prepend_string(devlog_session_entry('Coding', 'BEGIN'), devlog_file)
+  end
+
+  #close the current session, if any
+  def stop_coding_session(devlog_file='devlog.markdown')
+    prepend_string(devlog_session_entry('Coding', 'END'), devlog_file)
+  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')
+    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
+          if (line =~ /Session::END/)
+            is_open = false 
+            break
+          else
+            break
+          end
+        end
+      end
+    end
+    is_open
+  end
+
+  #the parsing object
   class Parsing
     #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
@@ -360,7 +407,7 @@ module Devlog
       s << ("Hours last 14 days  = #{self.hours_for_last(14)} [h]\n")
       s << ("Hours last 28 days  = #{self.hours_for_last(28)} [h]\n")
       s << ("\n")
-      s << ("Devlog Time         = #{self.devlog_days * 24} [hours]\n")
+      s << ("Devlog Time         = #{self.devlog_days * 24} [h]\n")
       s << ("Devlog Days         = #{self.devlog_days}  [days]\n")
       s << ("Devlog Weeks        = #{self.devlog_weeks}  [weeks]\n")
       s << ("Devlog Months       = #{self.devlog_months}  [months]\n")
@@ -373,9 +420,9 @@ module Devlog
         s << ("#{'Zero Sessions'.blue}       = #{self.zero_sessions_to_s}\n")
       end
       s << ("\n")
-      s << ("Longest Session     = #{self.longest_session.session_time.round(2)} [hours]\n")
-      s << ("Shortest Session    = #{self.shortest_session.session_time.round(2)} [hours]\n")
-      s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.session_time.round(2)} [hours]")
+      s << ("Longest Session     = #{self.longest_session.to_s}\n")
+      s << ("Shortest Session    = #{self.shortest_session.to_s}\n")
+      s << ("Last Session        = #{self.devlog_end.ago_in_words}, duration: #{self.last_session.session_time.round(3)} [h]")
     end
 
     private 
@@ -452,7 +499,7 @@ module Devlog
     end
 
     def to_s
-      "#{type}, begin on line #{@zzbegin_line_number} at #{@zzbegin}, ends on line #{@zzend_line_number} at #{@zzend}, #{session_time.round(2)}[hour]"
+      "#{session_time.round(3)} [h] #{type}, begin on line #{@zzbegin_line_number} at #{@zzbegin}, ends on line #{@zzend_line_number} at #{@zzend}"
     end
   end
 
@@ -473,8 +520,8 @@ module DateTimeAgoInWords
   def ago_in_words
     return 'a very very long time ago' if self.year < 1800
     secs = Time.now - self
-    return 'just now' if secs > -1 && secs < 1
-    return '' if secs <= -1
+    return 'just over' if secs > -1 && secs < 1
+    return 'now' if secs <= -1
     pair = ago_in_words_pair(secs)
     ary = ago_in_words_singularize(pair)
     ary.size == 0 ? '' : ary.join(' and ') << ' ago'

data/test/devlog_test.rb

@@ -2,142 +2,162 @@ require 'test_helper'
 
 class DevlogTest < Test::Unit::TestCase
 
-	def test_empty_devlog
-		@tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', '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")
-		assert(@tajm.payed_time==0, "selfpay")
-	end
-
-	def test_devlog_now
-		load_devlog
-		load_devlog_now
-
-		assert(@tajm.coding_session_time==@tajm_now.coding_session_time, "not equal coding times")
-		assert(@tajm.com_session_time==@tajm_now.com_session_time, "selftalk not repeated")
-		assert(@tajm.payed_time==@tajm_now.payed_time, "selfpay not equal")
-
-		assert(@tajm_now.zezzions.size>0, "where are the seeds of zezzions?")
-		assert(@tajm_now.unpayed_time<0, "let's make sure opensource is free to develop it self")
-		assert(@tajm_now.zezzions.size>4, "at least 4 recorded sessions must there be?")
-		assert(@tajm_now.devlog_begin.to_s=="2014-01-19T10:16:08+00:00", "a historycal moment in the akashic records was deleted, what?")
- 		assert(@tajm_now.devlog_begin.to_time.to_i == 1390126568, "or just a random number in a random dream...")
-	end
-
-	def test_devlog_test
-		load_devlog_test
-
-		assert(@tajm_test.coding_session_time== 4.5, "wrong total coding session time")
-		assert(@tajm_test.com_session_time==1.0 , "wrong com session time")
-		assert(@tajm_test.payed_time==-1, "wrong payed time")
-		assert(@tajm_test.unpayed_time==4.5, "wrong unpayed wrong")
-		assert(@tajm_test.charge_time==5.5, "wrong charge wrong")
-	end	
-
-	def test_p_session_time
-		p = Parsing.new
-		zezzion = Zezzion.new
-		zezzion.zzend = parse_datetime("#08.03.2014 11:00:00 CodingSession::END")
-		zezzion.zzbegin = parse_datetime("#08.03.2014 10:00:00 CodingSession::BEGIN")
-		zezzion.coding_session_time = 60*60 #1h
-		p.add_zezzion zezzion
-		zezzion.zzend = parse_datetime("#09.03.2014 11:00:00 CodingSession::END")
-		zezzion.zzbegin = parse_datetime("#09.03.2014 10:00:00 CodingSession::BEGIN")
-		zezzion.coding_session_time = 60*60 #1h
-		p.add_zezzion zezzion
-
-		assert(p.session_time==60*60*2, "should be 7200s but is #{p.session_time}")
-	end
-
-	def test_how_much_per_day
-		load_devlog_stat
-		assert(@tajm_stat.per_day>0, "the middle day value, not the mean")
-		assert(@tajm_stat.per_day==1.0, "per day should be 1.0 but is #{@tajm_stat.per_day}")
-	end
-
-	def test_how_much_per_week
-		load_devlog_stat
-		assert(@tajm_stat.per_week>0, "the middle week value, not the mean")
-		assert(@tajm_stat.per_week==7.02, "per week should be 7.02 but is #{@tajm_stat.per_week}")
-	end
-
-	def test_devlog_weeks
-		load_devlog_stat
-		assert(@tajm_stat.devlog_weeks==1.14, "devlog weeks should be 1.14 but is #{@tajm_stat.devlog_weeks}")
-	end
-
-	def test_how_much_per_month
-		load_devlog_stat
-		assert(@tajm_stat.per_week>0, "the middle month value, not the mean")		
-	end
-
-	def test_devlog_days_0
-		load_devlog_test
-		assert(@tajm_test.devlog_days==33, "should be 33 devlog days")
-	end
-
-	def test_devlog_days_1
-		load_devlog_stat
-		assert(@tajm_stat.devlog_days==8, "should be 8 devlog days")
-	end
-
-	def test_devlog_days_2
-		load_devlog_single
-		assert(@tajm_single.devlog_days==1, "should be 1 devlog day")
-	end
-
-	def test_devlog_begin
-		load_devlog_stat
-		assert(@tajm_stat.devlog_begin.to_s=="2014-03-01T10:00:00+00:00", "devlog begin is wrong")
-	end
-
-	def test_devlog_end
-		load_devlog_stat
-		assert(@tajm_stat.devlog_end.to_s=="2014-03-08T11:00:00+00:00", "devlog end is wrong")
-	end
-
-	def test_hours_for_last7
-		load_devlog_stat
-		hours = @tajm_stat.hours_for_last(0, parse_datetime("#09.03.2014 11:00:00"))
-		assert(hours==0, "should be 0, but is #{hours}")
-	end
-	def test_hours_for_last7
-		load_devlog_stat
-		hours = @tajm_stat.hours_for_last(7, parse_datetime("#09.03.2014 11:00:00"))
-		assert(hours==7, "should be 7, but is #{hours}")
-	end
-	def test_hours_for_last1
-		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_hours_for_last7
-		load_devlog_stat
-		hours = @tajm_stat.hours_for_last(7, parse_datetime("#20.03.2014 11:00:00"))
-		assert(hours==0, "should be 0, but is #{hours}")
-	end
-
-	def test_session_count
-		load_devlog_stat
-		assert(@tajm_stat.devlog_sessions.size==8, "should be 8, but is #{@tajm_stat.devlog_sessions.size}")
-	end
-
-	def test_negative_sessions
-		load_devlog_negative
-		assert(@tajm_negative.devlog_sessions.size==5, "should be 5, but is #{@tajm_negative.devlog_sessions.size}")
-		shortest_session_time_rounded = @tajm_negative.shortest_session.session_time.round(2)
-		assert(shortest_session_time_rounded==-2, "should be -2.0, but is #{shortest_session_time_rounded}")
-		assert(@tajm_negative.negative_sessions.size==2, "should be 2, but is #{@tajm_negative.negative_sessions.size}")
-	end
-
-	def test_zero_sessions
-		load_devlog_negative
-		assert(@tajm_negative.devlog_sessions.size==5, "should be 5, but is #{@tajm_negative.devlog_sessions.size}")
-		zero_session_time_rounded = @tajm_negative.zero_sessions.first.session_time.round(2)
-		assert(zero_session_time_rounded==0.0, "should be 0.0, but is #{zero_session_time_rounded}")
-		assert(@tajm_negative.zero_sessions.size==1, "should be 1, but is #{@tajm_negative.zero_sessions.size}")
-	end
+  def test_empty_devlog
+    @tajm = parse_devlog(File.join(File.dirname(__FILE__), '..', '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")
+    assert(@tajm.payed_time==0, "selfpay")
+  end
+
+  def test_devlog_now
+    load_devlog
+    load_devlog_now
+
+    assert(@tajm.coding_session_time==@tajm_now.coding_session_time, "not equal coding times")
+    assert(@tajm.com_session_time==@tajm_now.com_session_time, "selftalk not repeated")
+    assert(@tajm.payed_time==@tajm_now.payed_time, "selfpay not equal")
+
+    assert(@tajm_now.zezzions.size>0, "where are the seeds of zezzions?")
+    assert(@tajm_now.unpayed_time<0, "let's make sure opensource is free to develop it self")
+    assert(@tajm_now.zezzions.size>4, "at least 4 recorded sessions must there be?")
+    assert(@tajm_now.devlog_begin.to_s=="2014-01-19T10:16:08+00:00", "a historycal moment in the akashic records was deleted, what?")
+    assert(@tajm_now.devlog_begin.to_time.to_i == 1390126568, "or just a random number in a random dream...")
+  end
+
+  def test_devlog_test
+    load_devlog_test
+
+    assert(@tajm_test.coding_session_time== 4.5, "wrong total coding session time")
+    assert(@tajm_test.com_session_time==1.0 , "wrong com session time")
+    assert(@tajm_test.payed_time==-1, "wrong payed time")
+    assert(@tajm_test.unpayed_time==4.5, "wrong unpayed wrong")
+    assert(@tajm_test.charge_time==5.5, "wrong charge wrong")
+  end 
+
+  def test_p_session_time
+    p = Parsing.new
+    zezzion = Zezzion.new
+    zezzion.zzend = parse_datetime("#08.03.2014 11:00:00 CodingSession::END")
+    zezzion.zzbegin = parse_datetime("#08.03.2014 10:00:00 CodingSession::BEGIN")
+    zezzion.coding_session_time = 60*60 #1h
+    p.add_zezzion zezzion
+    zezzion.zzend = parse_datetime("#09.03.2014 11:00:00 CodingSession::END")
+    zezzion.zzbegin = parse_datetime("#09.03.2014 10:00:00 CodingSession::BEGIN")
+    zezzion.coding_session_time = 60*60 #1h
+    p.add_zezzion zezzion
+
+    assert(p.session_time==60*60*2, "should be 7200s but is #{p.session_time}")
+  end
+
+  def test_how_much_per_day
+    load_devlog_stat
+    assert(@tajm_stat.per_day>0, "the middle day value, not the mean")
+    assert(@tajm_stat.per_day==1.0, "per day should be 1.0 but is #{@tajm_stat.per_day}")
+  end
+
+  def test_how_much_per_week
+    load_devlog_stat
+    assert(@tajm_stat.per_week>0, "the middle week value, not the mean")
+    assert(@tajm_stat.per_week==7.02, "per week should be 7.02 but is #{@tajm_stat.per_week}")
+  end
+
+  def test_devlog_weeks
+    load_devlog_stat
+    assert(@tajm_stat.devlog_weeks==1.14, "devlog weeks should be 1.14 but is #{@tajm_stat.devlog_weeks}")
+  end
+
+  def test_how_much_per_month
+    load_devlog_stat
+    assert(@tajm_stat.per_week>0, "the middle month value, not the mean")   
+  end
+
+  def test_devlog_days_0
+    load_devlog_test
+    assert(@tajm_test.devlog_days==33, "should be 33 devlog days")
+  end
+
+  def test_devlog_days_1
+    load_devlog_stat
+    assert(@tajm_stat.devlog_days==8, "should be 8 devlog days")
+  end
+
+  def test_devlog_days_2
+    load_devlog_single
+    assert(@tajm_single.devlog_days==1, "should be 1 devlog day")
+  end
+
+  def test_devlog_begin
+    load_devlog_stat
+    assert(@tajm_stat.devlog_begin.to_s=="2014-03-01T10:00:00+00:00", "devlog begin is wrong")
+  end
+
+  def test_devlog_end
+    load_devlog_stat
+    assert(@tajm_stat.devlog_end.to_s=="2014-03-08T11:00:00+00:00", "devlog end is wrong")
+  end
+
+  def test_hours_for_last0
+    load_devlog_stat
+    hours = @tajm_stat.hours_for_last(0, parse_datetime("#09.03.2014 11:00:00"))
+    assert(hours==0, "should be 0, but is #{hours}")
+  end
+  def test_hours_for_last7
+    load_devlog_stat
+    hours = @tajm_stat.hours_for_last(7, parse_datetime("#09.03.2014 11:00:00"))
+    assert(hours==7, "should be 7, but is #{hours}")
+  end
+  def test_hours_for_last1
+    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
+    load_devlog_stat
+    assert(@tajm_stat.devlog_sessions.size==8, "should be 8, but is #{@tajm_stat.devlog_sessions.size}")
+  end
+
+  def test_negative_sessions
+    load_devlog_negative
+    assert(@tajm_negative.devlog_sessions.size==5, "should be 5, but is #{@tajm_negative.devlog_sessions.size}")
+    shortest_session_time_rounded = @tajm_negative.shortest_session.session_time.round(2)
+    assert(shortest_session_time_rounded==-2, "should be -2.0, but is #{shortest_session_time_rounded}")
+    assert(@tajm_negative.negative_sessions.size==2, "should be 2, but is #{@tajm_negative.negative_sessions.size}")
+  end
+
+  def test_zero_sessions
+    load_devlog_negative
+    assert(@tajm_negative.devlog_sessions.size==5, "should be 5, but is #{@tajm_negative.devlog_sessions.size}")
+    zero_session_time_rounded = @tajm_negative.zero_sessions.first.session_time.round(2)
+    assert(zero_session_time_rounded==0.0, "should be 0.0, but is #{zero_session_time_rounded}")
+    assert(@tajm_negative.zero_sessions.size==1, "should be 1, but is #{@tajm_negative.zero_sessions.size}")
+  end
+
+  def test_start_coding_session
+    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp_devlog.markdown')
+    File.new(@empty_devlog, 'w').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")
+    assert(is_session_open(@empty_devlog)==true, "should be true, session should be open after starting")
+    File.delete(@empty_devlog)
+  end 
+
+  def test_stop_coding_session
+    @empty_devlog = File.join(File.dirname(__FILE__), '..', 'tmp_devlog.markdown')
+    File.new(@empty_devlog, 'w').puts('empty')
+    stop_coding_session(@empty_devlog)
+    assert(File.readlines(@empty_devlog).grep(/CodingSession::END/).size>0, "should insert CodingSession::END at top of file")
+    assert(is_session_open(@empty_devlog)==false, "should be false, session should be closed after stopping")
+    File.delete(@empty_devlog)
+  end 
+
+  def test_is_session_open
+    @closed_devlog = File.join(File.dirname(__FILE__), '..', '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')
+    assert(is_session_open(@open_devlog)==true, "should be true, session should be open")
+  end 
 
 end

data/test/test_helper.rb

@@ -10,37 +10,37 @@ class Test::Unit::TestCase
 end
 
 def load_devlog
-	@tajm = parse_devlog(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")
+  @tajm = parse_devlog(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")
 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")
+  @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")
 end
 
 def load_devlog_test
-	@tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), '..', '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")
+  @tajm_test = parse_devlog_now(File.join(File.dirname(__FILE__), '..', '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")
 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_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_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_negative_devlog.markdown'))
 end

data/test_open_devlog.markdown

@@ -0,0 +1,9 @@
+this devlog is open... a session is taking place...
+
+#02.02.2015 16:20:03 CodingSession::BEGIN
+
+#02.02.2015 16:20:01 CodingSession::END
+
+previous session
+
+#02.02.2015 16:20:00 CodingSession::BEGIN

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: devlog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - mihael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
 description: devlog.markdown time&space extractor
 email: kitschmaster@gmail.com
 executables:
@@ -47,8 +47,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .ruby-gemset
-- .ruby-version
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -75,6 +75,7 @@ files:
 - test/test_helper.rb
 - test_devlog.markdown
 - test_negative_devlog.markdown
+- test_open_devlog.markdown
 - test_single_devlog.markdown
 - test_stats_devlog.markdown
 homepage: http://github.com/mihael/devlog
@@ -87,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: takes devlog.markdown and gives info