goot 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d321c0390af2980c57275fc3421182059657a868
-  data.tar.gz: fde2e5cfe3dea9431aa3d082dcca7fc9cdefbcfd
+  metadata.gz: a8f0e9129328433d6264e17de3e7c7b157d7ef0e
+  data.tar.gz: 54efebf6136144e50a4e33d87720e3f95aa28b88
 SHA512:
-  metadata.gz: 61d0be50d738af5866fbc7632d0e9618f7aa9ffae5b4c7aa5ced9a973f8988e03b655313605eb64eeba521ae4e60358e0f71e69736cb3b265f13bd2e232b9ee8
-  data.tar.gz: ba329e2400ab7a6d57f5155bda7e15d88c5c1604a40cf3a56530ce96f6e66bad8ca273e13569c1dbeaa8a8569ba1666eb2ddfc45d329a2a94eb555cdbcb7a7c5
+  metadata.gz: d942b9b81bccee83186f986c6ffbda570bbc85881fbdfc2187e007969d7c0bd28c4adc890287acc89c52a6c253a31004085c1ac304fe6e6a4fb3eb467da7969c
+  data.tar.gz: df88c243fb7705d5f67bbe88020225c5a6c2eb3a8b49786d9388a1662904f81f0f6ea7d8d9cd8eadbe94ce309699308d8bdab8456d55a1b17b6ddccd1b380484

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'slop'
+gem 'colorize'
+
 # Specify your gem's dependencies in goot.gemspec
 gemspec

data/bin/goot

@@ -5,4 +5,5 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'goot'
 
-GoogleTasks::CLI.start
+API = Goot::GoogleAPI.new
+Goot::CLI.new

data/goot.gemspec

@@ -5,7 +5,7 @@ require 'goot/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'goot'
-  spec.version       = GoogleTasks::VERSION
+  spec.version       = Goot::VERSION
   spec.authors       = ['Conner McDaniel']
   spec.email         = ['connermcd@gmail.com']
   spec.summary       = %q{A command-line interface to Google Tasks das ist goot.}
@@ -19,10 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
 
-  spec.add_runtime_dependency 'thor', '~> 0.19.0'
+  spec.add_runtime_dependency 'slop', '~> 3.6'
+  spec.add_runtime_dependency 'colorize', '~> 0.7'
   spec.add_runtime_dependency 'google-api-client', '~> 0.7'
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rspec', '~> 2.5'
 end

data/lib/goot.rb

@@ -1,4 +1,6 @@
-require 'thor'
+require 'slop'
+require 'colorize'
+require 'readline'
 
 require 'goot/version'
 require 'goot/google_api'

data/lib/goot/cli.rb

@@ -1,140 +1,151 @@
-class GoogleTasks::CLI < Thor
-  include Thor::Actions
-
-  def initialize(*args)
-    super
-    @api = GoogleTasks::GoogleAPI.new
+class Goot::CLI
+  def initialize
+    parse ARGV
+    exit unless ARGV.include? '-i' or ARGV.include? '--interactive'
+    while argv = Readline.readline('> ', true)
+      parse argv.chomp.split(' ')
+    end
   end
 
-  desc 'ls', 'Displays available tasks for a given tasklist'
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def ls
-    tab = '  '
-    depths = {}
-
-    tasklist = @api.get_tasklist(options[:tasklist])
-    tasks = @api.get_tasks(tasklist)
+  def parse(argv)
+    Slop.parse(argv, :help => true) do
+      banner 'Usage: '
+      on :i, :interactive, 'Put goot into interactive mode'
 
-    say tasklist.title, :green
-    tasks.each.with_index do |task, i|
-      next if task.deleted
+      command 'ls' do
+        description 'List tasks, e.g. ls -l1'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts|
+          tab = '  '
+          depths = {}
 
-      status = task.status == 'completed' ? '✓' : '▢'
+          tasklist = API.get_tasklist(get(:list).to_i)
+          tasks = API.get_tasks(tasklist)
 
-      depth = 1
-      depth += depths[task.parent] if depths.include? task.parent
-      depths[task.id] = depth
+          puts tasklist.title.green
+          tasks.each.with_index do |task, i|
+            next if task.deleted
 
-      say "#{tab * depth} #{status} #{i}: #{task.title}"
-      say "#{tab * (depth + 1)} Notes: #{task.notes}", :yellow if task.notes
-    end
-  end
+            status = task.status == 'completed' ? '✓' : '▢'
 
-  desc 'summary', 'Displays all task lists'
-  def summary
-    @api.get_lists.each.with_index do |tasklist, i|
-      say "#{i} #{tasklist.title}"
-    end
-  end
+            depth = 1
+            depth += depths[task.parent] if depths.include? task.parent
+            depths[task.id] = depth
 
-  desc 'toggle INDEX', 'Toggles a given task'
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def toggle(*indices)
-    tasklist = @api.get_tasklist(options[:tasklist])
-    tasks = @api.get_tasks(tasklist).map(&:to_hash)
-
-    indices.each do |index|
-      task = tasks[index.to_i]
-      task['status'] = task['completed'].nil? ? 'completed' : 'needsAction'
-      task.delete 'completed'
-      @api.update_task(tasklist, task)
-
-      toggle_children = lambda do |parent|
-        children = tasks.select { |t| t['parent'] == parent['id'] }
-        children.each do |t|
-          t['status'] = task['status']
-          t.delete 'completed'
-          @api.update_task(tasklist, t)
-          toggle_children.call(t)
+            puts "#{tab * depth} #{status} #{i}: #{task.title}"
+            puts "#{tab * (depth + 1)} Notes: #{task.notes}".yellow if task.notes
+          end
         end
       end
-      toggle_children.call(task)
-    end
-
-    invoke :ls, [], :tasklist => options[:tasklist]
-  end
 
-  desc 'clear', 'Clears completed tasks'
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def clear
-    tasklist = @api.get_tasklist(options[:tasklist])
-    @api.clear_tasks(tasklist)
+      command 's' do
+        description 'Print a summary of all task lists'
+        run do
+          API.get_lists.each.with_index do |tasklist, i|
+            puts "#{i} #{tasklist.title}"
+          end
+        end
+      end
 
-    invoke :ls, [], :tasklist => options[:tasklist]
-  end
+      command 't' do
+        description 'Toggle a task, e.g. t 0 -l1'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts, args|
+          tasklist = API.get_tasklist(opts.to_hash[:list].to_i)
+          tasks = API.get_tasks(tasklist).map(&:to_hash)
+
+          # TODO: check to make sure all args are ints
+          args.each do |index|
+            task = tasks[index.to_i]
+            task['status'] = task['completed'].nil? ? 'completed' : 'needsAction'
+            task.delete 'completed'
+            API.update_task(tasklist, task)
+
+            toggle_children = lambda do |parent|
+              children = tasks.select { |t| t['parent'] == parent['id'] }
+              children.each do |t|
+                t['status'] = task['status']
+                t.delete 'completed'
+                API.update_task(tasklist, t)
+                toggle_children.call(t)
+              end
+            end
+            toggle_children.call(task)
+          end
+        end
+      end
 
-  desc 'delete INDEX', 'Deletes a given task'
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def delete(*indices)
-    tasklist = @api.get_tasklist(options[:tasklist])
-    tasks = @api.get_tasks(tasklist).map(&:to_hash)
+      command 'c' do
+        description 'Clear completed tasks'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts|
+          tasklist = API.get_tasklist(opts.to_hash[:list].to_i)
+          API.clear_tasks(tasklist)
+        end
+      end
 
-    indices.each do |index|
-      @api.delete_task(tasklist, tasks[index.to_i])
-    end
+      command 'd' do
+        description 'Delete a task'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts, args|
+          tasklist = API.get_tasklist(opts.to_hash[:list].to_i)
+          tasks = API.get_tasks(tasklist).map(&:to_hash)
+
+          # TODO: check to make sure all args are ints
+          args.each do |index|
+            API.delete_task(tasklist, tasks[index.to_i])
+          end
+        end
+      end
 
-    invoke :ls, [], :tasklist => options[:tasklist]
-  end
+      command 'm' do
+        description 'Move a task within its list'
+        on :a=, :after=,  'Move task after specified index'
+        on :p=, :parent=, 'Make task a child of parent index'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts, args|
+          tasklist = API.get_tasklist(opts.to_hash[:list].to_i)
+          tasks = API.get_tasks(tasklist).map(&:to_hash)
 
-  desc 'move INDEX', 'Moves a given task'
-  method_option :after, :aliases => '-a', :type => :numeric
-  method_option :parent, :aliases => '-p', :type => :numeric
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def move(index)
-    tasklist = @api.get_tasklist(options[:tasklist])
-    tasks = @api.get_tasks(tasklist).map(&:to_hash)
+          previous = tasks[opts.to_hash[:after].to_i] if !opts.to_hash[:after].nil?
+          parent = tasks[opts.to_hash[:parent].to_i] if !opts.to_hash[:parent].nil?
 
-    previous = tasks[options[:after].to_i] if !options[:after].nil?
-    parent = tasks[options[:parent].to_i] if !options[:parent].nil?
+          API.move_task(tasklist, tasks[args[0].to_i], previous, parent)
+        end
+      end
 
-    @api.move_task(tasklist, tasks[index.to_i], previous, parent)
+      command 'a' do
+        description 'Add a task'
+        on :a=, :after=,  'Move task after specified index'
+        on :p=, :parent=, 'Make task a child of parent index'
+        on :l=, :list=, 'Specify a tasklist', :default => 0
+        run do |opts, args|
+          tasklist = API.get_tasklist(opts.to_hash[:tasklist].to_i)
+          tasks = API.get_tasks(tasklist).map(&:to_hash)
 
-    invoke :ls, [], :tasklist => options[:tasklist]
-  end
+          task = { :title => args[0] }
 
-  desc 'add NAME', 'Adds a task'
-  method_option :after, :aliases => '-a', :type => :numeric
-  method_option :parent, :aliases => '-p', :type => :numeric
-  method_option :tasklist, :aliases => '-l', :type => :numeric, :default => 0
-  def add(*names)
-    tasklist = @api.get_tasklist(options[:tasklist])
-    tasks = @api.get_tasks(tasklist).map(&:to_hash)
+          previous = tasks[opts.to_hash[:after].to_i] if !opts.to_hash[:after].nil?
+          parent = tasks[opts.to_hash[:parent].to_i] if !opts.to_hash[:parent].nil?
 
-    names.each do |name|
-      task = { :title => name }
+          API.insert_task(tasklist, task, previous, parent)
+        end
+      end
 
-      previous = tasks[options[:after].to_i] if !options[:after].nil?
-      parent = tasks[options[:parent].to_i] if !options[:parent].nil?
+      command 'la' do # (name)
+        description 'Add a task list'
+        run do |_, args|
+          tasklist = { :title => args[0] }
+          API.insert_tasklist(tasklist)
+        end
+      end
 
-      @api.insert_task(tasklist, task, previous, parent)
+      command 'ld' do # (index)
+        description 'Delete a task list'
+        run do |_, args|
+          API.delete_tasklist(API.get_lists[args[0].to_i])
+        end
+      end
     end
-
-    invoke :ls, [], :tasklist => options[:tasklist]
-  end
-
-  desc 'listadd NAME', 'Adds a new tasklist'
-  def listadd(name)
-    tasklist = {:title => name}
-    @api.insert_tasklist(tasklist)
-
-    invoke :summary, []
   end
-
-  desc 'listdelete INDEX', 'Deletes a tasklist'
-  def listdelete(index)
-    @api.delete_tasklist(@api.get_lists[index.to_i])
-
-    invoke :summary, []
-  end
-
 end

data/lib/goot/google_api.rb

@@ -3,10 +3,10 @@ require 'google/api_client/client_secrets'
 require 'google/api_client/auth/file_storage'
 require 'google/api_client/auth/installed_app'
 
-class GoogleTasks::GoogleAPI
+class Goot::GoogleAPI
 
-  CREDENTIAL_STORE = File.join(GoogleTasks::CONFIG_DIR, 'gtasks-oauth2.json')
-  CLIENT_SECRET_STORE = File.join(GoogleTasks::GEM_ROOT, 'data', 'client_secrets.json')
+  CREDENTIAL_STORE = File.join(Goot::CONFIG_DIR, 'gtasks-oauth2.json')
+  CLIENT_SECRET_STORE = File.join(Goot::GEM_ROOT, 'data', 'client_secrets.json')
 
   UNCHANGED = 0
   MODIFIED = 1
@@ -14,8 +14,8 @@ class GoogleTasks::GoogleAPI
 
   def initialize
     client = Google::APIClient.new(
-      :application_name => GoogleTasks::APP_NAME,
-      :application_version => GoogleTasks::VERSION
+      :application_name => Goot::APP_NAME,
+      :application_version => Goot::VERSION
     )
 
     file_storage = Google::APIClient::FileStorage.new(CREDENTIAL_STORE)

data/lib/goot/version.rb

@@ -1,6 +1,6 @@
-module GoogleTasks
+module Goot
   APP_NAME = 'goot'
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   GEM_ROOT = File.expand_path('../../..', __FILE__)
   CONFIG_DIR = File.join(ENV['HOME'], '.goot')

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: goot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Conner McDaniel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,61 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: pry
-  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'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.5'
 description: A command-line interface to Google Tasks das ist goot.
 email:
 - connermcd@gmail.com