pomato 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8567836c7256df5d1ca371debd1e2e8b4ebd64
-  data.tar.gz: e8da4054f113faf46cb9ecdb13ce4dd26a12ad69
+  metadata.gz: 1809867009864c93d7006f1e5a7824f7c47000b1
+  data.tar.gz: df303a5d703d86f3094fba112baa67de4b94ab6b
 SHA512:
-  metadata.gz: 682497131a7402ce7ed3bef71c8955abae888938b6334bcdf1ecf62553273597e35c4913689f7e1b2f71168497c315eb01179d250168b5923a9f8560593fdda1
-  data.tar.gz: eb6ec5710e7a84b2686694dfc25707c794866a148b4692f5b17cc87ba17f74293ad052409b23c8d34be533fabb3220120705779f1425d650f687883b1336d28a
+  metadata.gz: bddd7124c363561fff104a68a1d2ae0c2090915146b8f0ca1ca1f95941579441833c840b75bd75d93505d5ee317979552f2190f3eecfb1f9dafe0d364338a94f
+  data.tar.gz: 9362cbc77726ab8c1acf348213a617b8ee2a21ff35fac464b89c3658d9c7d9fe0a02da57f01339197a93e99bfc4d6b530c9dc3d4acda2691aef768adf4e86d7b

data/lib/pomato.rb

@@ -1,24 +1,18 @@
-require 'pomato/tick'
-require 'pomato/start'
-require 'pomato/report'
-
 module Pomato
   module Cli
     def self.execute(*args)
       method, *args = args
-      send (method || :report), *args
-    end
-
-    def self.report
-      Pomato::Report.new.execute
+      method ||= :report
+      page_class(method).new(*args).execute
     end
 
-    def self.tick(*args)
-      Pomato::Tick.new(*args).execute
+    def self.classify(string)
+      string.to_s.split('_').map(&:capitalize).join
     end
 
-    def self.start(*args)
-      Pomato::Start.new(*args).execute
+    def self.page_class(name)
+      require "pomato/#{name}"
+      Pomato.const_get classify name
     end
   end
 end

data/lib/pomato/history.rb

@@ -0,0 +1,13 @@
+require 'pomato/paths'
+
+module Pomato
+  class History
+    include Paths
+
+    def execute
+      history_items.each do |item|
+        puts item
+      end
+    end
+  end
+end

data/lib/pomato/paths.rb

@@ -24,6 +24,10 @@ module Pomato
       append_to history_path, "#{now} #{message}"
     end
 
+    def history_items
+      File.exist?(history_path) ? File.readlines(history_path) : []
+    end
+
     def history_path
       File.join home, 'history'
     end
@@ -33,16 +37,31 @@ module Pomato
     end
 
     def jobs
-      Dir["#{home('jobs')}/*"].map {|p| load_yaml(p).merge(id: p) }
+      Dir["#{home('jobs')}/*"].map {|p| load_yaml(p) }
+    end
+
+    def dump_job(job)
+      dump_yaml(File.join(home('jobs'), job[:id]), job)
     end
 
-    def make_job(job)
-      dump_yaml(File.join(home('jobs'), SecureRandom.uuid), job)
+    def start_job(job)
+      job[:id] = SecureRandom.uuid
+      history "#{job[:id]} start #{job[:time]} #{job[:name]}"
+      dump_job job.merge(start: now)
+    end
+
+    def stop_job(job)
+      history "#{job[:id]} stop #{job[:time]} #{job[:name]}"
+      destroy_job job
     end
 
     def finish_job(job)
-      history "finish #{job[:time]} #{job[:name]}"
-      File.delete job[:id]
+      history "#{job[:id]} finish #{job[:time]} #{job[:name]}"
+      destroy_job job
+    end
+
+    def destroy_job(job)
+      File.delete File.join(home('jobs'), job[:id])
     end
 
     def home(*paths)

data/lib/pomato/report.rb

@@ -5,11 +5,21 @@ module Pomato
     include Paths
 
     def execute
-      jobs.each do |job|
-        duration = now - job[:start]
-        remaining = job[:time] - duration
-        puts "job #{job[:name]}: #{duration} (#{remaining} remaining)"
+      jobs.sort_by! {|j| now + j[:time]}.each do |job|
+        elapsed = now - job[:start]
+        remaining = job[:time] - elapsed
+        end_time = now + job[:time]
+        puts " #{time_format end_time} (#{min_sec elapsed} completed, #{min_sec remaining} of #{min_sec job[:time]} remaining): #{job[:name]}"
       end
     end
+
+    def time_format(seconds)
+      time = Time.at seconds
+      time.strftime '%I:%M%p'
+    end
+
+    def min_sec(seconds)
+      "%02d:%02d" % [seconds/60, seconds%60]
+    end
   end
 end

data/lib/pomato/start.rb

@@ -7,8 +7,7 @@ module Pomato
     def execute
       time = args.shift.to_i * 60
       name = args.join(' ')
-      history "start #{time} #{name}"
-      make_job start: now, name: name, time: time
+      start_job name: name, time: time
     end
   end
 end

data/lib/pomato/stop.rb

@@ -0,0 +1,17 @@
+require 'pomato/paths'
+
+module Pomato
+  class Stop
+    include Paths
+
+    def execute
+      search_string = args.first
+      jobs.each do |job|
+        if job[:name].include? search_string
+          puts "stopping \"#{job[:name]}\""
+          stop_job job
+        end
+      end
+    end
+  end
+end

data/lib/pomato/version.rb

@@ -1,3 +1,3 @@
 module Pomato
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pomato
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Ryall
@@ -53,9 +53,11 @@ files:
 - Rakefile
 - bin/pomato
 - lib/pomato.rb
+- lib/pomato/history.rb
 - lib/pomato/paths.rb
 - lib/pomato/report.rb
 - lib/pomato/start.rb
+- lib/pomato/stop.rb
 - lib/pomato/tick.rb
 - lib/pomato/version.rb
 - pomato.gemspec