enop 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa944930a75dae78c4a3c7555fdc0ddec16bc02
-  data.tar.gz: ba1657c161e1ef665034808cf59de98c9a40a6c2
+  metadata.gz: 7c0c8069ace4c20d04e27fe59c67a90d0b158ff9
+  data.tar.gz: 684a364607d64f2807296fd0a9b5d4e87b8e82ff
 SHA512:
-  metadata.gz: 2ed7565163dfe70302e7ba820e317380f8c7787a3ff7f9f8ba75bfd3de1b8b538e3c43c4d3b6583f00adf40fe97d72f5e6d2d70593c391e97aea91b58bba8e69
-  data.tar.gz: c0d2b09c2d36844b9a428db743aac9640c7271cd357493bf0b8438c81e840ccb0bebabf1cf49380b563f82d59a3a296deb73510b7c6b26e1608fac4183ac0c95
+  metadata.gz: 0cb46c13de37e241b7e5dcfd5937ae2f070077a20f3e5e132ebaa21baa2c39b84add2a579db85295bffe00c8ca296f13d14c9e6122cd5d3f4a0af3b332db6fb7
+  data.tar.gz: 479883f3d8a65583d4121d879cbb0fa18fc90e21f8ce823dd19075ded2f2c066c3e3b0eac85fc49b9b3c36d8c6dc7e5dcf1a395c677b467028b5734c6f29e9ff

data/.gitignore

@@ -7,3 +7,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+/dbg/
+/ennblist*.csv
+/ennblist*.txt
+/*.bat
+/config/
+/db/
+/.*#
+/.gitignore

data/exe/enop

@@ -7,6 +7,7 @@ dbconfig = Arxutils::Dbutil::DBCONFIG_MYSQL
 dbconfig = Arxutils::Dbutil::DBCONFIG_SQLITE3
 
 token = ARGV[0]
+url = ARGV[1] if ARGV.size > 10
 hs = {
   "db_dir" => Arxutils::Dbutil::DB_DIR,
   "migrate_dir" => Arxutils::Dbutil::MIGRATE_DIR,
@@ -19,7 +20,8 @@ hs = {
 enop = Enop::Enop.new(
                       token,
                       :db,
-                      hs
+                      hs,
+                      url
                       )
 enop.connect
 enop.list_notebooks

data/lib/enop/enop.rb

@@ -2,17 +2,20 @@
 require 'evernote-thrift'
 require 'csv'
 require 'pp'
-
+require 'openssl'
 require 'forwardable'
 
 module Enop
   class Enop
     extend Forwardable
     
-    def_delegator( :@dbmgr , :add , :db_add)
-
-    def initialize( authToken , kind, hs )
+    def_delegator( :@dbmgr , :add , :db_add )
 
+    def initialize( authToken , kind , hs , userStoreUrl = nil )
+      # SSL認証を行わないように変更
+      OpenSSL::SSL.module_eval{ remove_const(:VERIFY_PEER) }
+      OpenSSL::SSL.const_set( :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE )
+      
       @stack_hs = {}
       @nbinfos = {}
       @notebookinfo = Struct.new("NotebookInfo", :name, :stack, :defaultNotebook, :count , :tags )
@@ -24,18 +27,20 @@ module Enop
       }
 
       evernoteHost = "www.evernote.com"
-      userStoreUrl = "https://#{evernoteHost}/edam/user"
+      userStoreUrl = "https://#{evernoteHost}/edam/user" unless userStoreUrl
+        userStoreUrl = "https://www.evernote.com/shard/s18/notestore"
+#      userStoreUrl = 
       userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
       userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
       @userStore = Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
-
+      # Invalid method name : 'checkVersion' が返されるので、とりあえずコメント化
+=begin
       versionOK = @userStore.checkVersion("Evernote EDAMTest (Ruby)",
                                           Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
                                           Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
       puts "Is my Evernote API version up to date?  #{versionOK}"
-      puts
       exit(1) unless versionOK
-
+=end
       set_output_dest( get_output_filename_base )
     end
 
@@ -65,7 +70,6 @@ module Enop
       # In that case, you don't need to make this call.
       #noteStoreUrl = userStore.getNoteStoreUrl(authToken)
       noteStoreUrl = "https://www.evernote.com/shard/s18/notestore"
-      
       noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
       noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
       @noteStore = Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
@@ -77,8 +81,18 @@ module Enop
 
       begin
         notebooks = @noteStore.listNotebooks(@authToken)
+      rescue Evernote::EDAM::Error::EDAMUserException => ex
+        parameter = ex.parameter
+        errorCode = ex.errorCode
+        errorText = Evernote::EDAM::Error::EDAMErrorCode::VALUE_MAP[errorCode]
+
+        puts "Authentication failed (parameter: #{parameter} errorCode: #{errorText})"
+
+        exit(1)
       rescue => ex
+        puts "@authToken=#{@authToken}"
         puts "Can't call listNotebooks"
+        p ex
         exit
       end
 

data/lib/enop/version.rb

@@ -1,3 +1,3 @@
 module Enop
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evernote_oauth
@@ -154,9 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: evernote operation.
 test_files: []
-has_rdoc: