RubyGems - my_todo - Versions diffs - 3.1.1 → 4.0.0.pre1 - Mend

my_todo 3.1.1 → 4.0.0.pre1

Files changed (46) hide show

checksums.yaml +5 -5
data/README.md +63 -50
data/Rakefile +3 -0
data/bin/{my_todo → mytodo} +1 -1
data/{lib/db → db}/config.yml +3 -3
data/{lib/db → db}/migrate/20160912172429_create_items.rb +2 -2
data/{lib/db → db}/migrate/20160913134552_create_tags.rb +1 -1
data/{lib/db → db}/migrate/20160913134610_create_stubs.rb +1 -1
data/{lib/db → db}/migrate/20161003121448_create_notes.rb +1 -1
data/{lib/db → db}/migrate/20161005133023_add_detailed_status_to_items.rb +1 -1
data/db/migrate/20161220143613_add_default_to_item_done.rb +5 -0
data/{lib/db → db}/schema.rb +6 -14
data/lib/my_todo.rb +4 -114
data/lib/my_todo/ar_base.rb +3 -2
data/lib/my_todo/models/item.rb +4 -0
data/lib/my_todo/modules/actions.rb +129 -0
data/lib/my_todo/modules/finders.rb +5 -3
data/lib/my_todo/modules/my_todo_actions.rb +7 -6
data/lib/my_todo/modules/templates.rb +1 -0
data/lib/my_todo/templates/item.erb +6 -2
data/lib/my_todo/templates/list.erb +3 -1
data/lib/my_todo/templates/notes.erb +8 -5
data/lib/my_todo/templates/results.erb +7 -1
data/lib/my_todo/templates/standalone_migrations.yml.erb +4 -4
data/lib/my_todo/version.rb +1 -1
data/lib/setup.rb +2 -2
data/my_todo.gemspec +19 -17
data/spec/actions/create_spec.rb +17 -15
data/spec/actions/delete_spec.rb +10 -4
data/spec/actions/list_spec.rb +6 -5
data/spec/actions/note_spec.rb +9 -7
data/spec/actions/notes_spec.rb +6 -7
data/spec/actions/rm_note_spec.rb +7 -8
data/spec/actions/rm_tag_spec.rb +9 -8
data/spec/actions/search_spec.rb +12 -13
data/spec/actions/tag_spec.rb +12 -10
data/spec/actions/update_spec.rb +5 -6
data/{lib → spec}/db/todos_test.sqlite3 +0 -0
data/spec/models/item_spec.rb +1 -1
data/spec/models/stub_spec.rb +6 -6
data/spec/spec_helper.rb +19 -5
metadata +89 -76
data/.standalone_migrations +0 -6
data/lib/db/migrate/20161220143613_add_default_to_item_done.rb +0 -5
data/lib/db/todos_development.sqlite3 +0 -0
data/lib/my_todo/db/todos_test.sqlite3 +0 -0

@@ -5,9 +5,10 @@ module ArBase
   # Set path based on bin/my_todo
   path = case ENV['RAILS_ENV']
   when 'development'
-    "#{__dir__}/../db/todos_development.sqlite3"
+    "#{__dir__}/../../db/todos_development.sqlite3"
   when 'test'
-    "#{__dir__}/../db/todos_test.sqlite3"
+    # "#{__dir__}/../db/todos_test.sqlite3"
+    "#{__dir__}/../../spec/db/todos_test.sqlite3"
   else
     File.expand_path("#{`echo $HOME`.chomp}/.my_todo/data/todos_production.sqlite3", __FILE__)
   end

data/lib/my_todo/models/item.rb CHANGED

@@ -29,4 +29,8 @@ class Item < ActiveRecord::Base
   def update_done
     self.done = true if COMPLETE_STATUSES.include? self.detailed_status
   end
+  def done?
+    self.done == true ? 'Yes' : 'No'
+  end
 end

data/lib/my_todo/modules/actions.rb ADDED

@@ -0,0 +1,129 @@
+module MyTodo
+  module Actions
+    def self.included(thor)
+      thor.class_eval do
+        desc 'list <STATUS>', 'List todo items. Default: undone, [all], [done], [undone]'
+        def list(status='undone')
+          @status = status
+          print_list
+        end
+        desc "create \"<BODY>\" <TAGS> [Default: general]>", 'Create a todo item with optional and tags'
+        def create(body, *tags)
+          @body = body
+          @tags = tags.any? ? tags : %w[Default]
+          begin
+            create_item
+            print_item
+          rescue ActiveRecord::RecordInvalid => e
+            say e.message
+          end
+        end
+        desc 'update <ID> "<BODY>" <DONE>', 'Update a todo item'
+        def update(id, body=nil, done=nil)
+          @item = Item.find_by_id(id)
+          @body = body.nil? ? @item.body : body
+          @done = done.nil? ? @item.done : done
+          begin
+            update_item
+            print_item
+          rescue ActiveRecord::RecordInvalid => e
+            say e.message
+          end
+        end
+        desc 'delete <ID>', 'Destroy a todo item'
+        # option :id, required: true
+        def delete(id)
+          @item = Item.find_by_id(id)
+          begin
+            item.destroy!
+            say 'Item Deleted'
+          rescue StandardError => e
+            say e.message
+          end
+        end
+        desc 'search "<TEXT>"', 'Find a todo by item body, tag name, status or note body'
+        def search(text="")
+          @text = text
+          @items = Item.ransack(body_or_detailed_status_or_tags_name_or_notes_body_cont: @text).result
+          print_search_results
+        end
+        desc 'tag <ID> <TAGS>', 'Add tags to a todo item'
+        def tag(id, *tags)
+          @item = Item.find_by_id(id)
+          begin
+            if tags.any?
+              @banner = "Tags added to todo #{@item.id}"
+              tags.each {|tag| @item.tags.create!(name: tag)}
+              @item = @item.reload
+              print_item
+            end
+          rescue StandardError => e
+            say e.message
+          end
+        end
+        desc 'rm_tag <ID>  <TAGS>', 'Remove tags from a todo item'
+        def rm_tag(id, *tags)
+          @item = Item.find_by_id(id)
+          begin
+            if tags.any?
+              @banner = "Tags removed from item #{@item.id}"
+              @item.tags.where(name: tags).destroy_all
+              print_item
+            end
+          rescue StandardError => e
+            say e.message
+          end
+        end
+        desc 'note <ID> "<TEXT>"', 'Adds note to a todo item'
+        def note(id, text="")
+          @item = Item.find_by_id(id)
+          begin
+            @item.notes.create(body: text) unless text.empty?
+            print_notes
+          rescue StandardError => e
+            say e.message
+          end
+        end
+        desc 'rm_note <ID> <NOTE_IDS>', 'Remove notes from todo item'
+        def rm_note(id, *note_ids)
+          @item = Item.find_by_id(id)
+          begin
+            @banner = "Note removed from item: #{@item.id}"
+            @item.notes.where(id: note_ids).destroy_all
+            print_item
+          rescue StandardError => e
+            say e.message
+          end
+        end
+        desc 'notes <ID>', 'Display notes for a todo item'
+        def notes(id)
+          @item = Item.find_by_id(id)
+          begin
+            print_notes
+          rescue StandardError => e
+            say e.message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/my_todo/modules/finders.rb CHANGED

@@ -1,6 +1,6 @@
 module Finders
   def item
-    @item ||= Item.where(id: options[:id]).first
+    @item ||= Item.find_by_id(@id)
   end
   def item_notes
@@ -8,13 +8,15 @@ module Finders
   end
   def all_items
-    @items = case options[:status]
+    @items = case @status
             when 'all'
               Item.all
             when 'done'
               Item.where(done: true)
-            else
+            when 'undone'
               Item.where(done: false)
+            else
+              say 'Unknown status!'
             end
   end

data/lib/my_todo/modules/my_todo_actions.rb CHANGED

@@ -4,16 +4,17 @@ module MyTodoActions
     @status = ask("Choose a status for item", default: set_default_status)
   end
-  def create_item(options)
-    @item = Item.new(options.except(:tags))
+  def create_item
+    @banner = 'Item Created'
+    @item = Item.new(body: @body)
     assign_detailed_status
     @item.save!
     set_tags
   end
