pastehub 0.2.6 → 0.4.0

data/bin/pastehubPost

@@ -3,7 +3,7 @@
 #
 # pastehubPost - PasteHub's post utility for UNIX client.
 #  
-#   Copyright (c) 2009-2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#   Copyright (c) 2014-2014  Kiyoka Nishiyama  <kiyoka@sumibi.org>
 #   
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -33,30 +33,23 @@
 #   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  
 #
-require 'net/http'
-require 'uri'
-require 'open-uri'
-require 'fileutils'
 require 'pastehub'
-PasteHub::Config.instance.loadClient
+config = PasteHub::Config.instance
 
 def main
-  username  = PasteHub.loadUsername
-  if not username
-    STDERR.puts "clientPost: setup problem. Please setup pastehub application."
-    exit 1
-  end
-
   # save to LocalDB
-  data = STDIN.read
-  auth = PasteHub::AuthForClient.new( username, "" )
-  client = PasteHub::Client.new( auth )
-  puts client.localSaveValue( nil, data )
+  data  = STDIN.read
+  entry = PasteHub::Entry.new( PasteHub.hostname( )  + "__post" )
+  entry.save( data )
 
   # singal to pastehubSync
   pid = PasteHub.loadPid
   if 0 < pid
-    Process.kill( :SIGUSR1, pid )
+    begin
+      Process.kill( :SIGUSR1, pid )
+    rescue Errno::ESRCH => e
+      #STDERR.puts( "no such process: pid=#{pid}" )
+    end
   end
 end
 

data/lib/pastehub.rb

@@ -2,7 +2,7 @@
 # pastehub.rb - PasteHub's top-level library file
 #
 #
-#   Copyright (c) 2012  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#   Copyright (c) 2014  Kiyoka Nishiyama  <kiyoka@sumibi.org>
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -34,10 +34,7 @@
 #
 require 'pastehub/config'
 require 'pastehub/util'
-require 'pastehub/crypt'
-require 'pastehub/auth'
-require 'pastehub/localdb'
-require 'pastehub/store'
 require 'pastehub/client'
 require 'pastehub/clientsync'
 require 'pastehub/clipboard'
+require 'pastehub/syncentry'

data/lib/pastehub/client.rb

@@ -36,118 +36,38 @@ require 'net/https'
 require 'uri'
 require 'open-uri'
 require 'fileutils'
+require 'socket'
 
 module PasteHub
 
-  def self.signfilePath
-    signfile = PasteHub::Config.instance.localDbPath + "authinfo.txt"
-  end
-
-  def self.loadUsername
-    signfile = self.signfilePath
-
-    # load authenticate information
-    if not File.exist?( signfile )
-      return nil
-    else
-      begin
-        open( signfile ) {|f|
-          # first line is email (is username)
-          username = f.readline.chomp
-          if username.match( /^[a-z]+/ )
-            return username
-          end
-        }
-      rescue Exception => e
-        STDERR.puts( "Error: can't load #{signfile}: #{e.to_s}" )
-        raise e
-      end
-      return nil
-    end
-  end
-
-  # setup user's directory
+  # setup user's directory and sync directory
   #   result: true ... success / false ... fail
   def self.setupDirectory
-    localdb_path = PasteHub::Config.instance.localDbPath
+    localdb_path   = PasteHub::Config.instance.localDbPath
+    localsync_path = PasteHub::Config.instance.localSyncPath
     # Create directory
     if not File.exist?(  localdb_path )
-      if 0 == Dir.mkdir( localdb_path, 0700 )
-        STDERR.puts( "Info:  created directory #{localdb_path}" )
-      else
-        STDERR.puts( "Error: can't create directory #{localdb_path}" )
-        return false
-      end
+      FileUtils.mkdir_p( localdb_path, { :mode => 0700 } )
+    end
+
+    # Create directory for Sync
+    if not File.exist?(  localsync_path )
+      FileUtils.mkdir_p( localsync_path, { :mode => 0700 } )
     end
     return true
   end
 
-  def self.signIn
-    signfile = self.signfilePath
-    util = Util.new
-
-    # authenticate information
-    if not File.exist?( signfile )
-      3.times { |n|
-        util.say( "Please input your account information" )
-        username  = util.inputText("       email: ")
-        secretKey = util.inputText("  secret-key: " )
-        auth = AuthForClient.new( username, secretKey )
-        client = Client.new( auth )
-        if client.authTest()
-          # save authinfo with gpg
-          begin
-            password = util.inputPasswordTwice(
-                            "Please input password for crypted file",
-                            "  password            : ",
-                            "  password(for verify): " )
-            if password
-              crypt = PasteHub::Crypt.new( password )
-              open( signfile, "w" ) {|f|
-                f.puts(           username  )
-                f.puts( crypt.en( secretKey ))
-              }
-              # auth OK
-              return [ username, secretKey, password ]
-            end
-            STDERR.puts( "Error: password setting failed..." )
-          rescue Exception => e
-            STDERR.puts( "Error: can't save #{signfile}: #{e.to_s}" )
-          end
-        else
-          STDERR.puts( "your email or secret key is not registerd..." )
-        end
-      }
+  def self.hostname( )
+    hostname = open( "|hostname" ) { |f| 
+      f.read.chomp
+    }
+    if 0 < hostname.size()
+      hostname
     else
-      begin
-        open( signfile ) {|f|
-          util.say( "Please input password for crypted file" )
-          username = f.readline.chomp
-          signStr = f.read
-          3.times { |n|
-            password  = util.inputPassword("  crypt password: ")
-            crypt = PasteHub::Crypt.new( password )
-            secretKey= crypt.de( signStr )
-            if secretKey
-              auth = AuthForClient.new( username, secretKey )
-              client = Client.new( auth )
-              if client.authTest()
-                return [ username, secretKey, password ]
-              else
-                STDERR.puts( "Error: your secretKey may be old." )
-              end
-            end
-            STDERR.puts( "Error: missing password." )
-          }
-        }
-      rescue Exception => e
-        STDERR.puts( "Error: can't load #{signfile}: #{e.to_s}" )
-        raise e
-      end
+      raise RuntimeError, "Can't resolve hostname"
     end
-    return [ nil, nil, nil ]
   end
-
+  
   def self.savePid( pid )
     pidFile = PasteHub::Config.instance.localDbPath + "pid"
     open( pidFile, "w" ) {|f|
@@ -168,286 +88,4 @@ module PasteHub
     end
     return pid
   end
-
-
-  class ClientBase
-
-    # return:  Net::HTTPResponse
-    def httpGet( uriStr, headerHash, errorMessage )
-      uri = URI.parse( uriStr )
-      begin
-        https = Net::HTTP.new(uri.host, uri.port)
-        if ( Net::HTTP.https_default_port == uri.port ) or ( "https" == uri.scheme )
-          https.use_ssl     = true
-          https.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-        https.start {|http|
-          resp = http.get(uri.request_uri, headerHash)
-          if "200" == resp.code
-            return resp
-          end
-        }
-      rescue Exception => e
-        STDERR.puts errorMessage + ":" + e.to_s
-      end
-      return nil
-    end
-
-    # return:  Net::HTTPResponse
-    def httpPost( uriStr, bodyStr, headerHash, errorMessage )
-      uri = URI.parse( uriStr )
-      begin
-        https = Net::HTTP.new(uri.host, uri.port)
-        if ( Net::HTTP.https_default_port == uri.port ) or ( "https" == uri.scheme )
-          https.use_ssl     = true
-          https.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-        https.start {|http|
-          resp = http.post(uri.request_uri, bodyStr, headerHash)
-          if "200" == resp.code
-            return resp
-          end
-        }
-      rescue Exception => e
-        STDERR.puts errorMessage + ":" + e.to_s
-      end
-      return nil
-    end
-
-    # return:  [ Net::HTTP, Net::HTTP::Get ]
-    def httpGetRequest( uriStr, headerHash, errorMessage )
-      uri = URI.parse( uriStr )
-      begin
-        https = Net::HTTP.new(uri.host, uri.port)
-        if ( Net::HTTP.https_default_port == uri.port ) or ( "https" == uri.scheme )
-          https.use_ssl     = true
-          https.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        end
-        return [ https, Net::HTTP::Get.new(uri.request_uri, headerHash) ]
-      rescue Exception => e
-        STDERR.puts errorMessage + ":" + e.to_s
-      end
-      return nil
-    end
-
-  end
-
-
-  class Client < ClientBase
-    def initialize( auth, password = nil )
-      @auth = auth
-      ins = PasteHub::Config.instance
-      @localdb_path         = ins.localDbPath
-      @server_api_url       = ins.targetApiURL
-      @server_notifier_url  = ins.targetNotifierURL
-      @list_items           = ins.listItems
-      @syncTrigger          = []
-      @crypt                = if password
-                                Crypt.new( password )
-                              else
-                                nil
-                              end
-    end
-
-    def authTest
-      httpGet( "#{@server_api_url}authTest", @auth.getAuthHash(), "Error: can't connect to server for auth test" )
-    end
-
-
-    def getList( limit = nil )
-      h = {"content-type" => "plain/text"}
-      if limit
-        h[ 'X-Pastehub-Limit' ] = limit.to_i
-      end
-
-      resp = httpGet( "#{@server_api_url}getList", @auth.getAuthHash().merge( h ), "Error: fails 'getList' from server." )
-      str = resp.read_body()
-      masterList = str.split( /\n/ )
-      STDERR.puts "Info: masterList lines = #{masterList.size}  #{str.size}Bytes"
-      masterList = masterList.select { |x|
-        okSize = "1340542369=2012-06-24.12:52:49=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".size
-        if okSize != x.size
-          STDERR.puts "Info: masterList(NG): " + x
-          false
-        else
-          x
-        end
-      }
-      masterList
-    end
-
-    def getValue( key )
-      raise RuntimeError, "Error: no encrypt password." unless @crypt
-
-      resp = httpPost( "#{@server_api_url}getValue", key, @auth.getAuthHash().merge( {"content-type" => "plain/text"} ), "Error: fails 'getValue' from server." )
-      ret = @crypt.de( resp.read_body() )
-      unless ret
-        STDERR.puts( "Warning: encrypt password is wrong. getValue missing..." )
-        ret = "error..."
-      end
-      ret
-    end
-
-    def putValue( key, data )
-      ret = ""
-      if not key
-        key = "_"
-      end
-      raise RuntimeError, "Error: no encrypt password." unless @crypt
-      _data = @crypt.en( data )
-      unless _data
-        STDERR.puts( "Warning: encrypt password is wrong. putValue missing..." )
-        ret = nil
-      else
-        resp = httpPost( "#{@server_api_url}putValue", _data,
-               @auth.getAuthHash().merge(
-                                   {
-                                           "content-type" => "plain/text",
-                                           "x-pastehub-key" => key    }),
-               "Error: fails 'putValue' from server." )
-        if resp
-          ret = resp.read_body()
-        end
-      end
-      ret
-    end
-
-    def wait_notify( auth )
-      begin
-        pair = httpGetRequest("#{@server_notifier_url}", auth.getAuthHash(), "Error: fails 'notifier' api on server." )
-        https       = pair[0]
-        getRequest  = pair[1]
-        https.start() { |http|
-          http.request(getRequest) do |response|
-            raise 'Response is not chuncked' unless response.chunked?
-            response.read_body do |chunk|
-              serverValue = chunk.chomp
-              if serverHasNew?( serverValue )
-                puts "Info: server has new data: #{serverValue}"
-                return chunk.chomp.clone()
-              else
-                puts "Info: server is stable:    #{serverValue}"
-              end
-              if localHasNew?( )
-                puts "Info: local  has new data"
-                return :local
-              end
-            end
-            if "200" != response.code
-              STDERR.puts "Error: request error result=[#{response.code}]"
-              return :retry
-            end
-          end
-        }
-      rescue EOFError => e
-        STDERR.puts "Error: disconnected by server."
-        return :retry
-      rescue Errno::ECONNREFUSED => e
-        STDERR.puts "Error: can't connect to server(ConnectionRefused)."
-        return :retry
-      rescue SocketError => e
-        STDERR.puts "Error: can't connect to server(SocketError)."
-        return :retry
-      rescue Errno::ETIMEDOUT => e
-        STDERR.puts "Error: can't connect to server(Timeout1)."
-        return :retry
-      rescue Timeout::Error => e
-        # ONLINE and notifier has no INFO.
-        return :timeout
-      end
-    end
-
-    def serverHasNew?( serverValue )
-      # open local db
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username )
-      localValue = localdb.getValue( PasteHub::SERVER_DATE_KEY )
-      ret = (localValue != serverValue)
-      if ret
-        localdb.insertValue( PasteHub::SERVER_DATE_KEY, serverValue )
-      end
-      localdb.close()
-      return ret
-    end
-
-    def localHasNew?( )
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username )
-      localValue  = localdb.getValue( PasteHub::LOCAL_DATE_KEY )
-      serverValue = localdb.getValue( PasteHub::SERVER_DATE_KEY )
-      ret = if localValue and serverValue
-              (localValue > serverValue)
-            else
-              false
-            end
-      if ret
-        localdb.insertValue( PasteHub::LOCAL_DATE_KEY, serverValue )
-      end
-      localdb.close()
-      return ret
-    end
-
-    def setOnlineState( online )
-      # open local db
-      if online
-        if online?() == false
-          @syncTrigger.unshift( true )
-        end
-      end
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username )
-      localdb.insertValue( PasteHub::ONLINE_STATE_KEY, online ? "1" : "0" )
-      localdb.close()
-    end
-
-    def online?( )
-      # open local db
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username, true )
-      # printf( "[%s]", localdb.getValue( PasteHub::ONLINE_STATE_KEY ))
-      ret = ("1" == localdb.getValue( PasteHub::ONLINE_STATE_KEY ))
-      localdb.close()
-      ret
-    end
-
-    def getTrigger()
-      if 0 < @syncTrigger.size
-        return @syncTrigger.pop
-      end
-      return false
-    end
-
-    def localSaveValue( argKey = nil, data )
-      # open local db
-      util = PasteHub::Util.new( )
-      if argKey
-        key = argKey
-      else
-        key = util.currentTime( ) + "=" + util.digest( data )
-      end
-
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username )
-      list = localdb.getList( )
-      if util.key_digest( list[0] ) == util.digest( data )
-        # duplicate
-        localdb.close()
-        list[0]
-      else
-        localdb.insertValue( key, data.dup )
-        localdb.insertValue( PasteHub::LOCAL_DATE_KEY, util.currentTime( ) )
-        localdb.close()
-        key
-      end
-    end
-
-    def setServerFlags( keys )
-      localdb = PasteHub::LocalDB.new( @localdb_path )
-      localdb.open( @auth.username )
-      keys.each { |key|
-        localdb.setServerFlag( key )
-      }
-      localdb.close()
-    end
-  end
 end