rnote 0.0.1 → 0.0.2

data/lib/rnote.rb

@@ -14,6 +14,15 @@ rescue LoadError
   RNOTE_SANDBOX_ONLY = false
 end
 
+# load optional production consumer key
+begin
+  require_relative 'rnote/consumer'
+rescue LoadError
+  # ignore
+  PRODUCTION_CONSUMER_KEY = nil
+  PRODUCTION_CONSUMER_SECRET = nil
+end
+
 require 'rnote/version'
 require 'rnote/converter'
 require 'rnote/persister'

data/lib/rnote/auth.rb

@@ -36,13 +36,25 @@ module Rnote
           logout
         end
       end
+
+      ## Consumer Key and Secret provided in published gem.
+      #
+      # we'll use these if the user doesn't provide their own
+      # we do this check here, instead of in Persister,
+      # so we can verify this is only used in production, not sandbox.
+      #
+
+      consumer_key = @persister.get_consumer_key || ( ! sandbox && PRODUCTION_CONSUMER_KEY )
+      raise 'no consumer key to use, please provide one.' unless consumer_key
+      consumer_secret = @persister.get_consumer_secret || ( ! sandbox && PRODUCTION_CONSUMER_SECRET )
+      raise 'no consumer secret to use, please provide one.' unless consumer_secret
       
       ## Get a user key using these crednetials
       
       # this client isn't authorized, and can only request authorization. no api calls.
       auth_client = EvernoteOAuth::Client.new(
-          consumer_key: @persister.get_consumer_key,
-          consumer_secret: @persister.get_consumer_secret,
+          consumer_key: consumer_key,
+          consumer_secret: consumer_secret,
           sandbox: sandbox
       )
 

data/lib/rnote/cmd/login.rb

@@ -42,18 +42,21 @@ command :login do |c|
       puts "login successful using developer key"
     else
       # then fall back to using a username and password
+
+      user = options[:user]
+      password = options[:password]
       
-      if not options[:u]
+      if user.nil?
         answer = ask("Enter your username:  ")
-        options[:u] = answer
+        user = answer.chomp
       end
   
-      if not options[:p]
+      if password.nil?
         answer = ask("Enter your password:  ") { |q| q.echo = 'x' }
-        options[:p] = answer
+        password = answer.chomp
       end
   
-      $app.auth.login_with_password(options[:user],options[:password], options[:sandbox])
+      $app.auth.login_with_password(user,password, options[:sandbox])
       
       # test the login with a harmless api call.
       $app.auth.client.user_store.getUser

data/lib/rnote/consumer.rb

@@ -0,0 +1,3 @@
+
+PRODUCTION_CONSUMER_KEY = 'dragonfax'
+PRODUCTION_CONSUMER_SECRET = '5b110ac7e792579c'

data/lib/rnote/converter.rb

@@ -121,7 +121,7 @@ EOF
   end
   
   def summarize
-    self.txt_content[0..30]
+    self.txt_content.strip.gsub(/\s+/,' ')[0..100]
   end
 
 end

data/lib/rnote/find.rb

@@ -76,7 +76,7 @@ module Rnote
     def display_results(notes)
       inc = 1
       notes.each do |note|
-        puts "#{inc}: #{note.title} - #{note.tagNames.join(', ')}\n#{note.summarize}\n"
+        puts "#{inc}: #{note.title} - #{note.tagNames.join(', ')}\n#{note.summarize}\n\n"
         inc += 1
       end
     end

data/lib/rnote/persister.rb

@@ -6,12 +6,20 @@ SEARCH_FILE = RNOTE_HOME + '/search_cache'
 
 =begin
 
-These files are always YAML.
+# settings and cache files
 
-You can create and modify the rc file, at will.
+These files are all YAML.
 
-You shouldn't touch the auth or search_cache.
-These are auto-generated
+You shouldn't touch the auth or search_cache. These are auto-generated by the tool.
+
+When we add user settings they'll be in an 'rnoterc' file. Which you can create and modify at will.
+But there are no user settings yet.
+
+# cached values
+
+consumer key and secret
+  if a consumer key and secret are provided (as happens in the published gem),
+  then it will be used unless one is provided by the user instead.
 
 =end
 
@@ -148,21 +156,13 @@ EOF
     
     def get_consumer_key
       read_config do |config|
-        if config[:consumer_key].nil?
-          raise "no consumer key saved"
-        else
-          config[:consumer_key]
-        end
+        config[:consumer_key]
       end
     end
     
     def get_consumer_secret
       read_config do |config|
-        if config[:consumer_secret].nil?
-          raise "noc consumer secret saved"
-        else
-          config[:consumer_secret]
-        end
+        config[:consumer_secret]
       end
     end
     

data/lib/rnote/version.rb

@@ -1,3 +1,3 @@
 module Rnote
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rnote
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -192,6 +192,7 @@ files:
 - lib/rnote/cmd/remove.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