-  def update_item(options)
-    item.assign_attributes(options)
-    @item = item #Find a better way!!!!
+  def update_item
+    @banner = 'Item Updated'
+    @item.assign_attributes(body: @body, done: @done)
     assign_detailed_status
     item.save!
   end
@@ -24,7 +25,7 @@ module MyTodoActions
   end
   def set_tags
-    options[:tags].split(' ').each{|tag| @item.tags.create(name: tag) } if options[:tags]
+   @tags.each{|tag| @item.tags.create(name: tag) } if @tags
   end
   def set_default_status

data/lib/my_todo/modules/templates.rb CHANGED

@@ -1,5 +1,6 @@
 module Templates
   def print_list
+    all_items
     say ERB.new(File.read("#{__dir__}/../templates/list.erb"), nil, '-').result(binding)
   end

data/lib/my_todo/templates/item.erb CHANGED

@@ -1,2 +1,6 @@
-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 %>
+<%= @banner %>
+id: <%= @item.id %>     notes: <%= @item.notes.size %>     tags: <%= @item.tags.map(&:name).join(', ') %>
+created: <%= @item.created_at.strftime("%Y-%m-%d") %>     status: <%= @item.detailed_status %> (done: <%= @item.done? %>)
+<%= @item.body %>

data/lib/my_todo/templates/list.erb CHANGED

@@ -1,6 +1,8 @@
+Items Found: <%= @items.count %>
 <% @items.each do |item| -%>
-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 %> | Notes: <%= item.notes.size %>
+id: <%= item.id %>     notes: <%= item.notes.size %>     tags: <%= item.tags.map(&:name).join(', ') %>
+created: <%= item.created_at.strftime("%Y-%m-%d") %>     status: <%= item.detailed_status %> (done: <%= item.done? %>)
 <%= item.body %>
 <%= '*' * 100 %>

data/lib/my_todo/templates/notes.erb CHANGED

@@ -1,9 +1,12 @@
-<% if item_notes.any? -%>
-Notes for <%= item.id %>: <%= item.body %>
-<% item_notes.each do |note| -%>
-ID: <%= note.id %> | Created On: <%= note.created_at.strftime("%Y-%m-%d")%>
+<% if @item.notes.any? -%>
+notes for item <%= @item.id %>: <%= @item.body %>
+<% @item.notes.each do |note| -%>
+id: <%= note.id %>
+created: <%= note.created_at.strftime("%Y-%m-%d")%>
 <%= note.body %>
 <% end %>
 <% else -%>
-No Notes for item <%= item.id %>
+No Notes for item <%= @item.id %>
 <% end %>

data/lib/my_todo/templates/results.erb CHANGED

@@ -1,6 +1,12 @@
+Items Found: <%= @items.count %>
+Search Text: <%= @text %>
 <% @items.each do |item| -%>
-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 %> | Notes: <%= item.notes.count %>
+id: <%= item.id %>     notes: <%= item.notes.size %>     tags: <%= item.tags.map(&:name).join(', ') %>
+created: <%= item.created_at.strftime("%Y-%m-%d") %>     status: <%= item.detailed_status %> (done: <%= item.done? %>)
 <%= item.body %>
 <% if item.notes.any? -%>

data/lib/my_todo/templates/standalone_migrations.yml.erb CHANGED

@@ -1,6 +1,6 @@
 db:
-    seeds: <%= GEM_DIR %>/lib/db/seeds.rb
-    migrate: <%= GEM_DIR %>/lib/db/migrate
-    schema: <%= GEM_DIR %>/lib/db/schema.rb
+    seeds: <%= GEM_DIR %>/db/seeds.rb
+    migrate: <%= GEM_DIR %>/db/migrate
+    schema: <%= GEM_DIR %>/db/schema.rb
 config:
-    database: <%= GEM_DIR %>/lib/db/config.yml
+    database: <%= GEM_DIR %>/db/config.yml

data/lib/my_todo/version.rb CHANGED

@@ -1,3 +1,3 @@
 module MyTodo
-  VERSION = "3.1.1"
+  VERSION = "4.0.0.pre1"
 end

data/lib/setup.rb CHANGED

@@ -16,11 +16,11 @@ class Setup < Thor
       `mkdir -p #{HOME_DIR}/.my_todo/data`
       say "Created .my_todo in #{HOME_DIR}"
     end
-    template "config.yml.erb", "#{__dir__}/../lib/db/config.yml", force: true
+    template "config.yml.erb", "#{GEM_DIR}/db/config.yml", force: true
   end
   desc 'standard_migrations_override', 'Generate SM override file'
   def standard_migrations_override
-    template "standalone_migrations.yml.erb", "#{__dir__}/../.standalone_migrations", force: true
+    template "standalone_migrations.yml.erb", "#{GEM_DIR}/.standalone_migrations", force: true
   end
 end

data/my_todo.gemspec CHANGED

@@ -14,28 +14,30 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/vmcilwain/my_todo"
   spec.license       = "MIT"
-  spec.files         = Dir["{bin,lib}/**/*", "LICENSE.txt", "README.md", ".standalone_migrations", 'Rakefile', 'Gemfile', 'my_todo.gemspec']
+  spec.files         = Dir["{bin,lib,db}/**/*", "LICENSE.txt", "README.md", 'Rakefile', 'Gemfile', 'my_todo.gemspec']
   spec.test_files    = Dir["spec/**/*"]
   spec.bindir        = "bin"
-  spec.executables   = ['my_todo']
+  spec.executables   = ['mytodo']
   spec.require_paths = ["lib"]
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "factory_girl_rails", "~> 4.7.0"
-  spec.add_development_dependency "database_cleaner", "~> 1.5.3"
-  spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
-  spec.add_development_dependency 'byebug', '~> 9.0.5'
+  spec.add_development_dependency "rspec", "~> 3.8.0"
+  spec.add_development_dependency "factory_bot_rails", "~> 4.11.1"
+  spec.add_development_dependency "database_cleaner", "~> 1.7.0"
+  spec.add_development_dependency 'shoulda-matchers', '~> 3.1.2'
+  spec.add_development_dependency 'byebug', '~> 10.0.2'
   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'
-  spec.add_dependency 'standalone_migrations', '~> 5.0.0'
-  spec.add_dependency 'sqlite3', '~> 1.3.11'
-  spec.add_dependency 'ransack', '~> 1.8.2'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'faker'
+  spec.add_development_dependency 'rubocop-rspec'
+  # spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_dependency "bundler", "~> 1.16.0"
+  spec.add_dependency "rake", "~> 12.3.1"
+  spec.add_dependency 'activerecord', '~> 5.2.1'
+  spec.add_dependency 'activesupport', '~> 5.2.1'
+  spec.add_dependency 'thor', '~> 0.20.0'
+  spec.add_dependency 'standalone_migrations', '~> 5.2.6'
+  spec.add_dependency 'sqlite3', '~> 1.3.13'
+  spec.add_dependency 'ransack', '~> 2.0.1'
   spec.metadata["yard.run"] = "yri"
   spec.post_install_message = "Don't forget to migrate the db. `my_todo rake db:migrate`"

data/spec/actions/create_spec.rb CHANGED

@@ -6,9 +6,10 @@ describe MyTodo do
   end
   describe 'create' do
-    before do
-      expect(Thor::LineEditor).to receive(:readline).with("Choose a status for item (1) ", {:default=>1}).and_return("")
-    end
+    let(:body) {Faker::Lorem.words(5).join("\s")}
+    let(:statuses) {"0: None\n1: In Progress\n2: Waiting Feedback\n3: Complete\n4: Punted"}
+    before {expect(Thor::LineEditor).to receive(:readline).with("Choose a status for item (1) ", {default:1}).and_return("")}
     context 'successful creation' do
       describe 'creation without tags or setting done attribute' do
@@ -17,46 +18,47 @@ describe MyTodo do
         end
         it 'creates a todo item' do
-          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text))}.to change{Item.count}.by(1)
+          expect{MyTodo::Todo.start(['create', body])}.to change{Item.count}.by(1)
         end
         it "sets tags to 'default' when tags option is not present" do
-          MyTodo::Todo.start(%w[create --body=wierdness_of_text])
+          MyTodo::Todo.start(['create', body])
           todo = Item.last
-          expect(todo.tags.map(&:name)).to eq ['default']
+          expect(todo.tags.map(&:name)).to eq ['Default']
         end
         it 'sets done to false by when done option is not present' do
