pomo 2.1.1 → 2.1.2

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libnotify-dev
 rvm:
   - 2.0.0
   - 1.9.3

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+2.1.2 / 2013-02-09
+==================
+
+* Fixed default Break time. Closes #36
+
+View [the full changelog][2.1.2].
+[2.1.2]: https://github.com/visionmedia/pomo/compare/v2.1.1...v2.1.2
+
 2.1.1 / 2013-01-19
 ==================
 
@@ -15,7 +23,7 @@ View [the full changelog][2.1.1].
 * Added `pomo initconfig` to set up global preferences. Preferences
   can be overridden on the command-line (e.g. `pomo start --notifier
   growl`). Closes #30
-* Added multiple args to commands (e.g. `pomo rm 1..3 5..8`). Closes [#12]
+* Added multiple args to commands (e.g. `pomo rm 1..3 5..8`). Closes #12
 * Added `pomo move` and `pomo copy`. Closes #18
 * Added RSpec specs and Cucumber features. Closes #9
 

data/Gemfile

@@ -1,4 +1,13 @@
 source 'https://rubygems.org'
 
+gem 'rake'
+gem 'yard'
+
+group :test do
+  gem 'aruba', '~> 0.5.1'
+  gem 'rspec', '~> 2.12'
+  gem 'fakefs', '~> 0.4'
+end
+
 # Specify your gem's dependencies in pomo.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Pomo [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/visionmedia/pomo)
+# Pomo [![Build Status](https://travis-ci.org/visionmedia/pomo.png?branch=master)](https://travis-ci.org/visionmedia/pomo) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/visionmedia/pomo)
 
 Command-line application for the [Pomodoro](http://www.pomodorotechnique.com/)
 time management technique, with notification and tmux status bar support.
@@ -141,10 +141,10 @@ Taken from `pomo help`:
     
   * View task details:
 
-        $ pomo view first
-        $ pomo view last
-        $ pomo view 5
-        $ pomo view 1 2 3
+        $ pomo show first
+        $ pomo show last
+        $ pomo show 5
+        $ pomo show 1 2 3
 
   * Remove all tasks:
 
@@ -199,11 +199,11 @@ and blue during a break e.g.
 
 We :heart: pull requests and feedback. Feel free to
 [submit a ticket](https://github.com/visionmedia/pomo/issues) or see
-[CONTRIBUTING](https://github.com/visionmedia/pomo/blob/master/CONTRIBUTING.md)
+[CONTRIBUTING](CONTRIBUTING.md)
 for details on pull requests.
 
 ## Copyright
 
 Copyright (c) 2012 TJ Holowaychuk. See
-[LICENSE](https://github.com/visionmedia/pomo/blob/master/LICENSE.md)
+[LICENSE](LICENSE.md)
 for details.

data/lib/pomo/configuration.rb

@@ -38,7 +38,7 @@ module Pomo
     # Load configuration file or default_options. Passed options take precedence.
 
     def self.load(options = {})
-      options.reject!{|k,v| ![:notifier, :progress, :tmux].include? k}
+      user_options = options.reject{|k,v| ![:notifier, :progress, :tmux].include? k}
 
       if !(File.exists? config_file)
         File.open(config_file, 'w') { |file| YAML::dump(default_options, file) }
@@ -46,20 +46,18 @@ module Pomo
       end
 
       config_file_options = YAML.load_file(config_file)
-      new(config_file_options.merge(options))
+      new(config_file_options.merge(user_options))
     end
 
     ##
     # Save configuration. Passed options take precendence over default_options.
 
     def self.save(options = {})
+      user_options = options.reject{|k,v| ![:notifier, :progress, :tmux].include? k}
       force_save = options.delete :force
-      options.reject!{|k,v| ![:notifier, :progress, :tmux].include? k}
-
-      options = default_options.merge(options)
 
       if !(File.exists? config_file) || force_save
-        File.open(config_file, 'w') { |file| YAML::dump(options, file) }
+        File.open(config_file, 'w') { |file| YAML::dump(default_options.merge(user_options), file) }
         say "Initialized config file in #{config_file}"
       else
         say_error "Not overwriting existing config file #{config_file}, use --force to override. See 'pomo help initconfig'."

data/lib/pomo/github_task.rb

@@ -63,13 +63,10 @@ module Pomo
     ##
     # Import Github issue(s) with _user_, _project_, _number_ as GithubTask(s).
 
-    def self.import(user, project, number)
+    def self.import(user, project, number=nil)
       tasks = []
-      if number
-        issues = [Octokit.issue({:username => user, :repo => project}, number)]
-      else
-        issues = Octokit.list_issues({:username => user, :repo => project}, :state => 'open', :sort => 'created')
-      end
+
+      issues = get_issues(user, project, number)
 
       issues.each do |issue|
         tasks << new(issue.title,
@@ -81,7 +78,18 @@ module Pomo
           :url => issue.html_url
         )
       end
+
       return tasks
+    end
+
+    private
+
+    def self.get_issues(user, project, number)
+      if number
+        issues = [Octokit.issue({:username => user, :repo => project}, number)]
+      else
+        issues = Octokit.list_issues({:username => user, :repo => project}, :state => 'open', :sort => 'created')
+      end
     rescue Octokit::NotFound => e
       say "\n"
       say_error '404: This is not the repo you are looking for.'

data/lib/pomo/list.rb

@@ -46,32 +46,7 @@ module Pomo
     #
 
     def find(*args, &block)
-      found = []
-      found << tasks.first if args.empty?
-
-      args.each do |arg|
-        case arg
-        when 'all'
-          found = tasks
-          break
-        when 'first'
-          found << tasks.first
-        when 'last'
-          found << tasks.last
-        when 'complete'
-          found.concat tasks.select { |task| task.complete? }
-        when 'completed'
-          found.concat tasks.select { |task| task.complete? }
-        when 'incomplete'
-          found.concat tasks.select { |task| not task.complete? }
-        when /^(\d+)$/
-          found << tasks[$1.to_i]
-        when /^(\d+)\.\.(-?\d+)$/
-          found.concat tasks[$1.to_i..$2.to_i]
-        end
-      end
-
-      found.compact!
+      found = find_tasks(args)
 
       if block.arity == 2
         found.each_with_index do |task, i|
@@ -126,6 +101,33 @@ module Pomo
 
     private
 
+    def find_tasks(args)
+      found = []
+      found << tasks.first if args.empty?
+
+      args.each do |arg|
+        case arg
+        when 'all'
+          found = tasks
+          break
+        when 'first'
+          found << tasks.first
+        when 'last'
+          found << tasks.last
+        when 'complete', 'completed'
+          found.concat tasks.select { |task| task.complete? }
+        when 'incomplete'
+          found.concat tasks.select { |task| not task.complete? }
+        when /^(\d+)$/
+          found << tasks[$1.to_i]
+        when /^(\d+)\.\.(-?\d+)$/
+          found.concat tasks[$1.to_i..$2.to_i]
+        end
+      end
+
+      found.compact
+    end
+
     def index(arg)
       case arg
       when 'first'

data/lib/pomo/version.rb

@@ -1,4 +1,4 @@
 
 module Pomo
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/pomo.gemspec

@@ -19,16 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables       = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files        = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths     = ['lib']
-  spec.rdoc_options      = ['--line-numbers', '--inline-source', '--title', 'Pomo', '--main', 'Readme.md']
+  spec.rdoc_options      = ['--line-numbers', '--inline-source', '--title', 'Pomo', '--main', 'README.md']
 
   spec.add_dependency('commander', '~> 4.1')
   spec.add_dependency('octokit', '~> 1.19')
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pomo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -76,70 +76,6 @@ 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
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !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
@@ -191,7 +127,7 @@ rdoc_options:
 - --title
 - Pomo
 - --main
-- Readme.md
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -211,7 +147,7 @@ rubyforge_project: pomo
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: pomo-2.1.1
+summary: pomo-2.1.2
 test_files:
 - features/configuration.feature
 - features/manage_list.feature