notehub 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a544612171b56a0c9ab74837dea4e5db498504e4
-  data.tar.gz: 98bf9a23ed60343167c8c74cf72807a3c048f6bc
+  metadata.gz: d21b7ea66c163b0650258157c07cfa43d4b30a41
+  data.tar.gz: bb941759f69fba5d103cae574cbbe2a5d86fb71a
 SHA512:
-  metadata.gz: e015bc3ae3039adcc94ee1fb1244f3e76e43595ae9d227c04167a0656b4c7f0935456110557b690c6b55d9002626a48199c212e7483422ee6433e3339c1f1f4e
-  data.tar.gz: 8fab969247db02e5057e345f72b05fc1a3a3f4f9118caccb2e3a8fa98995378b208b278151f9e123393e82491c4420dd35981a53e0e06d945bd9e0fb6259b77a
+  metadata.gz: 390b9c16dad645c7e705ce50254da3746e18235d495674003832c3f9dd56102c3f9cdf8858906700ffd1984167dc55822b6af4d50d9abad5fa4d427f3436e6c2
+  data.tar.gz: c935aa4b6a110b9fd664187cca0ff6b622cbdfdb7367b821e3645d9de6ea70931a19b58e74ab90ee947d9cbd575c2dec0c3cca3d6cf342220047fe7027d507eb

data/bin/notehub

@@ -74,6 +74,7 @@ command :create do |c|
     additional_options[:theme] = options[:theme] ? options[:theme] : nh.default_theme
     additional_options[:font] = options[:font] ? options[:font] : nh.default_font
     additional_options[:header_font] = options[:header] ? options[:header] : nh.default_header_font
+    additional_options[:file] = File.expand_path(options[:f]) if options[:f]
 
     res = nh.new_note(input, options[:p], additional_options)
 
@@ -97,8 +98,57 @@ end
 #   end
 # end
 
+desc 'Create or update from a file'
+arg_name 'file_name'
+command :file do |c|
+  c.action do |global_options,options,args|
+    id = nil
+    input = nil
+    pass = nil
+    notes = nh.notes['notes']
+    notes.each {|k,note|
+      if note.has_key?('file')
+        if File.basename(note['file']) == File.basename(args[0])
+          note['file'] = File.expand_path(args[0])
+          nh.store_note(note)
+          id = note['id']
+          pass = note['pass']
+          input = "use_previous"
+          break
+        end
+      end
+    }
+    if id
+      res = nh.update_note(id, input, pass)
+      if res
+        puts "Note updated"
+      else
+        puts "Error updating note"
+      end
+    else
+      file = File.expand_path(args[0])
+      if File.exists?(file)
+        additional_options = {}
+        additional_options[:theme] = nh.default_theme
+        additional_options[:font] = nh.default_font
+        additional_options[:header_font] = nh.default_header_font
+        additional_options[:file] = File.expand_path(args[0])
+        input = IO.read(file)
+        res = nh.new_note(input, nh.default_password, additional_options)
+        if res
+          puts "Note created"
+        else
+          puts "Error creating note"
+        end
+      else
+        raise "No such file"
+      end
+    end
+  end
+end
+
 desc 'Update a note'
-arg_name 'noteID'
+arg_name 'search_term'
 command :update do |c|
   # TODO: Check note db for password if choosing from list
   c.desc 'ID for note (default: choose from list)'
@@ -113,7 +163,10 @@ command :update do |c|
 
   c.desc 'Read input from file'
   default_value false
-  c.flag [:f,:file]
+  c.flag [:f,:file,'file_name']
+
+  c.desc 'Update from previously used file (re-use)'
+  c.switch [:r,:reuse]
 
   c.desc 'Copy resulting url to clipboard'
   c.switch [:c,:copy]
@@ -125,7 +178,7 @@ command :update do |c|
   c.switch [:s,:short]
 
   c.action do |global_options,options,args|
-    if options[:f]
+    if options[:f] && !options[:r]
       if File.exists?(File.expand_path(options[:f]))
         input = IO.read(File.expand_path(options[:f]))
       else
@@ -133,9 +186,8 @@ command :update do |c|
       end
     elsif options[:P]
       input = %x{pbpaste}
-    elsif args.length > 0 && args[0] != "-"
-      input = args.join(" ")
-    # elsif STDIN.stat.size > 0
+    elsif options[:r]
+      input = "use_previous"
     else
       # puts "Input note text, ^d to submit" unless STDIN.stat.size > 0
       if RUBY_VERSION.to_f > 1.9
@@ -146,13 +198,26 @@ command :update do |c|
     # else
     #   raise "No input or text specified for note"
     end
-    if options[:id]
-      id = options[:id]
-    else
-      note = nh.choose_note
-      raise "Error reading selected note" unless note
-      id = note['id'].strip
+
+    args = args.join(" ").strip
+    note = false
+    notes = nh.notes['notes']
+    if args =~ /\S\/\S/ && args =~ /^[a-z0-9\/\-]+$/
+
+      if notes.has_key? (args)
+        note = notes[args]
+      end
+    end
+
+    unless note
+      puts "Choose a note:"
+      note = nh.choose_note(args)
     end
+
+
+    raise "Error reading selected note" unless note
+    id = note['id'].strip
+
     res = nh.update_note(id, input, options[:p])
     raise "Error updating note" unless res
 
@@ -208,7 +273,8 @@ command :info do |c|
         out += "Created: #{note['stats']['published']}" + "\n"
         out += " Edited: #{note['stats']['edited']}" + "\n" if note['stats'].has_key?('edited')
         out += "  Views: #{note['stats']['views']}" + "\n"
-        out += "     ID: #{note['id']}"
+        out += "     ID: #{note['id']}" + "\n"
+        out += "   File: #{note['file']}" if note.has_key?('file')
       end
       puts out
 

data/lib/notehub/notehub.rb

@@ -161,7 +161,8 @@ class NotehubAPI
         'url' => res['longURL'],
         'short' => res['shortURL'],
         'stats' => note_data['statistics'],
-        'pass' => pass || ""
+        'pass' => pass ? pass : "",
+        'file' => options[:file] ? options[:file] : ""
       }
       store_note(note)
       return note
@@ -175,7 +176,26 @@ class NotehubAPI
   end
 
   def update_note(id, text, pass=false)
-    # TODO: Signature invalid
+    note = @notes['notes'][id]
+    if note.has_key?('file')
+      if text.nil? || text == "use_previous"
+        file = File.expand_path(note['file'])
+        if File.exists?(file)
+          unless text == "use_previous"
+            puts "File: #{file}"
+            res = ask("Read from file? (Y/n) ", String)
+            if res.strip =~ /^y?$/i
+              text = IO.read(file)
+            end
+          else
+            text = IO.read(file)
+          end
+        end
+      end
+    end
+
+    return false unless text
+
     params = {}
     pass ||= @default_password
     # raise "Password required for update" unless pass

data/lib/notehub/version.rb

@@ -1,3 +1,3 @@
 module Notehub
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notehub
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Your Name Here
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake