ididthis 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96d5a0d64ef05567ce8088722435629e3ce11b9
-  data.tar.gz: c3694cebc2b4b2c03670d4cb1ee468ad7fa7335e
+  metadata.gz: a5fdab8903df3a60ba03a9f4a27e8109d8282788
+  data.tar.gz: 92ec7c0fd2bef95cec4ac17acaf5461e2a26ded8
 SHA512:
-  metadata.gz: 349d940206ae53410b28f008aba853b432e30f32111ce2a78b727cd8b8a615a35d484d8ad15686f71ecefb81e283d32925e83244edb19c1043619c774a9b12e9
-  data.tar.gz: 394ed3a088aa9efa69970b16fdcb20008732c5a0fd09339b358f715c2d359093607efd3de9399880dffc289fd2892ffa883efb5532cae1d28c6a9831ecf4bd24
+  metadata.gz: 04b657883d8cf00816998cd1b31d8f0060f7eb254e797d9af74170a9a426f47d972f8ccb2e54359f9d406fcb16a198e4e6f1491d130f1c0b4f833618ccda792d
+  data.tar.gz: b528860b50263e07e6bdca0ad3cfc7374c9135016c9f48c97a9341258b2c6f5fe60c9be7ff2416afd8c39b1a957899b3fe34c74adaa215bc82355f5a9362c3c6

data/.codeclimate.yml

@@ -0,0 +1,3 @@
+languages:
+  Ruby: true
+

data/.document

@@ -0,0 +1,6 @@
+lib/*.rb
+lib/**/*.rb
+-
+CHANGELOG.rdoc
+LICENSE.md
+

data/.gitignore

@@ -7,5 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+/bin/
 .ruby-*

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
+--order random
 --color

data/.rubocop.yml

@@ -0,0 +1,22 @@
+inherit_from: .rubocop_todo.yml
+
+require: rubocop-rspec
+
+AllCops:
+  Include:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'ididthis.gemspec'
+  Exclude:
+    - bin/*
+
+# Enforce outdented access modifiers
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+EmptyLinesAroundAccessModifier:
+  Enabled: true
+
+# Standardize on double quotes
+StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_todo.yml

@@ -0,0 +1,69 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-07 11:34:15 -0400 using RuboCop version 0.33.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/ididthis/cli.rb'
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 18
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 123
+
+# Offense count: 5
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 112
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 12
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+# Offense count: 24
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/AlignParameters:
+  Enabled: false
+
+# Offense count: 1
+Style/Documentation:
+  Exclude:
+    - 'lib/ididthis/version.rb'
+
+# Offense count: 4
+# Configuration parameters: Exclude.
+Style/FileName:
+  Exclude:
+    - 'bin/cc-tddium-post-worker'
+    - 'bin/git-version-bump'
+    - 'bin/ruby-parse'
+    - 'bin/ruby-rewrite'
+
+# Offense count: 58
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 176
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false

data/.simplecov

@@ -0,0 +1,15 @@
+require 'coveralls'
+require 'codeclimate-test-reporter'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter,
+  CodeClimate::TestReporter::Formatter
+]
+
+SimpleCov.start do
+  add_filter "/spec/"
+  minimum_coverage(50.0)
+end
+
+

data/.travis.yml

@@ -1,7 +1,17 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - jruby
-before_install: 
-  - gem install bundler -v 1.10.2
+- 2.2.0
+- 2.1.0
+- 2.0.0
+- 1.9.3
+- jruby
+before_install:
+- gem install bundler -v 1.10.2
+script:
+  - bundle exec rake test
+notifications:
+  pushover:
+    api_key:
+      secure: B4aN8EQW8mVLk14cgY8MeZuUCj3UsoVsYvDPNIPOrWLCxdyIFSdE0ncIzejGKyfE+hIzEFEO8shBBRXu4GksEemj3RD5hm7rNMtOGbcSDq7+Bm03MU65RABDsXm4JFwCop770ZEtVbEuTmivA33Upaxlw6cBwjS8EgYVnjI60IfOiQePD5hc0X8dcGYDzxe05tzEFB8KJxUDsajfUdXFkRcRhwKrrFggs6OIRl+h35OYFs2IkYYKxRkvfsU2LJQ4D8QMq0ZxNLu5BNxTFAJmiuBzPH2gfCHnE1Ny7TFA0orAXVWcNT5s9llJpkidtgUhWI9m1c1YXPq94fmSZW9JZTzQLhl7enbw6p0ZuajYcrtacatCvdecJQeWKrJRddqOjRRUusS9zrj7UYWtMQx7Sg0+z/Yq/ooiZFo2jnMfdm3dsw7CnBw9uCVDc9St9GXU1AbysfUi8pq4tQB5CorJZO81Y0e2wAXqak/NKKFOvFpuZAaAb4zwRVd71otOoU+WvP1UxlmqJPkxWZ9MCbHvwVDyj0bn92R0hv2XfWON71dGxAHpkwQy4FFvxMztZASfg1uHElQ0bLbC0P1dXnR9ExaqU/KxwwPjFhfcKP2+mxD2upUinWHIPFjudSPlWaogCDbQ/iuZahXKZgFTMunJ5enqtYw1mjQlr3Hsn3bZ1Iw=
+    users:
+      secure: tnFgv9r4mYeVsL+uvvVh9ncoIDEQGgtIC069OP1kuNH6RZobz5qLBX2IEz6WWasyms++T1jt6UJhGR2bIzXb8GHTn2WyNjczqlLLuai/lIhQdSd3t1v4po0MDuD6pyBQ8oUri39Zuw99fqcQwEcP+pMjp0iqPSdVj1qznMl7zEirs19ZHLPp/ejA/OBSM5D44Rhi+hW8aZ0n0ROUaZSt6xHeS0qO4Gy0Rpmq4QV39ovJUHsURZF9etGUTtJw8o3ZxrFXOJSAnh+n37Gc5F+KVx7SzerwD7AC699m8CbdoDq32xK+v/wGzwRz68HoTCir4Nl0FT+JWudoJdQbcLJ7bbN0paBXc7Ogf8rGv9I7tRiMEwRVLZaRjXdDRpnHeutfWH1DG3K6Q+HnOIpVAlz4oQR5gcGOmriLB78aNCZELxc7j41bnrii53PTgtxdsXqvuIkHm5eLPQFd6AlvMlN3ZnsJja492YkBOx+jf94Uk11e12kK8q1xKR29yyH/o7eeDb8q89Pa1YksaS7m+yKy3zq26XGsFDk646D3FMc69wOS4YRmj4N0rdtpZRpHnQuvC0TCjBtfbSDmgNhj/DQzVrqOuJ8qUwWk75B3miYrRkIMLqtmXqJbpu3QUlDP4MvtH1vqZD1hOBUDqAlAIGD+4Wfd8JqUxAAxyAmnO8VpISE=

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ididthis.gemspec
 gemspec

data/README.md

@@ -1,41 +1,57 @@
-# Ididthis
+[![Gem Version](https://badge.fury.io/rb/ididthis.svg)] [rubygems] 
+[![Build Status](https://travis-ci.org/duckpuppy/ididthis.svg)] [travis]
+[![Dependency Status](https://gemnasium.com/duckpuppy/ididthis.svg)] [gemnasium]
+[![Code Climate](https://codeclimate.com/github/duckpuppy/ididthis/badges/gpa.svg)] [code_climate]
+[![Coverage Status](https://coveralls.io/repos/duckpuppy/ididthis/badge.svg?branch=develop&service=github)] [coveralls]
+[![Downloads](https://img.shields.io/gem/dtv/ididthis.svg)]()
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ididthis`. To experiment with that code, run `bin/console` for an interactive prompt.
+[rubygems]: http://badge.fury.io/rb/ididthis
+[travis]: https://travis-ci.org/duckpuppy/ididthis
+[gemnasium]: https://gemnasium.com/duckpuppy/ididthis
+[code_climate]: https://codeclimate.com/github/duckpuppy/ididthis
+[coveralls]: https://coveralls.io/github/duckpuppy/ididthis?branch=develop
 
-TODO: Delete this and the text above, and describe your gem
+# ididthis
 
-## Installation
+`ididthis` is a command-line utilty for posting and viewing dones on [iDoneThis] [idonethis].
 
-Add this line to your application's Gemfile:
+## Installation
 
-```ruby
-gem 'ididthis'
-```
+    $ gem install ididthis
 
-And then execute:
+## Usage
 
-    $ bundle
+A list of commands for `ididthis` can be seen by running
 
-Or install it yourself as:
+    $ ididthis help
 
-    $ gem install ididthis
+Addtional help for a command can be show by running
 
-## Usage
+    $ ididthis help COMMAND
 
-TODO: Write usage instructions here
+`ididthis` supports only what the current [iDoneThis API] [idonethis_api] allows.  As newer releases of the API are developed, this gem will update to take advantage of the newer functionality.
+Noticably missing from the API currently are methods for manipulating existing dones.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. 
+Then, run `rake rspec` to run the tests. You can also run `rake console` for an
+interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To
+release a new version, update the version number in `version.rb`, and then run
+`bundle exec rake release`, which will create a git tag for the version if one
+doesn't exist, push git commits and tags, and push the `.gem` file to 
+[rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ididthis. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/duckpuppy/ididthis. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+[idonethis]: https://idonethis.com
+[idonethis_api]: https://idoneths.com/api

data/Rakefile

@@ -1,18 +1,51 @@
-require "bundler/gem_tasks"
+# require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubygems/tasks"
 require "dotenv/tasks"
+require "rake/clean"
+require "rdoc/task"
+require "rubocop/rake_task"
 
-lib_dir = File.expand_path('lib', File.dirname(__FILE__))
+lib_dir = File.expand_path("lib", File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
+CLEAN.include("pkg")
+CLEAN.include("coverage")
+
 RSpec::Core::RakeTask.new(:spec)
+
+RuboCop::RakeTask.new do |task|
+  task.requires << "rubocop-rspec"
+  task.options = ["-fh", "-ocoverage/rubocop.html",
+                  "-fj", "-ocoverage/rubocop.json"]
+end
+
 Gem::Tasks.new(
-  build: {gem: true, tar: true, zip:true},
-  sign: {checksum: true, pgp: false}
+  build: { gem: true, tar: true, zip: true },
+  sign:  { checksum: true, pgp: false },
+  scm:   { tag: false }
 ) do |tasks|
-  tasks.console.command = 'pry'
+  tasks.console.command = "pry"
 end
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec
+
+desc "Run all code analysis tools"
+task :analyze => [:test, :rubocop]
+
+namespace :reports do
+  desc "Open test coverage in browser"
+  task :coverage => [:test] do
+    # TODO: Switch based on OS
+    `open coverage/index.html`
+  end
+
+  desc "Open RuboCop report in browser"
+  task :rubocop do
+    sh "bundle exec rake rubocop" do
+      # Ignore errors
+    end
+    `open coverage/rubocop.html`
+  end
+end

data/exe/ididthis

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require 'ididthis'
+require "ididthis"
 
 Ididthis::CommandLine.start(ARGV)

data/ididthis.gemspec

@@ -1,29 +1,37 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ididthis/version'
+require "ididthis/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "ididthis"
-  spec.version       = Ididthis::VERSION
-  spec.authors       = ["Patrick Aikens"]
-  spec.email         = ["paikens@gmail.com"]
+  spec.name                  = "ididthis"
+  spec.description           = "A command line utility for posting and viewing dones on iDidThis."
+  spec.version               = Ididthis::VERSION
+  spec.authors               = ["Patrick Aikens"]
+  spec.email                 = ["paikens@gmail.com"]
 
-  spec.summary       = %q{Command line interface to iDoneThis using the API}
-  spec.homepage      = "https://github.com/duckpuppy/ididthis.git"
-  spec.license       = "MIT"
+  spec.summary               = "Command line interface to iDoneThis using the API"
+  spec.homepage              = "https://github.com/duckpuppy/ididthis.git"
+  spec.license               = "MIT"
+  spec.required_ruby_version = ">= 1.9.3"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir                = "exe"
+  spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths         = ["lib"]
 
-  spec.add_dependency "highline"
-  spec.add_dependency "rest-client"
-  spec.add_dependency "thor"
-  spec.add_development_dependency "dotenv"
+  spec.add_dependency "highline", "~> 1.7"
+  spec.add_dependency "rest-client", "~> 1.8"
+  spec.add_dependency "thor", "~> 0.19.1"
+  spec.add_development_dependency "rubygems-tasks", "~> 0.2.4"
+  spec.add_development_dependency "dotenv", "~> 2.0"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "pry", "~> 0.9"
+  spec.add_development_dependency "travis", "~>1.8"
+  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "rubocop", "~> 0.33"
+  spec.add_development_dependency "rubocop-rspec", "~> 1.3"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
 end

data/lib/ididthis/api.rb

@@ -1,39 +1,46 @@
-require 'rest-client'
+require "rest-client"
 
 module Ididthis
   module API
+    # TODO: Investigate using the ActiveResource-style calls
+    # Class for accessing the iDoneThis API
     class Client
-      def validate_token(token)
-        RestClient.get(ENDPOINTS[:noop], {:content_type => :json, :accept => :json, :Authorization => tokenize(token)}) { |response, request, result, &block|
+      attr_writer :token
+
+      def initialize(token)
+        @token = token
+      end
+
+      def validate_token
+        RestClient.get(ENDPOINTS[:noop], header_map) do |response|
           case response.code
           when 200
             return true
           else
             return false
           end
-        }
+        end
       end
 
-      def get_teams(token)
+      def teams
         RestClient.get(
-          ENDPOINTS[:team], 
-          {:content_type => :json, :accept => :json, :Authorization => tokenize(token)}
+          ENDPOINTS[:team], header_map
         ) do |response, request, result, &block|
           case response.code
           when 200
             resp = JSON.parse(response.body, :symbolize_names => true)
-            # TODO This is not right, need to throw an error when no teams are found
-            resp[:ok] ? resp[:results] : [] 
+            # FIXME: This is not right, need to throw an error when no teams
+            #   are found
+            resp[:ok] ? resp[:results] : []
           else
             response.return!(request, result, &block)
           end
         end
       end
 
-      def get_team(token)
+      def team
         RestClient.get(
-          Ididthis::Config[:team], 
-          {:content_type => :json, :accept => :json, :Authorization => tokenize(token)}
+          Ididthis::Config[:team], header_map
         ) do |response, request, result, &block|
           case response.code
           when 200
@@ -42,19 +49,13 @@ module Ididthis
           else
             response.return!(request, result, &block)
           end
-        end 
+        end
       end
 
-      def post_done(token, done, team, options)
-        payload = {:raw_text => done, :team => team}
-        payload[:done_date] = options[:date] if options[:date]
-        payload[:meta_data] = options[:metadata] if options[:metadata]
-
+      def post_done(done, team, options)
+        payload = { raw_text: done, team: team }.merge(options)
         RestClient.post(
-          ENDPOINTS[:dones], 
-          payload.to_json, 
-          {:content_type => :json, :accept => :json, :Authorization => tokenize(token)}
-        ) do |response, request, result, &block|
+          ENDPOINTS[:dones], payload.to_json, header_map) do |response|
           case response.code
           when 201
             puts "Posted your done!"
@@ -64,10 +65,10 @@ module Ididthis
         end
       end
 
-      def get_dones(token, options)
+      def dones(options)
         RestClient.get(
           ENDPOINTS[:dones],
-          {:content_type => :json, :accept => :json, :Authorization => tokenize(token), :params => options},
+          header_map.merge(:params => options)
         ) do |response, request, result, &block|
           case response.code
           when 200
@@ -79,11 +80,13 @@ module Ididthis
         end
       end
 
-      private
-      def tokenize(token)
-        "Token #{token}"
+      def header_map
+        {
+          :content_type => :json,
+          :accept => :json,
+          :Authorization => "Token #{@token}"
+        }
       end
     end
   end
 end
-

data/lib/ididthis/cli.rb

@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
-require 'thor'
-require 'ididthis'
+require "thor"
+require "ididthis"
 
 module Ididthis
+  # Class providing the command line interface processing
   class CommandLine < Thor
+    class_option :color,
+                 :type    => :boolean,
+                 :default => true,
+                 :desc    => "Colorize output"
+
     desc "configure", "(Re)configure the client."
     long_desc <<-CONFIGURE
 
@@ -19,50 +25,124 @@ module Ididthis
     desc "post [OPTIONS] DONE", "Post a new done"
     long_desc <<-POST
 
-    `post` will post a new done or goal to iDoneThis.  
-    To tag the done, simply include the tags in the done using #hashtags.  If any tag doesn't already exist, it will be created.
+    `post` will post a new done or goal to iDoneThis.
+    To tag the done, simply include the tags in the done using #hashtags.
+    If any tag doesn"t already exist, it will be created.
     POST
-    option :date, :aliases => "-d", :type => :string, :banner => "YYYY-MM-DD", :desc => "The date for this done."
-    option :team, :aliases => "-t", :type => :string, :default => Ididthis::Config[:team], :banner => "SHORT_NAME", :desc => "The team to post to."
-    option :goal, :aliases => "-g", :type => :boolean, :desc => "Post a goal rather than a done"
+    option :date,
+           :aliases => "-d",
+           :type    => :string,
+           :banner  => "YYYY-MM-DD",
+           :desc    => "The date for this done."
+    option :team,
+           :aliases => "-t",
+           :type    => :string,
+           :default => Ididthis::Config[:team],
+           :banner  => "SHORT_NAME",
+           :desc    => "The team to post to."
+    option :goal,
+           :aliases => "-g",
+           :type    => :boolean,
+           :desc    => "Post a goal rather than a done"
     def post(done)
-      c = Ididthis::API::Client.new
-      c.post_done(Ididthis::Config[:token], options[:goal] ? "[] #{done}" : done, options[:team], options)
+      post_options = {}
+      post_options[:done_date] = options[:date] if options[:date]
+      post_options[:meta_data] = options[:metadata] if options[:metadata]
+      c = Ididthis::API::Client.new(Ididthis::Config[:token])
+      c.post_done(
+        options[:goal] ? "[] #{done}" : done, options[:team],
+        post_options
+      )
     end
 
     desc "dones [OPTIONS]", "List dones"
     long_desc <<-DONES
     DONES
-    option :team, :aliases => "-t", :type => :string, :default => Ididthis::Config[:team], :banner => "SHORT_NAME", :desc => "Show only dones from TEAM"
-    option :owner, :aliases => "-o", :type => :string, :banner => "USERNAME", :desc => "Show only dones belonging to USERNAME"
-    option :date, :aliases => "-d", :type => :string, :banner => "YYYY-MM-DD, yesterday, or today", :desc => "Show only dones from DATE"
-    option :after, :type => :string, :banner => "YYYY-MM-DD", :desc => "Show only dones on or after DATE"
-    option :before, :type => :string, :banner => "YYYY-MM-DD", :desc => "Show only dones on or before DATE"
-    option :tags, :type => :string, :banner => "TAG...", :desc => "Show only dones tagged with TAGs.  Comma separated list."
-    option :order, :type => :string, :banner => "ORDER", :enum => ['created', 'done_date', '-created', '-done_date'], :desc => "Order results by ORDER."
-    option :limit, :aliases => "-l", :type => :numeric, :banner => "LIMIT", :desc => "Limit the number of results returned. Maximum of 100."
-    option :page, :aliases => "-p", :type => :numeric, :banner => "PAGE", :desc => "Used in conjunction with --limit to get more results."
+    option :team,
+           :aliases => "-t",
+           :type    => :string,
+           :default => Ididthis::Config[:team],
+           :banner  => "SHORT_NAME",
+           :desc    => "Show only dones from TEAM"
+    option :owner,
+           :aliases => "-o",
+           :type    => :string,
+           :banner  => "USERNAME",
+           :desc    => "Show only dones belonging to USERNAME"
+    option :date,
+           :aliases => "-d",
+           :type    => :string,
+           :banner  => "YYYY-MM-DD, yesterday, or today",
+           :desc    => "Show only dones from DATE"
+    option :after,
+           :type    => :string,
+           :banner  => "YYYY-MM-DD",
+           :desc    => "Show only dones on or after DATE"
+    option :before,
+           :type    => :string,
+           :banner  => "YYYY-MM-DD",
+           :desc    => "Show only dones on or before DATE"
+    option :tags,
+           :type    => :string,
+           :banner  => "TAG...",
+           :desc    => "Show only dones tagged with TAGs. Comma separated list."
+    option :order,
+           :type    => :string,
+           :banner  => "ORDER",
+           :enum    => ["created", "done_date", "-created", "-done_date"],
+           :desc    => "Order results by ORDER."
+    option :limit,
+           :aliases => "-l",
+           :type    => :numeric,
+           :banner  => "LIMIT",
+           :desc    => "Limit the number of results returned. Maximum of 100."
+    option :page,
+           :aliases => "-p",
+           :type    => :numeric,
+           :banner  => "PAGE",
+           :desc    => "Used in conjunction with --limit to get more results."
     def dones
-      query_mappings = { date: "done_date", after: "done_date_after", before: "done_date_before", order: "order_by", limit: "page_size" }
+      query_mappings = {
+        date: "done_date",
+        after: "done_date_after",
+        before: "done_date_before",
+        order: "order_by",
+        limit: "page_size" }
       params = Hash[options.map { |k, v| [query_mappings[k] || k, v] }]
-      c = Ididthis::API::Client.new
-      dones = c.get_dones(Ididthis::Config[:token], params)
-      dones.each do |done|
-        puts "#{yellow(done[:done_date])} #{green(done[:owner])}\t#{done[:raw_text]}".gsub(/(#\b[^\s]+\b)/, "\e[31m\\1\e[0m")
-      end
+      c = Ididthis::API::Client.new(Ididthis::Config[:token])
+      print_dones(c.dones(params))
     end
 
     desc "teams", "Update your team list from the server."
     def teams
     end
 
-    private
-    def colorize(text, color_code)
-      "#{color_code}#{text}\e[0m"
+  private
+
+    # TODO: Break output to separate formatter classes
+    def print_dones(dones)
+      dones.each do |done|
+        print format_column(done[:done_date], COLORS[:yellow])
+        print format_column(done[:owner], COLORS[:green], " ")
+        puts format_column(highlight_tags(done[:raw_text]), "", "\t")
+      end
+    end
+
+    def highlight_tags(done_text)
+      options[:color] ? done_text.gsub(/(#\b[^\s]+\b)/, "\e[31m\\1\e[0m") : done_text
+    end
+
+    def format_column(text, color_code, prefix = "", suffix = "")
+      column_text = "#{prefix}#{color_code if options[:color] && color_code}"
+      column_text += text
+      column_text += "#{COLORS[:reset] if options[:color] && color_code}#{suffix}"
     end
 
-    def red(text); colorize(text, "\e[31m"); end
-    def green(text); colorize(text, "\e[32m"); end
-    def yellow(text); colorize(text, "\e[33m"); end
+    COLORS = {
+      reset: "\e[0m",
+      red: "\e[31m",
+      green: "\e[32m",
+      yellow: "\e[33m"
+    }
   end
 end

data/lib/ididthis/config.rb

@@ -1,54 +1,40 @@
-require 'highline/import'
-require 'yaml'
+require "highline/import"
+require "yaml"
 
 module Ididthis
+  # Handles creating and retrieving configuration
   module Config
-    extend self
-    PATH = ENV['IDIDTHIS_CONFIG_FILE'] || File.join(ENV['HOME'], '.ididthis.yml')
+  module_function
+
+    PATH = ENV["IDIDTHIS_CONFIG"] || File.join(ENV["HOME"], ".ididthis.yml")
 
     def defaults
       {
         teams: {},
-        team: '',
-        token: ''
+        team: "",
+        token: ""
       }
     end
 
     def [](key)
       configs[key]
     rescue => e
-      warn 'invalid config file'
+      warn "invalid config file"
       warn e.message
       defaults[key]
     end
 
     def configure!
-      current = configs
-      client = Ididthis::API::Client.new
-
-      token = ask("iDoneThis API Token: ") do |token| 
-        token.default = current[:token]
-        token.whitespace = :strip
-        token.responses[:not_valid] = "The token you have entered cannot be validated.  Please try again."
-        token.responses[:ask_on_error] = :question
-        token.validate = lambda do |t|
-          client.validate_token(t)
-        end
-      end
+      token = ask_token
 
-      teams = client.get_teams(token)
-      team = choose do |menu|
-        menu.prompt = "Which team will you be posting dones to? "
-        menu.select_by = :index_or_name
-        teams.each do |team|
-          menu.choice(team[:name]) {
-            team
-          }
-        end
-      end
+      client = Ididthis::API::Client.new(token)
+      teams = client.teams
+      team = ask_team(teams)
 
-      File.open(PATH, 'w') do |f|
-        f << { :token => token, :team => team[:short_name], :teams => teams }.to_yaml
+      File.open(PATH, "w") do |f|
+        f << { :token => token,
+               :team => team[:short_name],
+               :teams => teams }.to_yaml
       end
     end
 
@@ -59,5 +45,28 @@ module Ididthis
         defaults
       end
     end
+
+    def ask_token
+      ask("iDoneThis API Token: ") do |tkn|
+        tkn.default = configs[:token]
+        tkn.whitespace = :strip
+        tkn.responses[:not_valid] = "The token you have entered cannot be validated.  Please try again."
+        tkn.responses[:ask_on_error] = :question
+        tkn.validate = lambda do |t|
+          client = Ididthis::API::Client.new(t)
+          client.validate_token
+        end
+      end
+    end
+
+    def ask_team(teams)
+      choose do |menu|
+        menu.prompt = "Which team will you be posting dones to? "
+        menu.select_by = :index_or_name
+        teams.each do |t|
+          menu.choice(t[:name]) { t }
+        end
+      end
+    end
   end
 end

data/lib/ididthis/version.rb

@@ -1,3 +1,3 @@
 module Ididthis
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/ididthis.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 begin
-  require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+  require "Win32/Console/ANSI" if RUBY_PLATFORM =~ /win32/
 rescue LoadError
   raise "You must gem install win32console to use color on Windows"
 end
@@ -12,6 +12,7 @@ require "ididthis/cli"
 require "highline/import"
 require "json"
 
+# Main module
 module Ididthis
   CONFIG_FILE = File.expand_path("~/.ididthis")
   API_VERSION = "0.1"

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ididthis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Patrick Aikens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,31 +112,101 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+description: A command line utility for posting and viewing dones on iDidThis.
 email:
 - paikens@gmail.com
 executables:
@@ -130,9 +214,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".document"
 - ".env"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -144,7 +233,6 @@ files:
 - lib/ididthis.rb
 - lib/ididthis/api.rb
 - lib/ididthis/cli.rb
-- lib/ididthis/cli/done.rb
 - lib/ididthis/config.rb
 - lib/ididthis/version.rb
 homepage: https://github.com/duckpuppy/ididthis.git
@@ -159,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/ididthis/cli/done.rb

@@ -1,12 +0,0 @@
-module Ididthis
-  module CLI
-    class Done < Thor
-      def post
-      end
-
-      def log
-      end
-    end
-  end
-end
-