rnote 0.0.3 → 0.0.4

data/lib/rnote.rb

@@ -24,7 +24,6 @@ rescue LoadError
 end
 
 require 'rnote/version'
-require 'rnote/converter'
 require 'rnote/persister'
 require 'rnote/auth'
 

data/lib/rnote/auth.rb

@@ -118,6 +118,17 @@ module Rnote
     def is_logged_in
       @persister.get_user_token or @persister.get_developer_token
     end
+    
+    # how did we log in? Some features are only available with some login types.
+    def login_type
+      if @persister.get_user_token
+        :user_token
+      elsif @persister.get_developer_token
+        :developer_token
+      else
+        nil
+      end
+    end
 
     def who
       if is_logged_in

data/lib/rnote/cmd/create.rb

@@ -1,7 +1,8 @@
 
 require 'gli'
 
-require 'rnote/edit'
+require 'rnote/noun/note/edit'
+require 'rnote/noun/tag/find'
 
 include GLI::App
 
@@ -14,6 +15,37 @@ Unlike most commands, the command line arguments aren't used in a search.
 Instead any command line arguments provided are used for the title of the new note.
 EOF
 command :create do |verb|
+  
+  d 'create a new tag'
+  verb.command :tag do |noun|
+    
+    # TODO check that the tag doesn't already exist
+    
+    noun.action do |global_options, options, args|
+      
+      if args.length < 1
+        raise "You must provide the tag name."
+      end
+      if args.length > 1
+        raise "You can only provide one tag name to create."
+      end
+      
+      tag_name = args[0]
+      
+      # verify tag doesn't exist
+      if Rnote::Tag.get_tag_by_name(tag_name)
+        raise "tag #{tag_name} already exists"
+      end
+
+      # create the tag
+      tag = Evernote::EDAM::Type::Tag.new()
+      tag.name = tag_name
+      $app.auth.client.note_store.createTag(tag)
+      puts "tag created"
+      
+    end
+    
+  end
 
   d 'create a new note'
   verb.command :note do |noun|

data/lib/rnote/cmd/edit.rb

@@ -1,6 +1,6 @@
 
-require 'rnote/edit'
-require 'rnote/find'
+require 'rnote/noun/note/edit'
+require 'rnote/noun/note/find'
 
 include GLI::App
 

data/lib/rnote/cmd/find.rb

@@ -1,5 +1,5 @@
 
-require 'rnote/find'
+require 'rnote/noun/note/find'
 
 include GLI::App
 

data/lib/rnote/cmd/list.rb

@@ -0,0 +1,19 @@
+
+require 'gli'
+
+include GLI::App
+
+d 'list items in evernote'
+long_desc 'list items such as notes, tags, notebooks, without displaying their content.'
+
+command :list do |verb|
+  
+  d 'list all tags in the account'
+  verb.command :tags do |noun|
+    
+    noun.action do |global_options, options, args|
+      $app.auth.client.note_store.listTags.each { |tag| puts tag.name }
+    end
+    
+  end
+end

data/lib/rnote/cmd/remove.rb

@@ -1,6 +1,7 @@
 
-require 'rnote/find'
 require 'highline/import'
+require 'rnote/noun/note/find'
+require 'rnote/noun/tag/find'
 
 include GLI::App
 
@@ -9,6 +10,23 @@ include GLI::App
 d 'remove a note'
 long_desc "Remove a note, but don't expunge it. The note stays in the users Trash"
 command :remove do |verb|
+  
+  verb.desc 'remove a tag (expunge, but not truly delete)'
+  verb.command :tag do |noun|
+    
+    noun.action do |global_options, options, args|
+      
+      if $app.auth.login_type != :developer_token
+        raise "Only a developer token has the expunge permisisons necessary to delete a tag. A user/password cannot delete tags."
+      end
+      
+      tag_name = args[0]
+      tag = Rnote::Tag.get_tag_by_name(tag_name)
+      $app.auth.client.note_store.expungeTag(tag.guid)
+      
+    end
+    
+  end
 
   verb.desc 'remove a note'
   verb.command :note do |noun|

data/lib/rnote/cmd/rename.rb

@@ -0,0 +1,45 @@
+
+require 'gli'
+
+require 'rnote/noun/tag/find'
+
+include GLI::App
+
+d 'rename an item in evernote'
+long_desc <<EOF
+Rename a tag, notebook or a note without change the content or other details of the note
+
+Note that for notes this can also be acheived simply by editing the note. Or running:
+
+$ rnote edit note --title "old note title" --set-title "new note title" --no-editor
+EOF
+
+command :rename do |verb|
+  
+  verb.desc 'rename a tag'
+  verb.command :tag do |noun|
+    
+    noun.action do |global_options,options,args|
+
+      old_tag_name = args[0]
+      new_tag_name = nil
+      if args.length < 2
+        raise "not enough arguments, must specify both old and new tag name"
+      elsif args.length == 2
+        new_tag_name = args[1]
+      elsif args.length == 3 and args[1] == 'to'
+        new_tag_name = args[2]
+      else
+        raise "too many arguments"
+      end
+      
+      tag = Rnote::Tag.get_tag_by_name(old_tag_name)
+      
+      tag.name = new_tag_name
+      $app.auth.client.note_store.updateTag(tag)
+      
+    end
+    
+  end
+  
+end

data/lib/rnote/cmd/show.rb

@@ -1,5 +1,5 @@
 
-require 'rnote/find'
+require 'rnote/noun/note/find'
 
 include GLI::App
 

data/lib/rnote/{converter.rb → noun/note/converter.rb}

@@ -1,7 +1,6 @@
 
 require 'nokogiri'
 require 'yaml'
-
 require 'evernote-thrift'
 
 
@@ -28,14 +27,21 @@ class Evernote::EDAM::Type::Note
   # the kind its own editors create. Which doesn't involve much nesting.
   class EnmlDocument < Nokogiri::XML::SAX::Document # Nokogiri SAX parser
     
-    attr_accessor :_txt, :in_div, :in_pre
+    attr_accessor :_txt, :nested_div_count, :in_pre, :in_ul, :in_ol, :next_number
 
     def initialize
       @_txt = ''
-      @in_div = false
       @in_pre = false
+      @next_number = 1
+      @in_ul = false
+      @in_ol = false
+      @nested_div_count = 0
       super
     end
+
+    def in_div
+      nested_div_count > 0
+    end
     
     def characters string
       
@@ -50,14 +56,27 @@ class Evernote::EDAM::Type::Note
       case name
         when 'en-todo'
           if Hash[attrs]['checked'] == 'true'
-            self._txt << '[X]'
+            self._txt << '[X] '
           else
-            self._txt << '[ ]'
+            self._txt << '[ ] '
           end
         when 'div'
-          self.in_div = true
+          self.nested_div_count += 1
         when 'pre'
           self.in_pre = true
+        when 'ol'
+          self.next_number = 1
+          self.in_ol = true
+        when 'ul'
+          self.next_number = 1
+          self.in_ul = true
+        when 'li'
+          if in_ol
+            self._txt << next_number.to_s + '. '
+            self.next_number += 1
+          elsif in_ul
+            self._txt << '* '
+          end
         else
           # nothing
       end
@@ -66,13 +85,21 @@ class Evernote::EDAM::Type::Note
     def end_element name
       case name
         when 'div'
-          self.in_div = false
+          raise "unmatched <div> tags" if self.nested_div_count <= 0
+          self.nested_div_count -= 1
           # a newline for every div (whether its got a <br> in it or not)
           self._txt << "\n"
         when 'pre'
           self.in_pre = false
         when 'br'
           # ignore it, as its always in a div, and every div will be a newline anyways
+        when 'ul'
+          self.in_ul = false
+        when 'ol'
+          self.in_ol = false
+        when 'li'
+          # unnecessary, as we're in a div, so the other \n is kept
+          # self._txt << "\n"
         else
           # nothing
       end
@@ -108,8 +135,8 @@ class Evernote::EDAM::Type::Note
     txt.gsub!('>','&gt;')
     
     # replace todo items 
-    txt.gsub!('[ ]','<en-todo checked="false"/>')
-    txt.gsub!('[X]','<en-todo checked="true"/>')
+    txt.gsub!('[ ] ','<en-todo/>')
+    txt.gsub!('[X] ','<en-todo checked="true"/>')
     
     # every newline becomes a <div></div>
     # an empty line becomes a <div><br/></div>

data/lib/rnote/{edit.rb → noun/note/edit.rb}

@@ -2,6 +2,7 @@
 require 'highline'
 require 'nokogiri'
 require 'tempfile'
+require_relative 'converter'
 
 class WaitPidTimeout
   

data/lib/rnote/{find.rb → noun/note/find.rb}

@@ -1,7 +1,7 @@
 
 require 'highline/import'
 require 'evernote-thrift'
-require 'rnote/converter'
+require_relative 'converter'
 
 module Rnote
 

data/lib/rnote/noun/tag/find.rb

@@ -0,0 +1,17 @@
+
+module Rnote
+  
+  module Tag
+    
+    def self.get_tag_by_name(tag_name)
+      # TODO Do I really have to search through all tags manually?
+      tags = $app.auth.client.note_store.listTags.select { |tag| tag.name.downcase == tag_name.downcase }
+      if tags.empty?
+        nil
+      else
+        tags.first
+      end
+    end
+  end
+  
+end

data/lib/rnote/version.rb

@@ -1,3 +1,3 @@
 module Rnote
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rnote
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,15 +187,18 @@ files:
 - lib/rnote/cmd/create.rb
 - lib/rnote/cmd/edit.rb
 - lib/rnote/cmd/find.rb
+- lib/rnote/cmd/list.rb
 - lib/rnote/cmd/login.rb
 - lib/rnote/cmd/logout.rb
 - lib/rnote/cmd/remove.rb
+- lib/rnote/cmd/rename.rb
 - lib/rnote/cmd/show.rb
 - lib/rnote/cmd/who.rb
 - lib/rnote/consumer.rb
-- lib/rnote/converter.rb
-- lib/rnote/edit.rb
-- lib/rnote/find.rb
+- lib/rnote/noun/note/converter.rb
+- lib/rnote/noun/note/edit.rb
+- lib/rnote/noun/note/find.rb
+- lib/rnote/noun/tag/find.rb
 - lib/rnote/persister.rb
 - lib/rnote/version.rb
 - lib/rnote.rb