evernotable 1.0.0 → 1.0.1

data/lib/evernotable/cli.rb

@@ -7,7 +7,7 @@ class Evernotable::CLI
   def self.start(*args)
     command = args.shift.strip rescue "help"
     Evernotable::Command.load
-    Evernotable::Command.run(command, args)
+    Evernotable::Command.run(command, args, :production)
   end
 
 end

data/lib/evernotable/client/base.rb

@@ -3,12 +3,12 @@ require 'evernotable/client'
 require 'yaml'
 
 class Evernotable::Client::Base 
-  attr_reader :config
   attr_reader :current_user
   attr_reader :client_token
   
   def initialize(params={})
     @config = params[:config] || nil
+    @env = params[:env]
     @current_user = params[:current_user] || nil
     @client_token = params[:client_token] || nil
   end

data/lib/evernotable/client/note.rb

@@ -7,7 +7,7 @@ class Evernotable::Client::Note < Evernotable::Client::Base
   
   def initialize(params={})
     super(params)
-    @api = @config["note_api"]["sandbox"] #TODO: variablize the api env
+    @api = @config["note_api"][@env] 
     @notebook_name = @config["notebook"]["name"]
     @notebook_guid = nil
     @instance = Evernote::NoteStore.new("#{@api}#{params[:user_shard]}")

data/lib/evernotable/client/user.rb

@@ -4,7 +4,7 @@ class Evernotable::Client::User < Evernotable::Client::Base
   
   def initialize(params={})
     super
-    api = @config["user_api"]["sandbox"] #TODO: variablize the api env
+    api = @config["user_api"][@env] 
     @instance = Evernote::UserStore.new(api, {:username => params[:user], :password => params[:password], :consumer_key => @config["api_credentials"]["consumer_key"], :consumer_secret => @config["api_credentials"]["consumer_secret"]})
   end
   

data/lib/evernotable/command.rb

@@ -24,7 +24,7 @@ module Evernotable
        @@commands.include?(cmd)
     end
 
-    def self.run(cmd, arguments=[])
+    def self.run(cmd, arguments=[], env=:sandbox)
       if cmd.nil? || cmd.empty? 
         output_with_bang("Use *evernotable help* for additional information.")
         exit(1)
@@ -36,7 +36,7 @@ module Evernotable
       else
         #instantiate command and invoke method on it
         method = arguments.shift || :help
-        obj = eval("Evernotable::Command::#{cmd.capitalize}").new(arguments)
+        obj = eval("Evernotable::Command::#{cmd.capitalize}").new(arguments, env)
         obj.send(method)
       end
     rescue CommandFailed => ex

data/lib/evernotable/command/base.rb

@@ -7,15 +7,16 @@ class Evernotable::Command::Base
   
   include Evernotable::Utilities
   
-  def initialize(params=[])
+  def initialize(params=[], env=:sandbox)
     @config = YAML.load(File.read('lib/evernotable_config.yml'))
+    @env = env.to_s
     @args = params.map {|p| p.strip}
     @highline = HighLine.new
   end
   
   def authenticate_user(user=[])
     user = read_from_file(credentials_file).split('/') if user.empty?
-    @user_client = Evernotable::Client::User.new({:user => user.first, :password => user.last, :config => @config})
+    @user_client = Evernotable::Client::User.new({:user => user.first, :password => user.last, :config => @config, :env => @env})
     begin
       @user_client.authenticate
     rescue Evernotable::Client::ClientException => ex
@@ -25,7 +26,7 @@ class Evernotable::Command::Base
   
   def note_client
     authenticate_user
-    Evernotable::Client::Note.new({:user_shard => @user_client.current_user.shardId, :client_token => @user_client.client_token, :config => @config})
+    Evernotable::Client::Note.new({:user_shard => @user_client.current_user.shardId, :client_token => @user_client.client_token, :config => @config, :env => @env})
   end
   
   def invoke_client

data/lib/evernotable/command/task.rb

@@ -4,22 +4,34 @@ class Evernotable::Command::Task < Evernotable::Command::Base
   
   def add
     invoke_client do
-      note_client.add_note(@args.first)
-      display 'Done.'
+      unless @args.empty?
+        note_client.add_note(@args.first)
+        display 'Done.'
+      else
+        display 'Nothing to add!'
+      end
     end
   end
 
   def list
     invoke_client do
       notes = note_client.list_notes
-      notes.collect{|n| n.title}.each_with_index{|n, i| display "#{i+1}. #{n}"}
+      if notes.empty?
+        display 'No tasks!'
+      else
+        notes.collect{|n| n.title}.each_with_index{|n, i| display "#{i+1}. #{n}"}
+      end
     end
   end
 
   def remove
     invoke_client do
