intent 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80e9d9082642b1f2325b40629ff95ffb096cdba644d0f2d5aa2af25541c2d2b
-  data.tar.gz: 90ed06f5afbf84636fbeb70e6fab66a4868dc0d485b751178b2ff31568315237
+  metadata.gz: 1a78826427e690ed80d21f63d75c009a652d8f7e6152250a0259d21af5ec36d2
+  data.tar.gz: 04c84e824a0787fed413ca28155143e407d322a8a5dd4dac76e0a14ee569a790
 SHA512:
-  metadata.gz: a4a23b8d4882af953e2d330c26388c91bb86513c1881192952998f6f74b5f49b682f4b609566ea18b0b6f0ad7517020ac15ccc22ce8756edc001ac5fc25c455b
-  data.tar.gz: cfc14324613fc505a6ec0a591e73f667dd3360b4ec1d8ee7f05d86813fcbaf5e645f12b917579adc6b046223dbc251f665f65b0cd70087dac39d59cc7adfdccf
+  metadata.gz: 61ed11963ba4317356bdfef7d2213fe1f1b2b29153697a34c2d6bd2ce5a09a7f61c12a296c50879909f7f650b556ee7d4f0bce0ce11fc5de891c4a140264f546
+  data.tar.gz: 79ba7a74906c8607edffeafc5d8555afe5853212d47b7253f8d2788567d13e4a843234a3d6934adfc1118315f3ac513e6567a5056aad1748497b73f74babe452

data/intent.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tty-table", "~> 0.12.0"
   spec.add_runtime_dependency "tty-tree", "~> 0.4.0"
   spec.add_runtime_dependency "nanoid", "~> 2.0.0"
+  spec.add_runtime_dependency "paint", "~> 2.3.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/intent/commands/inventory.rb

@@ -35,7 +35,7 @@ module Intent
       private
 
       def inventory_tree
-        pastel = Pastel.new
+        color = ::Intent::UI::TermColor.new
         root = {}
         documents.inventory.boxes.each do |box|
           color_code = case box.tags[:id][0].downcase.to_sym
@@ -46,21 +46,23 @@ module Intent
           else
             :white
           end
-          box_key = "#{pastel.decorate(box.tags[:id], :bold, color_code)} #{box.text}"
+          box_key = "#{color.bold.decorate(box.tags[:id], color_code)} #{box.text}"
           child_items = documents.inventory.items_in(box.tags[:id]).map do |item|
-            "#{pastel.decorate(item.tags[:id], :bold, color_code)} #{item.text}"
+            "#{color.bold.decorate(item.tags[:id], color_code)} #{item.text}"
           end
           root[box_key] = child_items
         end
         root
       end
 
+      # ui format reader
       def inventory_units_of(type)
         documents.inventory.units_of(type).map do |unit|
           [unit.text, unit.tags[:sku]]
         end.to_h
       end
 
+      # ui format reader
       def inventory_unassigned_folders
         folder_types = documents.inventory.units_of(:folder)
         documents.inventory.unassigned_folders.map do |folder|
@@ -69,6 +71,16 @@ module Intent
         end.to_h
       end
 
+      # ui format reader
+      def inventory_assigned_boxes
+        box_types = documents.inventory.units_of(:box)
+        documents.inventory.assigned_boxes.map do |box|
+          unit_label = box_types.find { |f| f.tags[:sku] == box.tags[:sku] } 
+          ["#{box.text} #{box.tags[:id]} (#{unit_label.text})", box.tags[:id]]
+        end.to_h
+      end
+
+      # ui format reader
       def inventory_unassigned_boxes
         box_types = documents.inventory.units_of(:box)
         documents.inventory.unassigned_boxes.map do |box|
@@ -98,6 +110,7 @@ module Intent
 
       def add_folder(args, output)
         skus = inventory_units_of(:folder)
+        projects = documents.projects.all_tokens
         prompt = TTY::Prompt.new
         ref = self
         
@@ -105,12 +118,35 @@ module Intent
           key(:sku).select('sku:', skus, filter: true)
           key(:id).ask('id:', default: ref.generate_id)
           key(:label).ask('label:', default: '[Unlabelled Folder]')
-          key(:active).yes?('is active:')
         end
-        
-        label = item[:active] ? "#{item[:label]} @active" : item[:label]
 
-        documents.inventory.add_folder!(label, item[:id], item[:sku])
+        should_assign_projects = prompt.yes?('assign to projects:')
+
+        if should_assign_projects
+          assigned_projects = prompt.multi_select('projects:', projects, filter: true)
+          label = "#{item[:label]} #{assigned_projects.join(' ')}"
+        else
+          label = item[:label]
+        end
+
+        should_file_in = prompt.select('file in:', {
+          "Active, not in box" => :active,
+          "Unassigned box" => :unassigned,
+          "Assigned project box" => :assigned
+        })
+
+        case should_file_in
+        when :active 
+          label << " @active"
+          in_box = nil
+        when :unassigned
+          in_box = prompt.select('box', inventory_unassigned_boxes)
+        when :assigned
+          # TODO: filter on selected projects only
+          in_box = prompt.select('box:', inventory_assigned_boxes)
+        end
+
+        documents.inventory.add_folder!(label, item[:id], item[:sku], in_box)
       end
 
       def add_box(args, output)
@@ -125,7 +161,7 @@ module Intent
         end
         
         # Repository write pattern
-        documents.inventory.add_box!(label, item[:id], item[:sku])
+        documents.inventory.add_box!(item[:label], item[:id], item[:sku])
 
         # Alternative design
         # noun = create_noun(:box, label, tags)

data/lib/intent/core.rb

@@ -105,14 +105,15 @@ module Intent
         @list.save!
       end
 
-      def add_item!(description, id, type, sku)
+      def add_item!(description, id, type, sku, box=nil)
+        description << " in:#{box}" unless box.nil?
         record = Record.new("#{Date.today} #{description} id:#{id} is:#{type} sku:#{sku}")
         @list.append(record)
         @list.save!
       end
 
-      def add_folder!(description, id, sku)
-        add_item!(description, id, :folder, sku)
+      def add_folder!(description, id, sku, box=nil)
+        add_item!(description, id, :folder, sku, box)
       end
 
       def add_box!(description, id, sku)

data/lib/intent/ui/term_color.rb

@@ -0,0 +1,80 @@
+module Intent
+  module UI
+    # Shim to convert between Pastel to Paint gems
+    # without needing to edit existing call sites.
+    #
+    # It might be helpful to normalize this convention with an API
+    # anyway as we generally want to use the 8/16 colour defaults
+    # as they pick up user terminal customisation properly, whereas
+    # going full 256 or 24 bit colour means generic RGB values are likely
+    # to look shit on customised terminal backgrounds.
+    #
+    # This way we get the benefits of *mostly* sticking to the terminal
+    # defaults, while extending the range of colours with a few carefully
+    # chosen values.
+    class TermColor
+      def initialize
+        @decoration_scope = []
+      end
+
+      def decorate(text, *args)
+        decoration_scope.push(*args)
+        return_decorator(text)
+      end
+
+      def bold(text=nil)
+        decoration_scope.push(:bold)
+        return_decorator(text)
+      end
+
+      def red(text=nil)
+        decoration_scope.push(:red)
+        return_decorator(text)
+      end
+
+      def green(text)
+        decoration_scope.push(:green)
+        return_decorator(text)
+      end
+
+      def blue(text)
+        decoration_scope.push(:blue)
+        return_decorator(text)
+      end
+
+      def yellow(text)
+        decoration_scope.push(:yellow)
+        return_decorator(text)
+      end
+
+      def cyan(text)
+        decoration_scope.push(:cyan)
+        return_decorator(text)
+      end
+
+      def orange(text)
+        decoration_scope.push('orange')
+        return_decorator(text)
+      end
+
+      def brown(text)
+        decoration_scope.push('tan')
+        return_decorator(text)
+      end
+
+      private
+
+      attr_reader :decoration_scope
+
+      def return_decorator(text)
+        if text.nil?
+          self
+        else
+          decorated = Paint[text, *decoration_scope]
+          decoration_scope.clear
+          decorated
+        end
+      end
+    end
+  end
+end

data/lib/intent/version.rb

@@ -1,3 +1,3 @@
 module Intent
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/intent.rb

@@ -1,6 +1,7 @@
 #require 'random'
 require 'todo-txt'
 require 'pastel'
+require 'paint'
 require 'tty-prompt'
 require 'tty-table'
 require 'tty-tree'
@@ -14,6 +15,7 @@ end
 require 'intent/version'
 require 'intent/core'
 require 'intent/commands'
+require 'intent/ui/term_color'
 # require 'intent/todo'
 # require 'intent/review'
 # require 'intent/projects'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intent
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mark Rickerby
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +307,7 @@ files:
 - lib/intent/text/projects.help.txt
 - lib/intent/text/todo.help.txt
 - lib/intent/todo.rb
+- lib/intent/ui/term_color.rb
 - lib/intent/ui/ttyui.rb
 - lib/intent/verbs/add.rb
 - lib/intent/verbs/cite.rb