my_todo 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e34470c767f09895747115f0d3b3fe188711a7b
-  data.tar.gz: 88717583dab1f1967d68586652b825f844974090
+  metadata.gz: 18cbf31412cafa361da1286224e29d1582e20bab
+  data.tar.gz: 5851503d07bc55819b9cf6e8aa7f32d4cec3dcd8
 SHA512:
-  metadata.gz: 44541d49b304415df3d76122d684fbb0ecefb64beca23535aa17983de2f20eab057e2e4c8c71cebc6b7ce0c4d520a03e2a525b7919864ffb13579630dddff689
-  data.tar.gz: ce9a182b76a060e39fa323f35f3b47c38fc2dcb9c1a7a4f8d8c15f14ab58125de2b30c0b495cdcea176a7d58de6280d75f1b21232567dd112568691e461072df
+  metadata.gz: 44a29568efb99789a382022f4d48c3c7900a9a8a4b9bab49aeb3750ba7bd9b342ebbeb8d15a9caaa6214d968a8c17471063f662b89648dcd0eb6686483a0f0b4
+  data.tar.gz: d2dd52251018244a1a8420fc3cade88e778ff741b27e14458d46b42f326023d85119db30f597528c77a78ba9f4c0e84c638eba7b8fad033c65761f1743dfd8d0

data/README.md

@@ -1,4 +1,9 @@
 # My Todo
+[![Code Climate](https://codeclimate.com/github/vmcilwain/my_todo/badges/gpa.svg)](https://codeclimate.com/github/vmcilwain/my_todo)
+
+[![Test Coverage](https://codeclimate.com/github/vmcilwain/my_todo/badges/coverage.svg)](https://codeclimate.com/github/vmcilwain/my_todo/coverage)
+
+[![Issue Count](https://codeclimate.com/github/vmcilwain/my_todo/badges/issue_count.svg)](https://codeclimate.com/github/vmcilwain/my_todo)
 
 ## Summary
 This is yet another simple todo application. This was built because I found myself having to create quick reminders when things came up but needing to switch windows from the terminal to the todo application via the GUI. This application is the result of that one annoyance :). It is still a work in progress but I hope you find it useful.

data/lib/db/migrate/20161005133023_add_detailed_status_to_items.rb

@@ -0,0 +1,5 @@
+class AddDetailedStatusToItems < ActiveRecord::Migration[5.0]
+  def change
+    add_column :items, :detailed_status, :string
+  end
+end

data/lib/db/schema.rb

@@ -10,13 +10,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161003121448) do
+ActiveRecord::Schema.define(version: 20161005133023) do
 
   create_table "items", force: :cascade do |t|
     t.string   "body"
     t.boolean  "done"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+    t.string   "detailed_status"
   end
 
   create_table "notes", force: :cascade do |t|

data/lib/my_todo/models/item.rb

@@ -1,6 +1,7 @@
 # @author Lovell McIlwain#
 # Handles business logic for todo item
 class Item < ActiveRecord::Base
+  DETAILED_STATUSES = ['None', 'In Progress', 'Complete', 'Punted', 'Waiting Feedback']
   # ActiveRecord association to stubs
   # @note Item.first.stubs
   has_many :stubs

data/lib/my_todo/templates/output.erb

@@ -1,9 +1,10 @@
 
-ID: <%= item.id %> | Tags: <%= item.tags.map(&:name).join(', ') %> | Complete: <%= item.done %>
+ID: <%= item.id %> | Created On: <%= item.created_at.strftime("%Y-%m-%d") %> | Tags: <%= item.tags.map(&:name).join(', ') %> | Status: <%= item.detailed_status %> | Complete: <%= item.done %>
 <%= item.body %>
 <% if item.notes.any? -%>
 Notes:
 <% item.notes.each do |note| -%>
-<%= note.id %>: <%= note.body %>
+ID: <%= note.id %> | Created On: <%= note.created_at.strftime("%Y-%m-%d")%>
+<%= note.body %>
 <% end %>
 <% end %>

data/lib/my_todo/version.rb

@@ -1,3 +1,3 @@
 module MyTodo
-  VERSION = "2.7.1"
+  VERSION = "2.8.0"
 end

data/lib/my_todo.rb

@@ -29,19 +29,47 @@ module MyTodo
       def item
         @item ||= Item.where(id: options[:id]).first
       end
+
+      def detailed_statuses
+        @detailed_statuses ||= Item::DETAILED_STATUSES
+      end
+
+      def list_statuses
+        detailed_statuses.each_with_index {|status, index| say "#{index}: #{status}"}
+      end
+
+      def ask_status
+        list_statuses
+        @status = ask("Choose a status for item", default: 1)
+      end
+
+      def all_items(status)
+        case status
+        when 'all'
+          Item.all
+        when 'done'
+          Item.where(done: true)
+        else
+          Item.where(done: false)
+        end
+      end
+
+      def create_item(options)
+        ask_status
+        @item = Item.create!(options.merge({detailed_status: detailed_statuses[@status.to_i]}).except(:tags))
+        options[:tags].split(' ').each{|tag| item.tags.create(name: tag) }
+      end
+
+      def update_item(options)
+        ask_status
+        new_status = detailed_statuses[@status.to_i]
+        item.detailed_status != new_status ? item.update!(options.merge({detailed_status: new_status})) : item.update!(options)
+      end
     end
 
     desc 'list([STATUS])', 'list todos. Default: undone, [all], [done], [undone]'
     def list(status=nil)
-      items = case status
-      when 'all'
-        Item.all
-      when 'done'
-        Item.where(done: true)
-      else
-        Item.where(done: false)
-      end
-
+      items = all_items(status)
       say "ToDos FOUND: #{items.count}"
       items.each {|item| output(item)}
     end
@@ -53,10 +81,9 @@ module MyTodo
     option :created_at, default: DateTime.now
     def create
       begin
-        item = Item.create!(options.except(:tags))
-        options[:tags].split(' ').each{|tag| item.tags.create(name: tag) }
         say 'ToDo CREATED!'
-        output item
+        create_item(options)
+        output @item
       rescue ActiveRecord::RecordInvalid => e
         say e.message
       end
@@ -69,7 +96,7 @@ module MyTodo
     option :updated_at, default: DateTime.now
     def update
       begin
-        item.update!(options)
+        update_item(options)
         say 'ToDo UPDATED!'
         output item
       rescue ActiveRecord::RecordInvalid => e
@@ -84,15 +111,16 @@ module MyTodo
         output item
         item.destroy!
         say 'ToDo DESTROYED!'
-      rescue Exception => e
+      rescue StandardError => e
         say e.message
       end
     end
 
     desc 'search(TEXT)', 'search for todo by item body, tag name or note body'
     def search(text)
-      items = Item.ransack(body_or_tags_name_or_notes_body_cont: text).result
+      items = Item.ransack(body_or_detailed_status_or_tags_name_or_notes_body_cont: text).result
       say "ToDos FOUND: #{items.count}"
+      say "Search based on ransack search: body_or_detailed_status_or_tags_name_or_notes_body_cont"
       items.each {|item| output item}
     end
 
@@ -102,7 +130,8 @@ module MyTodo
     def tag
       begin
         item.tags.create!(name: options[:tag])
-      rescue Exception => e
+        output item.reload
+      rescue StandardError => e
         say e.message
       end
     end
@@ -114,7 +143,7 @@ module MyTodo
       begin
         item.tags.where(name: options[:tag]).first.destroy!
         output item.reload
-      rescue Exception => e
+      rescue StandardError => e
         say e.message
       end
     end
@@ -126,7 +155,7 @@ module MyTodo
       begin
         item.notes.create(body: options[:body])
         output item.reload
-      rescue Exception => e
+      rescue StandardError => e
         say e.message
       end
     end
@@ -138,7 +167,7 @@ module MyTodo
       begin
         item.notes.where(id: options[:noteid]).first.destroy!
         output item.reload
-      rescue Exception => e
+      rescue StandardError => e
         say e.message
       end
     end

data/lib/setup.rb

@@ -12,7 +12,7 @@ class Setup < Thor
 
   desc 'db_config', 'Generate data file structure and configuration files'
   def db_config
-    unless File.exists?("#{HOME_DIR}/.my_todo/data")
+    unless File.exist?("#{HOME_DIR}/.my_todo/data")
       `mkdir -p #{HOME_DIR}/.my_todo/data`
       say "Created .my_todo in #{HOME_DIR}"
     end

data/my_todo.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug', '~> 9.0.5'
   spec.add_development_dependency 'yard', '~> 0.9.5'
   spec.add_development_dependency 'simplecov', '~> 0.12.0'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_dependency 'activerecord', '~> 5.0.0.1'
   spec.add_dependency 'activesupport', '~> 5.0.0.1'
   spec.add_dependency 'thor', '~> 0.19.1'

data/spec/actions/create_spec.rb

@@ -1,9 +1,21 @@
 require 'spec_helper'
 
 describe MyTodo do
+  def shell
+    @shell ||= Thor::Shell::Basic.new
+  end
+
   describe 'create' do
+    before do
+      expect(Thor::LineEditor).to receive(:readline).with("Choose a status for item (1) ", {:default=>1}).and_return("")
+    end
+
     context 'successful creation' do
       describe 'creation without tags or setting done attribute' do
+        it 'prompts for a detailed status' do
+          expect(shell.ask("Choose a status for item", {:default=>1})).to eq(1)
+        end
+
         it 'creates a todo item' do
           expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text))}.to change{Item.count}.by(1)
         end
@@ -21,7 +33,7 @@ describe MyTodo do
         end
 
         it 'displays the created todo item' do
-          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text))}.to output("ToDo CREATED!\n\nID: 1 | Tags: default | Complete: false\nwierdness_of_text\n\n").to_stdout
+          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text))}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\n\nID: 1 | Created On: 2016-10-08 | Tags: default | Status: In Progress | Complete: false\nwierdness_of_text\n\n").to_stdout
         end
       end
 
@@ -31,7 +43,7 @@ describe MyTodo do
         end
 
         it 'displays the created todo item with tag' do
-          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text --tags=tag1))}.to output("ToDo CREATED!\n\nID: 1 | Tags: tag1 | Complete: false\nwierdness_of_text\n\n").to_stdout
+          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text --tags=tag1))}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\n\nID: 1 | Created On: 2016-10-08 | Tags: tag1 | Status: In Progress | Complete: false\nwierdness_of_text\n\n").to_stdout
         end
       end
 
@@ -44,14 +56,14 @@ describe MyTodo do
         end
 
         it 'displays the created to item with complete set to true' do
-          expect{MyTodo::Todo.start(%w[create --body=wierdness_of_text --done=true])}.to output("ToDo CREATED!\n\nID: 1 | Tags: default | Complete: true\nwierdness_of_text\n\n").to_stdout
+          expect{MyTodo::Todo.start(%w[create --body=wierdness_of_text --done=true])}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\n\nID: 1 | Created On: 2016-10-08 | Tags: default | Status: In Progress | Complete: true\nwierdness_of_text\n\n").to_stdout
         end
       end
     end
 
     context 'unsuccessful creation' do
       it 'returns error message when body is missing' do
-        expect{MyTodo::Todo.start(%w(create))}.to output("Validation failed: Body can't be blank\n").to_stdout
+        expect{MyTodo::Todo.start(%w(create))}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\nValidation failed: Body can't be blank\n").to_stdout
       end
     end
   end

data/spec/actions/note_spec.rb

@@ -14,7 +14,7 @@ describe MyTodo do
       end
 
       it 'displays item with notes' do
-        expect{MyTodo::Todo.start(%W[note --id=#{@todo.id} --body=note_text])}.to output( "\nID: 1 | Tags:  | Complete: \nSome Body\nNotes:\n1: note_text\n\n\n").to_stdout
+        expect{MyTodo::Todo.start(%W[note --id=#{@todo.id} --body=note_text])}.to output("\nID: 1 | Created On: 2016-10-08 | Tags:  | Status:  | Complete: \nSome Body\nNotes:\nID: 1 | Created On: 2016-10-08\nnote_text\n\n\n").to_stdout
       end
     end
 

data/spec/actions/search_spec.rb

@@ -11,23 +11,23 @@ describe MyTodo do
         @todo3.notes.create(body: 'note1')
       end
 
-
       it 'finds todo item by body' do
-        expect{MyTodo::Todo.start( %w[search nfl])}.to output("ToDos FOUND: 1\n\nID: 1 | Tags: tag1 | Complete: \nnfl\n\n").to_stdout
+        expect{MyTodo::Todo.start( %w[search nfl])}.to output("ToDos FOUND: 1\nSearch based on ransack search: body_or_detailed_status_or_tags_name_or_notes_body_cont\n\nID: 1 | Created On: 2016-10-08 | Tags: tag1 | Status:  | Complete: \nnfl\n\n").to_stdout
       end
 
       it 'finds todo items by associated tag' do
-        expect{MyTodo::Todo.start( %w[search tag1])}.to output("ToDos FOUND: 1\n\nID: 1 | Tags: tag1 | Complete: \nnfl\n\n").to_stdout
+        expect{MyTodo::Todo.start( %w[search tag1])}.to output("ToDos FOUND: 1\nSearch based on ransack search: body_or_detailed_status_or_tags_name_or_notes_body_cont\n\nID: 1 | Created On: 2016-10-08 | Tags: tag1 | Status:  | Complete: \nnfl\n\n").to_stdout
       end
 
-      it 'finds todo items by associated notes content' do
-        expect{MyTodo::Todo.start( %w[search note1])}.to output("ToDos FOUND: 1\n\nID: 3 | Tags:  | Complete: \nalways\nNotes:\n1: note1\n\n\n").to_stdout
+      it 'finds todo items by detailed status' do
+        @todo2.update!(detailed_status: 'None')
+        expect{MyTodo::Todo.start( %w[search None])}.to output("ToDos FOUND: 1\nSearch based on ransack search: body_or_detailed_status_or_tags_name_or_notes_body_cont\n\nID: 2 | Created On: 2016-10-08 | Tags:  | Status: None | Complete: \nrocks\n\n").to_stdout
       end
     end
 
     context 'unsuccessful search' do
       it 'returns no results when searching on invalid body' do
-        expect{MyTodo::Todo.start( %w(search no_body))}.to output("ToDos FOUND: 0\n").to_stdout
+        expect{MyTodo::Todo.start( %w(search no_body))}.to output("ToDos FOUND: 0\nSearch based on ransack search: body_or_detailed_status_or_tags_name_or_notes_body_cont\n").to_stdout
       end
     end
   end

data/spec/actions/update_spec.rb

@@ -1,17 +1,25 @@
 require 'spec_helper'
 
 describe MyTodo do
+  def shell
+    @shell ||= Thor::Shell::Basic.new
+  end
+
   describe 'update' do
-    before {@todo = FactoryGirl.create(:item)}
+    before do
+      expect(Thor::LineEditor).to receive(:readline).with("Choose a status for item (1) ", {:default=>1}).and_return("In Progress")
+      @todo = FactoryGirl.create(:item)
+    end
+
     context 'successful update' do
-      before {MyTodo::Todo.start(%W(update --id=#{@todo.id} --body=hello))}
-      subject {@todo.reload.body}
-      it {is_expected.to eq 'hello'}
+      it 'displays the update' do
+        expect{MyTodo::Todo.start(%W[update --id=#{@todo.id} --body=hello])}.to output("0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\nToDo UPDATED!\n\nID: 1 | Created On: 2016-10-08 | Tags:  | Status: None | Complete: \nhello\n\n").to_stdout
+      end
     end
 
     context 'unsuccessful update' do
       it 'returns validation error when body is missing' do
-        expect{MyTodo::Todo.start(%W(update --id=#{@todo.id} --body=))}.to output("Validation failed: Body can't be blank\n").to_stdout
+        expect{MyTodo::Todo.start(%W(update --id=#{@todo.id} --body=))}.to output("0: None\n1: In Progress\n2: Complete\n3: Punted\n4: Waiting Feedback\nValidation failed: Body can't be blank\n").to_stdout
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# code climent must be loaded and started before RAILS_ENV is declared
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 ENV["RAILS_ENV"] = 'test'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'database_cleaner'
@@ -6,8 +9,10 @@ require 'shoulda-matchers'
 require 'byebug'
 require 'my_todo'
 require 'simplecov'
+
 SimpleCov.start
 
+
 DatabaseCleaner.strategy = :truncation
 
 Shoulda::Matchers.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_todo
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Vell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +257,7 @@ files:
 - lib/db/migrate/20160913134552_create_tags.rb
 - lib/db/migrate/20160913134610_create_stubs.rb
 - lib/db/migrate/20161003121448_create_notes.rb
+- lib/db/migrate/20161005133023_add_detailed_status_to_items.rb
 - lib/db/schema.rb
 - lib/db/todos_development.sqlite3
 - lib/db/todos_test.sqlite3