-      note_client.remove_note(@args.first)
-      display 'Done.'
+      unless @args.empty?
+        note_client.remove_note(@args.first)
+        display 'Done.' 
+      else
+        display 'Nothing to remove!'
+      end
     end
   end
 

data/lib/evernotable/version.rb

@@ -1,3 +1,3 @@
 module Evernotable
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/evernotable_config.yml

@@ -6,7 +6,7 @@ user_api:
     production: https://www.evernote.com/edam/user
 note_api:
     sandbox: http://sandbox.evernote.com/edam/note/
-    production: http://www.evernote.com/edam/note/
+    production: https://www.evernote.com/edam/note/
 notebook: 
     name: evernotable
 credentials_file: 

data/spec/client/base_spec.rb

@@ -10,8 +10,6 @@ describe Evernotable::Client::Base do
     base_client = Evernotable::Client::Base.new({:config => @config})
     base_client.should_not be_nil
     base_client.current_user.should be_nil
-    base_client.config.should_not be_nil
-    base_client.config["api_credentials"]["consumer_key"].should == 'kswamin'
-    base_client.config["api_credentials"]["consumer_secret"].should == 'dbd87f40e8507b16'
+    base_client.client_token.should be_nil
   end
 end

data/spec/client/note_spec.rb

@@ -5,15 +5,14 @@ describe Evernotable::Client::Note do
 
   before(:all) do
     @config = YAML.load(File.read('lib/evernotable_config.yml'))
-    @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config})
+    @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config, :env => 'sandbox'})
     @user_client.authenticate
-    @note_client = Evernotable::Client::Note.new({:user_shard => @user_client.current_user.shardId, :client_token => @user_client.client_token, :config => @config})
+    @note_client = Evernotable::Client::Note.new({:user_shard => @user_client.current_user.shardId, :client_token => @user_client.client_token, :config => @config, :env => 'sandbox'})
     #@note_client.expunge_notebook #TODO: doesn't work for some weird reason, investigate
   end
 
   it 'should appropriately be initialized' do
     @note_client.should_not be_nil
-    @note_client.config.should_not be_nil
     @note_client.notebook_guid.should be_nil
   end
 

data/spec/client/user_spec.rb

@@ -8,21 +8,20 @@ describe Evernotable::Client::User do
   end
   
   it 'should appropriately be initialized' do
-    user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config})
+    user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config, :env => 'sandbox'})
     user_client.should_not be_nil
-    user_client.config.should_not be_nil
   end
   
   describe '#authenticate' do
     it 'should authenticate the user successfully' do
-      user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config})
+      user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config, :env => 'sandbox'})
       user_client.should_not be_nil
       user_client.authenticate
       user_client.current_user.should_not be_nil
       user_client.client_token.should_not be_nil
     end 
     it 'should not authenticate the user successfully' do
-      user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'thewrongpassword', :config => @config})
+      user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'thewrongpassword', :config => @config, :env => 'sandbox'})
       user_client.should_not be_nil
       lambda { user_client.authenticate }.should raise_error(Evernotable::Client::ClientException)
       user_client.current_user.should be_nil
@@ -32,7 +31,7 @@ describe Evernotable::Client::User do
   
   describe '#refresh authentication' do
     before(:all) do
-      @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config})
+      @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config, :env => 'sandbox'})
       @user_client.authenticate
     end
     it 'should refresh the authentication for the user successfully' do
@@ -46,7 +45,7 @@ describe Evernotable::Client::User do
   
   describe '#check valid version' do
     before(:all) do
-      @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config})
+      @user_client = Evernotable::Client::User.new({:user => 'kswamin', :password => 'dumbass', :config => @config, :env => 'sandbox'})
     end
     it 'should check if the version is valid' do
       @user_client.valid_version?.should be_true

data/spec/command/task_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'evernotable/command/task'
 
 describe Evernotable::Command::Task do
+  
   before(:all) do
     @task_command = Evernotable::Command::Task.new(['dude!'])
   end
@@ -12,26 +13,53 @@ describe Evernotable::Command::Task do
     lambda {@task_command.send(:help)}.should_not raise_error(Evernotable::Command::CommandFailed)
   end
   
-  it 'should add note successfully' do
-    mock_note_client = mock('Evernotable::Client::Note')
-    mock_note_client.stub!(:add_note).and_return(true)
-    @task_command.stub!(:note_client).and_return(mock_note_client)
-    STDOUT.should_receive(:puts).exactly(1).times.with('Done.')
-    lambda {@task_command.add}.should_not raise_error(Evernotable::Command::CommandFailed)
+  describe '#add note' do
+    it 'should add note successfully' do
+      mock_note_client = mock('Evernotable::Client::Note')
+      mock_note_client.stub!(:add_note).and_return(true)
+      @task_command.stub!(:note_client).and_return(mock_note_client)
+      STDOUT.should_receive(:puts).exactly(1).times.with('Done.')
+      lambda {@task_command.add}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
+
+    it 'should not add when nothing is supplied' do
+      @task_command = Evernotable::Command::Task.new([])
+      STDOUT.should_receive(:puts).exactly(1).times.with('Nothing to add!')
+      lambda {@task_command.add}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
   end
-  
-  it 'should list notes successfully' do
-    mock_note_client = mock('Evernotable::Client::Note')
-    mock_note_client.stub!(:list_notes).and_return(['note1', 'note2'])
-    @task_command.stub!(:note_client).and_return(mock_note_client)
-    lambda {@task_command.list}.should_not raise_error(Evernotable::Command::CommandFailed)
+
+  describe '#remove note' do
+    it 'should remove note successfully' do
+      mock_note_client = mock('Evernotable::Client::Note')
+      mock_note_client.stub!(:remove_note).and_return(true)
+      @task_command.stub!(:note_client).and_return(mock_note_client)
+      STDOUT.should_receive(:puts).exactly(1).times.with('Done.')
+      lambda {@task_command.remove}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
+
+    it 'should not remove when nothing is supplied' do
+      @task_command = Evernotable::Command::Task.new([])
+      STDOUT.should_receive(:puts).exactly(1).times.with('Nothing to remove!')
+      lambda {@task_command.remove}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
   end
   
-  it 'should remove note successfully' do
-    mock_note_client = mock('Evernotable::Client::Note')
-    mock_note_client.stub!(:remove_note).and_return(true)
-    @task_command.stub!(:note_client).and_return(mock_note_client)
-    STDOUT.should_receive(:puts).exactly(1).times.with('Done.')
-    lambda {@task_command.remove}.should_not raise_error(Evernotable::Command::CommandFailed)
+  describe '#list notes' do
+    it 'should not list notes when there is nothing ' do
+      mock_note_client = mock('Evernotable::Client::Note')
+      mock_note_client.stub!(:list_notes).and_return([])
+      @task_command.stub!(:note_client).and_return(mock_note_client)
+      STDOUT.should_receive(:puts).exactly(1).times.with('No tasks!')
+      lambda {@task_command.list}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
+    
+    it 'should list notes successfully' do
+      mock_note_client = mock('Evernotable::Client::Note')
+      mock_note_client.stub!(:list_notes).and_return([StubNote.new('note1'), StubNote.new('note2')])
+      @task_command.stub!(:note_client).and_return(mock_note_client)
+      STDOUT.should_receive(:puts).exactly(2).times.with(any_args())
+      lambda {@task_command.list}.should_not raise_error(Evernotable::Command::CommandFailed)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -13,4 +13,11 @@ end
 RSpec.configure do |config|
   config.color_enabled = true
   config.include DisplayMatcher
+end
+
+class StubNote 
+  attr_reader :title
+  def initialize(title)
+    @title = title
+  end
 end

data/spec/version_spec.rb

@@ -3,6 +3,6 @@ require "evernotable/version"
 
 describe Evernotable do
   it 'returns the correct version of the gem' do
-    Evernotable::VERSION.should == '1.0.0'
+    Evernotable::VERSION.should == '1.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evernotable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &70349991702640 !ruby/object:Gem::Requirement
+  requirement: &70142078492420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349991702640
+  version_requirements: *70142078492420
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70349991702220 !ruby/object:Gem::Requirement
+  requirement: &70142078492000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349991702220
+  version_requirements: *70142078492000
 - !ruby/object:Gem::Dependency
   name: evernote
-  requirement: &70349991701800 !ruby/object:Gem::Requirement
+  requirement: &70142078491580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349991701800
+  version_requirements: *70142078491580
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70349991701380 !ruby/object:Gem::Requirement
+  requirement: &70142078491160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349991701380
+  version_requirements: *70142078491160
 - !ruby/object:Gem::Dependency
   name: encrypted_strings
-  requirement: &70349991700960 !ruby/object:Gem::Requirement
+  requirement: &70142078490740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349991700960
+  version_requirements: *70142078490740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349991700540 !ruby/object:Gem::Requirement
+  requirement: &70142078490320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349991700540
+  version_requirements: *70142078490320
 description: A simple commandline task manager that uses Evernote note store. This
   automatically creates a new distinct Evernote notebook for persistance of these
   task notes.
@@ -156,3 +156,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/utilities_spec.rb
 - spec/version_spec.rb
+has_rdoc: