pomo 2.0.2 → 2.1.0

data/lib/pomo/notifier.rb

@@ -1,9 +1,13 @@
+require 'pomo/notifier/growl_notifier'
+require 'pomo/notifier/libnotify_notifier'
+require 'pomo/notifier/notification_center_notifier'
 
 module Pomo
   class Notifier
 
     ##
     # Initialize notifier library from configuration.
+
     def initialize(config)
       if config.notifier == 'notification_center'
         @notifier = Pomo::Notifier::NotificationCenterNotifier.new
@@ -18,6 +22,7 @@ module Pomo
 
     ##
     # Send message to notification library.
+
     def notify(message, opts = {})
       @notifier.notify(message, opts)
     end

data/lib/pomo/notifier/growl_notifier.rb

@@ -1,3 +1,4 @@
+require 'growl' if Pomo::OS.mac? || Pomo::OS.windows?
 
 module Pomo
   class Notifier

data/lib/pomo/notifier/libnotify_notifier.rb

@@ -1,3 +1,4 @@
+require 'libnotify' if Pomo::OS.linux?
 
 module Pomo
   class Notifier

data/lib/pomo/notifier/notification_center_notifier.rb

@@ -1,3 +1,4 @@
+require 'terminal-notifier' if Pomo::OS.mac?
 
 module Pomo
   class Notifier

data/lib/pomo/os.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 module Pomo
   module OS
     module_function

data/lib/pomo/task.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 
 module Pomo
   class Task
@@ -30,7 +31,7 @@ module Pomo
     ##
     # Initialize with _name_ and _options_.
 
-    def initialize name = nil, options = {}
+    def initialize(name = nil, options = {})
       @name = name or raise '<task> required'
       @description = options.delete :description
       @length = options.fetch :length, 25
@@ -42,7 +43,7 @@ module Pomo
     # Quoted task name.
 
     def to_s
-      name.inspect
+      name
     end
 
     ##
@@ -59,8 +60,19 @@ module Pomo
       complete
     end
 
+    ##
+    # Output verbose task information
+
+    def verbose_output(format)
+      say format % ['name', self]
+      say format % ['length', "#{length} minutes"]
+      say format % ['description', description] if description and not description.empty?
+      say format % ['complete', complete ? '[✓]' : '[ ]']
+    end
+
     ##
     # Start timing the task.
+
     def start(config, options = {})
       list = options[:list]
       progress = options[:progress]
@@ -95,7 +107,7 @@ module Pomo
         elsif remaining == 5
           notifier.notify 'Almost there!', :header => '5 minutes remaining'
         end
-        sleep 60
+        sleep 60 unless ENV['POMO_ENV']=='test'
         { :remaining => remaining }
       end
 
@@ -123,7 +135,7 @@ module Pomo
           elsif remaining == 5
             notifier.notify 'Almost there!', :header => '5 minutes remaining'
           end
-          sleep 60
+          sleep 60 unless ENV['POMO_ENV']=='test'
         end
 
         write_tmux_time(0) if config.tmux

data/lib/pomo/version.rb

@@ -1,4 +1,4 @@
 
 module Pomo
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/pomo.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pomo/os'
 require 'pomo/version'
 
 Gem::Specification.new do |spec|
@@ -22,9 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('commander', '~> 4.1')
   spec.add_dependency('octokit', '~> 1.19')
-  spec.add_dependency('terminal-notifier', '~> 1.4') if /darwin/ =~ RUBY_PLATFORM
-  spec.add_dependency('growl', '~> 1.0')             if /darwin/ =~ RUBY_PLATFORM
-  spec.add_dependency('libnotify', '~> 0.8')         if /linux/ =~ RUBY_PLATFORM
+  spec.add_dependency('terminal-notifier', '~> 1.4') if Pomo::OS.mac?
+  spec.add_dependency('growl', '~> 1.0')             if Pomo::OS.mac? || Pomo::OS.windows?
+  spec.add_dependency('libnotify', '~> 0.8')         if Pomo::OS.linux?
 
+  spec.add_development_dependency('aruba', '~> 0.5.1')
   spec.add_development_dependency('rspec', '~> 2.12')
+  spec.add_development_dependency('fakefs', '~> 0.4')
+  spec.add_development_dependency('yard')
 end

data/spec/pomo/configuration_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe Pomo::Configuration do
+
+  describe '#initialize' do
+    it 'instantiates object' do
+      options = {
+        :notifier => 'foo',
+        :progress => 'bar',
+        :tmux     => 'baz'
+      }
+      config = Pomo::Configuration.new(options)
+      expect(config.notifier).to eq 'foo'
+      expect(config.progress).to eq 'bar'
+      expect(config.tmux).to eq 'baz'
+    end
+  end
+
+  describe '.load' do
+    context 'not given a configuration file' do
+      it 'returns Configuration object with default options' do
+        config = Pomo::Configuration.load
+        expect(config.notifier).to eq Pomo::Configuration.default_notifier
+        expect(config.progress).to be false
+        expect(config.tmux).to be false
+      end
+
+      it 'writes a configuration file with default options' do
+        Pomo::Configuration.load
+        expect(File.read(Pomo::Configuration.config_file)).to eq \
+          YAML::dump(Pomo::Configuration.default_options)
+      end
+    end
+
+    context 'given a configuration file' do
+      before(:each) do
+        opts = {
+          :notifier => 'foo',
+          :progress => 'bar',
+          :tmux     => 'baz'
+        }
+        File.open(Pomo::Configuration.config_file, 'w') do |file|
+          YAML::dump(opts, file)
+        end
+      end
+
+      it 'returns Configuration object with options in file' do
+        config = Pomo::Configuration.load
+        expect(config.notifier).to eq 'foo'
+        expect(config.progress).to eq 'bar'
+        expect(config.tmux).to eq 'baz'
+      end
+
+      context 'given options' do
+        it 'overrides options in configuration file' do
+          options = {
+            :notifier => 'goo',
+            :progress => 'car',
+            :tmux     => 'caz'
+          }
+          config = Pomo::Configuration.load(options)
+          expect(config.notifier).to eq 'goo'
+          expect(config.progress).to eq 'car'
+          expect(config.tmux).to eq 'caz'
+        end
+      end
+
+    end
+  end
+
+  describe '.save' do
+    let(:options) { {:notifier => 'foo', :progress => 'bar', :tmux => 'baz'} }
+
+    context 'not given a configuration file' do
+      it 'writes a configuration file with options' do
+        Pomo::Configuration.save(options)
+        expect(File.read(Pomo::Configuration.config_file)).to eq \
+          YAML::dump(options)
+      end
+    end
+
+    context 'given a configuration file' do
+      before(:each) do
+        opts = {
+          :notifier => 'goo',
+          :progress => 'car',
+          :tmux     => 'caz'
+        }
+        File.open(Pomo::Configuration.config_file, 'w') do |file|
+          YAML::dump(opts, file)
+        end
+      end
+
+      it 'does not overwrite' do
+        Pomo::Configuration.save(options)
+        expect(File.read(Pomo::Configuration.config_file)).to_not eq \
+          YAML::dump(options)
+      end
+
+      it 'does overwrite if passed `force` option' do
+        Pomo::Configuration.save(options.merge(:force => true))
+        expect(File.read(Pomo::Configuration.config_file)).to eq \
+          YAML::dump(options)
+      end
+    end
+  end
+
+end

