pomato 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9be8524db2da9247a63d00806f7ab672bbbdbea
-  data.tar.gz: a8776fbdb2e6277b47942fca4049511bc50a8cad
+  metadata.gz: 809e5356b5a84d5dbd97ae74293b5e100e82273f
+  data.tar.gz: 9af2da1b28c8eb398f1608b63377a5c23592da26
 SHA512:
-  metadata.gz: e4c2cf32956c744e23215b1360350749a982f7c71796294662abcae8d38a4af3fe28e82b8b0fb2a92f479ef9e03815cb69afcd20f12b4b8cf0519f86407fadcc
-  data.tar.gz: 4c557678d524fba9f075f5ab73a76050daccca78ba38c990c0a24896335e49a10d48885f3ea028357fd29b757b183816a39dc9f2804271cc12d139ba6f51fa77
+  metadata.gz: 77979d100fc1a7515e78b51dcde062141da7531f2e27a43cc65dece84d84dc4314e41d9e160f334cb73a26fe8118d54ff46a6978e0f70bc69f57dda486cbc88b
+  data.tar.gz: 3ae3cf5cb9a255cfe56fa81749f57af1c1cba82fbb2d9977182257f2f30862759aceac299bf83dc493ffcdbac8b94fce8497df9dd74be3a99a0bd840a69c2e04

data/lib/pomato.rb

@@ -1,9 +1,9 @@
 module Pomato
   module Cli
     def self.execute(*args)
-      method, *args = args
+      method = ARGV.shift
       method ||= :report
-      page_class(method).new(*args).execute
+      page_class(method).new.execute
     end
 
     def self.classify(string)

data/lib/pomato/add.rb

@@ -0,0 +1,27 @@
+require 'pomato/paths'
+require 'pomato/options'
+
+module Pomato
+  class Add
+    include Paths
+    include Options
+
+    def execute
+      start = now
+      jobs.each do |job|
+        job_end = job[:start] + job[:time]
+        start = job_end if job_end > start
+      end
+      time = (opts[:for] || 25).to_i * 60
+      name = opts.arguments.empty? ? 'pomato' : opts.arguments.join(' ')
+      add_job start: start, name: name, time: time
+    end
+
+    def options
+      Slop::Options.new.tap do |opts|
+        opts.banner = 'usage: add [options] ...'
+        opts.string '--for', 'duration (eg. 10)'
+      end
+    end
+  end
+end

data/lib/pomato/configure.rb

@@ -4,7 +4,7 @@ module Pomato
   class Configure
     include Paths
 
-    def execute(*args)
+    def execute
       puts 'which track would you like to play when the timer ends?'
       self.config = { track: $stdin.gets.chomp }
     end

data/lib/pomato/options.rb

@@ -0,0 +1,20 @@
+require 'slop'
+
+module Pomato
+  module Options
+    attr :opts
+
+    def usage
+      puts options
+      exit 0
+    end
+
+    def opts
+      begin
+        @opts ||= Slop::Parser.new(options).parse ARGV
+      rescue Slop::UnknownOption
+        usage
+      end
+    end
+  end
+end

data/lib/pomato/paths.rb

@@ -6,12 +6,6 @@ module Pomato
   module Paths
     include FileUtils
 
-    attr_reader :args
-
-    def initialize(*args)
-      @args = args
-    end
-
     def now
       @now ||= Time.now.to_i
     end
@@ -48,19 +42,19 @@ module Pomato
       dump_yaml(File.join(home('jobs'), job[:id]), job)
     end
 
-    def start_job(job)
+    def add_job(job)
       job[:id] = SecureRandom.uuid
-      history "#{job[:id]} start #{job[:time]} #{job[:name]}"
-      dump_job job.merge(start: now)
+      history "#{job[:id]} add #{job[:start]} #{job[:time]} #{job[:name]}"
+      dump_job job
     end
 
     def stop_job(job)
-      history "#{job[:id]} stop #{job[:time]} #{job[:name]}"
+      history "#{job[:id]} stop #{job[:start]} #{job[:time]} #{job[:name]}"
       destroy_job job
     end
 
     def finish_job(job)
-      history "#{job[:id]} finish #{job[:time]} #{job[:name]}"
+      history "#{job[:id]} finish #{job[:start]} #{job[:time]} #{job[:name]}"
       destroy_job job
     end
 

data/lib/pomato/report.rb

@@ -5,11 +5,16 @@ module Pomato
     include Paths
 
     def execute
-      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]}"
+      jobs.sort_by! {|job| job[:start] + job[:time]}.each do |job|
+        end_time = job[:start] + job[:time]
+        if now > job[:start]
+          elapsed = now - job[:start]
+          remaining = job[:time] - elapsed
+          puts " #{time_format end_time} (#{min_sec elapsed} completed, #{min_sec remaining} of #{min_sec job[:time]} remaining): #{job[:name]}"
+        else
+          starting = job[:start] - now
+          puts " #{time_format end_time} (#{min_sec job[:time]} starting in #{min_sec starting}): #{job[:name]}"
+        end
       end
     end
 

data/lib/pomato/run.rb

@@ -4,7 +4,7 @@ module Pomato
   class Run
     include Paths
 
-    def execute(*args)
+    def execute
       loop do
         Pomato::Tick.new.execute
         sleep 10

data/lib/pomato/start.rb

@@ -1,13 +1,22 @@
 require 'pomato/paths'
+require 'pomato/options'
 
 module Pomato
   class Start
     include Paths
+    include Options
 
     def execute
-      time = args.shift.to_i * 60
-      name = args.join(' ')
-      start_job name: name, time: time
+      time = (opts[:for] || 25).to_i * 60
+      name = opts.arguments.empty? ? 'pomato' : opts.arguments.join(' ')
+      add_job start: now, name: name, time: time
+    end
+
+    def options
+      Slop::Options.new.tap do |opts|
+        opts.banner = 'usage: start [options] ...'
+        opts.string '--for', 'duration (eg. 10)'
+      end
     end
   end
 end

data/lib/pomato/stop.rb

@@ -5,7 +5,7 @@ module Pomato
     include Paths
 
     def execute
-      search_string = args.first
+      search_string = ARGV.join(' ')
       jobs.each do |job|
         if job[:name].include? search_string
           puts "stopping \"#{job[:name]}\""

data/lib/pomato/version.rb

@@ -1,3 +1,3 @@
 module Pomato
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/pomato.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'daemons', '~> 1.1'
+  spec.add_dependency 'slop', '~> 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pomato
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Ryall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,8 +83,10 @@ files:
 - bin/pomato
 - bin/pomato_daemon
 - lib/pomato.rb
+- lib/pomato/add.rb
 - lib/pomato/configure.rb
 - lib/pomato/history.rb
+- lib/pomato/options.rb
 - lib/pomato/paths.rb
 - lib/pomato/report.rb
 - lib/pomato/run.rb