-          MyTodo::Todo.start(%w[create --body=wierdness_of_text])
+          MyTodo::Todo.start(['create', body])
           todo = Item.last
           expect(todo.done).to eq false
         end
         it 'displays the created todo item' do
-          expect{MyTodo::Todo.start(%w(create --body=wierdness_of_text))}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Waiting Feedback\n3: Complete\n4: Punted\nID: 1 | Created On: #{Date.today} | Tags: default | Status: In Progress | Complete: false\nwierdness_of_text\n").to_stdout
+          expect{MyTodo::Todo.start(['create', body])}.to output("#{statuses}\nItem Created\n\nid: 1     notes: 0     tags: Default\ncreated: #{Date.today}     status: In Progress (done: No)     \n\n#{body}\n").to_stdout
         end
       end
       describe 'creation with tags and without setting done attribute' do
         it 'creates associated tag' do
-          expect{MyTodo::Todo.start(%w[create --body=wierdness_of_text --tags=tag1])}.to change{Tag.count}.by(1)
+          expect{MyTodo::Todo.start(['create', body, 'tag1'])}.to change{Tag.count}.by(1)
         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!\n0: None\n1: In Progress\n2: Waiting Feedback\n3: Complete\n4: Punted\nID: 1 | Created On: #{Date.today} | Tags: tag1 | Status: In Progress | Complete: false\nwierdness_of_text\n").to_stdout
+          expect{MyTodo::Todo.start(['create', body, 'tag1'])}.to output("#{statuses}\nItem Created\n\nid: 1     notes: 0     tags: tag1\ncreated: #{Date.today}     status: In Progress (done: No)     \n\n#{body}\n").to_stdout
         end
       end
-      describe 'create with tags' do
-        it 'displays the created to item with complete set to true' do
-          expect{MyTodo::Todo.start(%w[create --body=wierdness_of_text])}.to output("ToDo CREATED!\n0: None\n1: In Progress\n2: Waiting Feedback\n3: Complete\n4: Punted\nID: 1 | Created On: #{Date.today} | Tags: default | Status: In Progress | Complete: false\nwierdness_of_text\n").to_stdout
+      describe 'create a completed item' do
+        xit 'displays the created to item with complete set to true', 'look into being able to set this option again' do
+          expect{MyTodo::Todo.start(['create', body])}.to output("#{statuses}\nItem Created\n\nid: 1     notes: 0     tags: Default\ncreated: #{Date.today}     status: In Progress (done: Yes)     \n\n#{body}\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("ToDo CREATED!\n0: None\n1: In Progress\n2: Waiting Feedback\n3: Complete\n4: Punted\nValidation failed: Body can't be blank\n").to_stdout
+      xit 'returns error message when body is missing', 'look into being able to set this option again' do
+        expect{MyTodo::Todo.start(['create'])}.to output("ERROR: \"my_todo create\" was called with no arguments\n
+Usage: \"my_todo create \"<BODY>\" <TAGS> [Default: general]>\"").to_stdout
       end
     end
   end

data/spec/actions/delete_spec.rb CHANGED

@@ -2,14 +2,20 @@ require 'spec_helper'
 describe MyTodo do
   describe 'delete' do
-    before {@todo = FactoryGirl.create(:item)}
+    let(:todo) {FactoryBot.create(:item)}
+    before {todo}
     it 'destroys todo item' do
-      expect{MyTodo::Todo.start(%W(delete --id=#{@todo.id}))}.to change{Item.count}.by(-1)
+      expect{MyTodo::Todo.start(['delete', todo.id])}.to change{Item.count}.by(-1)
     end
     it 'returns nil exception if todo item is invalid' do
-      expect{MyTodo::Todo.start(%W[delete --id=#{@todo.id + 1}])}.to output("undefined method `destroy!' for nil:NilClass\n").to_stdout
+      expect{MyTodo::Todo.start(['delete', todo.id + 1])}.to output("undefined method `destroy!' for nil:NilClass\n").to_stdout
+    end
+    it 'displays a notice' do
+      expect{MyTodo::Todo.start(['delete', todo.id])}.to output("Item Deleted\n").to_stdout
     end
   end
 end