data/spec/pomo/list_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Pomo::List do
+
+  let(:list) { Pomo::List.new }
+  let(:tasks) { [Pomo::Task.new('foo'), Pomo::Task.new('bar'), Pomo::Task.new('baz')] }
+
+  before(:each) do
+    list.tasks.concat(tasks)
+  end
+
+  describe '#find' do
+    context "given 'all'" do
+      it 'yields all tasks' do
+        expect { |b| list.find('all', 'first', 'last', &b) }.to yield_successive_args(tasks[0], tasks[1], tasks[2])
+      end
+    end
+
+    context "given 'first'" do
+      it 'yields the first task' do
+        expect { |b| list.find('first', &b) }.to yield_successive_args(tasks[0])
+      end
+    end
+
+    context "given 'last'" do
+      it 'yields the last task' do
+        expect { |b| list.find('last', &b) }.to yield_successive_args(tasks[2])
+      end
+    end
+
+    context "given 'complete'" do
+      it 'yields all completed tasks' do
+        list.tasks[0].complete = true
+        expect { |b| list.find('complete', &b) }.to yield_successive_args(tasks[0])
+      end
+    end
+
+    context "given 'incomplete'" do
+      it 'yields all incompleted tasks' do
+        list.tasks[0].complete = true
+        expect { |b| list.find('incomplete', &b) }.to yield_successive_args(tasks[1], tasks[2])
+      end
+    end
+
+    context "given a range e.g. '2..5'" do
+      it 'yields the given range of tasks' do
+        expect { |b| list.find('1..2', &b) }.to yield_successive_args(tasks[1], tasks[2])
+      end
+    end
+
+    context "given an index or multiple indexes e.g. '2 8 1'" do
+      it 'yields the tasks at the given index(es)' do
+        expect { |b| list.find('0', '2', &b) }.to yield_successive_args(tasks[0], tasks[2])
+      end
+    end
+
+    context 'given multiple arguments' do
+      it 'yields the tasks according to the above specs' do
+        expect { |b| list.find('first', 'last', &b) }.to yield_successive_args(tasks[0], tasks[2])
+      end
+    end
+  end
+end

data/spec/pomo/task_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Pomo::Task do
+
+  let(:task) { Pomo::Task.new 'foo' }
+
+  describe '#start' do
+    it 'does nada'
+  end
+
+  describe '#stop' do
+    it 'does nada'
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,3 +1,41 @@
+require 'pomo'
+require 'fakefs/safe'
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'pomo'
+# Taken from Aruba::Api
+class Pomo::RSpecHelper
+  def self.set_env(key, value)
+    $original_env ||= {}
+    $original_env[key] = ENV.delete(key)
+    ENV[key] = value
+  end
+
+  def self.restore_env
+    $original_env ||= {}
+    $original_env.each do |key, value|
+      ENV[key] = value
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.color = true
+  config.order = 'random'
+
+  config.before(:suite) do
+    Pomo::RSpecHelper.set_env('POMO_ENV', 'test')
+  end
+
+  config.before(:each) do
+    FakeFS.activate!
+    FileUtils.mkdir_p ENV['HOME']
+  end
+
+  config.after(:each) do
+    FakeFS.deactivate!
+    FakeFS::FileSystem.clear
+  end
+
+  config.after(:suite) do
+    Pomo::RSpecHelper.restore_env
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pomo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -76,6 +76,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +108,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pomodoro time management for the command-line
 email:
 - tj@vision-media.ca
@@ -102,14 +150,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT
 - Gemfile
-- HISTORY.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/pomo
+- features/configuration.feature
+- features/manage_list.feature
+- features/manage_tasks.feature
+- features/step_definitions/pomo_steps.rb
+- features/support/env.rb
 - lib/pomo.rb
 - lib/pomo/break.rb
 - lib/pomo/configuration.rb
@@ -124,7 +178,9 @@ files:
 - lib/pomo/task.rb
 - lib/pomo/version.rb
 - pomo.gemspec
-- spec/pomo_spec.rb
+- spec/pomo/configuration_spec.rb
+- spec/pomo/list_spec.rb
+- spec/pomo/task_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/visionmedia/pomo
 licenses: []
@@ -152,11 +208,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pomo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: pomo-2.0.2
+summary: pomo-2.1.0
 test_files:
-- spec/pomo_spec.rb
+- features/configuration.feature
+- features/manage_list.feature
+- features/manage_tasks.feature
+- features/step_definitions/pomo_steps.rb
+- features/support/env.rb
+- spec/pomo/configuration_spec.rb
+- spec/pomo/list_spec.rb
+- spec/pomo/task_spec.rb
 - spec/spec_helper.rb
 has_rdoc: