pastehub 0.2.6 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI0NzYwNDVjOWMxMzY0MjY2NGQ4NmRmODUxNWZkNzYwNDFjZDNjMQ==
-  data.tar.gz: !binary |-
-    YWY2YjM2MzA1MjYwNThiNTA4ZTcxMDgzZjZlMzZkZTZlODRhN2FjMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTg2M2U3NDc3NGI3MTliNmRjYzFlOTUyNDhkYWNiZDUxM2VhOWY4ODMyZjVj
-    NDU4YzgwOTdlOTlhYTU3ODUwZDc1YTI2MTEyZGIzOTY2MzIzNTY1OGNmYjNl
-    NzUxODFjNjI2MzQxMzM2YTU2MjRkOTBjNDk0NWYxNGViZjMzODA=
-  data.tar.gz: !binary |-
-    NWJmMDU4YTRkZjE1NTRiNDMzM2U2ODg2ODhkYzc1NmUyZGRmMDU3OGM3OWEy
-    MWNlMmQzMGQ0ZmVkNjQyZmY0M2ZkZWRhMzZlMWFiZDQ4NWRiMDM0MWUyYmI3
-    ZGJkYzhiZGE5NmYyMjJiZWMxYWI5YzNjMzE4ODg4Y2IwMzJhMDM=
+SHA1:
+  metadata.gz: 42857483fdc84f96368d04ba528141a859d6e16d
+  data.tar.gz: 164089c90b685d3a6d4af4bd0c755581366f047b
+SHA512:
+  metadata.gz: 5a495f3dddc74bf8e4c5839735f665aa96695fa7a514a7a619309e99c054382d749646df12f56370fd38a810043afbc4c1eae267c5ffa9589de0871d7b41c7f9
+  data.tar.gz: e3f3d0dd045c300eab8f0e8fbff536facaa47b07b940c0e50980f17278f5dfef96a095b018057a0058efa189b9fc9ad420c108ef2b44d60b143a9a9b531def24

data/README.md

@@ -4,29 +4,24 @@ PasteHub
 
 ## Concept
 
-Cloud-based cross-platform clipboard (copy and paste) service.
+Cross-platform clipboard (copy and paste) sync tool.
 
 ![image](./doc/client/pastehub_architecture.png)
 
-## Open Source
-
-This software is distributed under the BSD-style license.
-
 ## Support OS
 
-   type        | Sync OS's clipboard | Sync Emacs kill-ring
----------------|---------------------|----------------------
-Linux(app)     |      not yet        |         OK
-Linux(gem)     |      not yet        |         OK
-MacOSX(app)    |        OK           |       not yet   
-MacOSX(gem)    |        OK           |         OK
-Windows(app)   |         -           |          -
-Windows(gem)   |        OK           |       not yet
+   type        | OS's clipboard |   Emacs kill-ring  |    vim    |
+---------------|----------------|--------------------|-----------|
+MacOSX(gem)    |        OK      |         OK         |    OK     |
+Windows(gem)   |        OK      |      not yet       |  not yet  |
+Linux(gem)     |      not yet   |         OK         |    OK     |
 
 ## Documents
 
-+ [Registration](./doc/client/Registration.md)
-+ [MacOSX](./doc/client/setup_MacOSX.md)
-+ [Linux](./doc/client/setup_Linux.md)
 + [RubyGems](./doc/client/ruby_gems.md)
 + [Setup Emacs](./doc/client/setup_emacs.md)
++ [Setup Vim](./doc/client/setup_vim.md)
+
+## Open Source
+
+This software is distributed under the BSD-style license.

data/Rakefile

@@ -2,7 +2,7 @@
 #                                          Rakefile for PasteHub
 # Release Engineering:
 #   1. edit the VERSION.yml file
-#   2. rake test  &&  rake gemspec  &&   rake build
+#   2. rake test  &&  rake gemspec  &&   gem build pastehub.gemspec
 #      to generate pastehub-x.x.x.gem
 #   3. install pastehub-x.x.x.gem to clean environment and test
 #   4. rake release
@@ -13,37 +13,28 @@
 #   2. fake_dynamo --port 4567
 
 
-USERNAME_A='userA'
-USERNAME_B='userB'
-SETENV_A="export PASTEHUB_USER=userA ; export PASTEHUB_SECRET_KEY='ZGFiYTRkNDg5MzA0YTA0Y2ExYzQ2MGFiNjM0YjFlNzJlMzcyZDVhZg=='"
-
 require 'rake'
 begin
   require 'jeweler2'
-  ['pastehub'].each do |name|
-    Jeweler::Tasks.new do |gemspec|
-      gemspec.name = name
-      gemspec.summary = "PasteHub is cloud-based cross-platform clipboard sync."
-      gemspec.description = "PasteHub is cloud-based cross-platform clipboard sync."
-      gemspec.email = "kiyoka@sumibi.org"
-      gemspec.homepage = "http://github.com/kiyoka/pastehub"
-      gemspec.authors = ["Kiyoka Nishiyama"]
-      gemspec.files = FileList['Rakefile',
-                               '.gemtest',
-                               'VERSION.yml',
-                               'README.txt',
-                               'bin/*',
-                               'lib/*.rb',
-                               'lib/*/*.rb',
-                               'server/*.rb'
-                              ].to_a
-      gemspec.add_development_dependency "rspec"
-      gemspec.add_development_dependency "rake"
-      gemspec.add_dependency             "json"
-      gemspec.add_dependency             "highline"
-      gemspec.add_dependency(            "clipboard", "1.0.5" )
-      gemspec.add_dependency             "ffi"
-    end
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = 'pastehub'
+    gemspec.summary = "PasteHub is cloud-based cross-platform clipboard sync."
+    gemspec.description = "PasteHub is cloud-based cross-platform clipboard sync."
+    gemspec.email = "kiyoka@sumibi.org"
+    gemspec.license = 'New BSD'
+    gemspec.homepage = "http://github.com/kiyoka/pastehub"
+    gemspec.authors = ["Kiyoka Nishiyama"]
+    gemspec.files = FileList['Rakefile',
+                             '.gemtest',
+                             'VERSION.yml',
+                             'README.txt',
+                             'bin/*',
+                             'lib/*.rb',
+                             'lib/*/*.rb',
+                            ].to_a
+    gemspec.add_dependency(            "json", "1.8.1")
+    gemspec.add_dependency(            "clipboard", "1.0.5" )
+    gemspec.add_dependency(            "ffi", "1.9.3")
   end
 rescue LoadError
   puts 'Jeweler2 not available. If you want to build a gemfile, please install with "sudo gem install jeweler2"'
@@ -54,17 +45,14 @@ end
 
 
 task :test do
-  sh "rm -f /tmp/usertmp.db"
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libstore_spec.rb       "
   sh "ruby    -I ./lib `which rspec` -b   ./test/libconfig_spec.rb      "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libutil_spec.rb        "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libcrypt_spec.rb       "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libauth_spec.rb        "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libauth2_spec.rb       "
+  sh "ruby    -I ./lib `which rspec` -b   ./test/libconfig2_spec.rb     "
+  sh "/bin/rm -rf /tmp/home/user1"
   sh "ruby    -I ./lib `which rspec` -b   ./test/libclient_spec.rb      "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/liblog_spec.rb         "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libmasterdb_spec.rb    "
-  sh "ruby    -I ./lib `which rspec` -b   ./test/libuserdb_spec.rb      "
+  sh "/bin/rm -rf /tmp/home/user1"
+  sh "ruby    -I ./lib `which rspec` -b   ./test/libclientsync_spec.rb  "
+  sh "ruby    -I ./lib `which rspec` -b   ./test/libsyncentry_spec.rb   "
+#  sh "ruby    -I ./lib `which rspec` -b   ./test/libutil_spec.rb        "
 end
 
 task :win32_test do
@@ -84,36 +72,9 @@ task :win32_test do
 
 end
 
-task :fluentd_for_test do
-  sh "fluentd -c ./fluentd-conf-for-test/fluent.conf"
-end
-
-task :test_u do
-  sh "ruby -I ./lib `which rspec` -b  -t users   ./test/aws_spec.rb            -r ./test/rspec_formatter_for_emacs.rb -f CustomFormatter"
-end
-
-task :test_e do
-  sh "ruby -I ./lib `which rspec` -b  -t entries ./test/aws_spec.rb            -r ./test/rspec_formatter_for_emacs.rb -f CustomFormatter"
-end
-
-task :m do
-  sh "vertx run    server/masterdb.rb -instance 2"
-end
-
-task :n do
-  sh "vertx run    server/notifier.rb -instance 2"
-end
-
-task :d do
-  sh "ruby -I ./lib server/pastehub-admin    gc   "
-end
-
-task :setupTable do
-  sh "ruby -I ./lib server/pastehub-admin    setup "
-end
 
 task :sync do
-  sh "ruby -I ./lib bin/PastehubSync"
+  sh "ruby -I ./lib bin/PastehubSync -v"
 end
 
 task :macruby_sync do
@@ -125,22 +86,14 @@ task :syncA do
 end
 
 task :postA1 do
-  sh SETENV_A + "; echo 'aaa1' | ruby -I ./lib bin/pastehubPost"
+  sh "echo 'aaa1' | ruby -I ./lib bin/pastehubPost"
 end
 
 task :postA2 do
-  sh SETENV_A + "; echo 'aaa2' | ruby -I ./lib bin/pastehubPost"
-end
-
-task :postB1 do
-  sh "echo 'bbb1' | ruby -I ./lib bin/pastehubPost"
+  sh "echo 'The quick brown fox jumps over the lazy dog and run' | ruby -I ./lib bin/pastehubPost"
 end
 
-task :dumpA do
-  open( "|" + SETENV_A + "; ruby -I ./lib bin/pastehubDump list" ) {|f|
-    firstKey = f.readline.chomp
-    sh SETENV_A + "; ruby -I ./lib bin/pastehubDump get '#{firstKey}'"
-  }
-  sh SETENV_A + "; ruby -I ./lib bin/pastehubDump top"
-  sh SETENV_A + "; ruby -I ./lib bin/pastehubDump latest"
+task :getA do
+  sh "ruby -I ./lib bin/pastehubGet time"
+  sh "ruby -I ./lib bin/pastehubGet get"
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 2
-:patch: 6
+:minor: 4
+:patch: 0

data/bin/PastehubSync

@@ -3,7 +3,7 @@
 #
 # PastehubSync - PasteHub's sync program for UNIX client.
 #  
-#   Copyright (c) 2009-2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#   Copyright (c) 2013-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
@@ -37,71 +37,97 @@ require 'thread'
 require 'pastehub'
 
 PasteHub::Config.instance.loadClient
-RETRY_INTERVAL = 60
 
 
-def setup
+def setup( argv )
   if not PasteHub.setupDirectory( )
     exit( 1 )
   end
-  return PasteHub.signIn( )
+
+  if 0 < argv.size
+    case argv[0]
+    when "batch"
+      return [ :ok, PasteHub.hostname( ) ]
+    else
+      exit( 1 )
+    end
+  else
+    return [ :ok, PasteHub.hostname( ) ]
+  end
 end
 
-def main
-  ret = setup()
-  username  = ret[0]
-  secretKey = ret[1]
-  password  = ret[2]
+def main( argv )
+  params = OptionParser.getopts( argv, "v" )
+  config = PasteHub::Config.instance()
+  if params[ 'v' ]
+    config.setVerbose( true )
+  end
+
+  ret = setup( argv )
+  errorCode = ret[0]
+  hostname  = ret[1]
+
+  if not :ok == errorCode
+    exit( 1 )
+  end
 
   # save pid file
   PasteHub.savePid( Process.pid )
 
   # create clientSync
-  clientSync = PasteHub::ClientSync.new(
-                                    PasteHub::Config.instance.listItems / 2,
-                                    PasteHub::Config.instance.localDbPath,
-                                    0.5 )
-  clientSync.addNoitfyCallback( lambda { puts '<< COUNTUP >>' }, lambda { puts '<< ONLINE >>' }, lambda { puts '<< offline >>' } )
-
-  while true
-    begin
-
-      case RbConfig::CONFIG['host_os']
-      when /mingw32|mswin|windows/i
-        # Windows
-      else
-        # Other
-        Signal.trap( :SIGUSR1 ) {
-          STDERR.puts( "Info: caught signal." )
-          clientSync.syncNow( username, secretKey, password )
+  clientSync = PasteHub::ClientSync.new( hostname, 1.0 )
+  
+  # add notification handler
+  receiveNotifyFunc = 
+    case RbConfig::CONFIG['host_os']
+    when /^darwin/
+      # MacOS X
+      notifier_path = RbConfig::CONFIG['bindir'] + "/" + "terminal-notifier"
+      if File.exist?( notifier_path )
+        STDERR.puts( "Info: found terminal-notifier for MacOS X." )
+        lambda { |x|
+        str = if config.notifyMessageMax < x.size
+                x[0...config.notifyMessageMax] + " ..."
+              else
+                x
+              end
+        command = sprintf( "%s -title 'PasteHub' -message '\\%s' ", notifier_path, str )
+        system( command )
         }
+      else
+        nil
       end
+    else
+      lambda { |x| STDERR.puts '<< COUNTUP >>' }
+    end
 
-      if username
-        threads = []
-        threads.push(Thread.new { clientSync.syncMain(       username, secretKey, password ) })
-        threads.push(Thread.new { clientSync.clipboardCheck( username, secretKey, password ) })          
-        threads.each {|t| t.join}
-      end
+  clientSync.addNoitfyCallback( receiveNotifyFunc )
 
-    rescue Errno::ECONNREFUSED => e
-      STDERR.puts "retrying... pastehub server is down(1)"
-      sleep RETRY_INTERVAL
-    rescue Errno::ETIMEDOUT => e
-      STDERR.puts "retrying... network is offline(1)"
-      sleep RETRY_INTERVAL
-    rescue SocketError => e
-      STDERR.puts "retrying... network is offline(2)"
-      sleep RETRY_INTERVAL
-    rescue Timeout::Error => e
-      # ONLINE, but server is not helthy
-      STDERR.puts "retrying... pastehub server is down(2)"
-      sleep RETRY_INTERVAL
-    rescue Errno::ECONNRESET => e
-      STDERR.puts "retrying... pastehub server is down(3)"
-      sleep RETRY_INTERVAL
+  while true
+    signals = 0
+    
+    case RbConfig::CONFIG['host_os']
+    when /mingw32|mswin|windows/i
+      # Windows
+    else
+      # Other
+      Signal.trap( :SIGUSR1 ) {
+        STDERR.puts( "Info: caught USR1 signal." )
+        signals += 1
+      }
+      Signal.trap( :SIGTERM ) {
+        STDERR.puts( "Info: caught TERM signal to terminate." )
+        exit( 0 )
+      }
+    end
+    
+    if hostname
+      threads = []
+      threads.push(Thread.new { clientSync.sync_main( ) })
+      threads.push(Thread.new { clientSync.clipboard_check( ) })
+      threads.each {|t| t.join}
     end
   end
 end
 
-main
+main( ARGV )

data/{lib/pastehub/store.rb → bin/pastehubGet}

@@ -1,7 +1,9 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 #
-# store.rb - PasteHub's storage sync library
+# pastehubGet - PasteHub's get utility for UNIX client.
 #  
-#   Copyright (c) 2009-2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#   Copyright (c) 2009-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
@@ -31,53 +33,49 @@
 #   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  
 #
+require 'pastehub'
 
-module PasteHub
+def print_latest( command )
+  hostname = PasteHub.hostname
+  config   = PasteHub::Config.instance()
 
-  class LocalStore
-    def initialize( username, reader = false )
-      @db = PasteHub::LocalDB.new( PasteHub::Config.instance.localDbPath )
-      @db.open( username, reader )
-    end
-
-    def getList
-      @db.getList()
-    end
-
-    def getServerList
-      @db.getServerList()
-    end
-
-    def top
-      lst = @db.getList( 1 )
-      if 0 < lst.size
-        [ lst.first, @db.getValue( lst.first ) ]
-      else
-        [ nil, nil ]
-      end
-    end
-
-    def getValue( key )
-      @db.getValue( key.dup )
-    end
+  cs = PasteHub::ClientSync.new( hostname, 1 )
 
-    def latest
-      [ @db.getValue( PasteHub::SERVER_DATE_KEY ).to_s,
-        @db.getValue( PasteHub::LOCAL_DATE_KEY  ).to_s ]
+  # print latest entry data
+  result = cs.get_latest_entry( )
+  case command
+  when "time"
+    if result
+      puts   cs.get_latest_entry( )[0]['create_unixtime']
+    else
+      puts   '0'
     end
-
-    def insertValue( key, value )
-      @db.insertValue( key, value )
-    end
-
-    def close
-      @db.close
-    end
-
-    def clear
-      @db.clear
+  when "get"
+    if result
+      print  cs.get_latest_entry( )[1]
+    else
+      puts   ''
     end
+  end
+end
 
+def main
+  if 0 == ARGV.length
+    STDERR.puts "clientGet [command] [arg]"
+    STDERR.puts "  1) clientGet time"
+    STDERR.puts "  2) clientGet get"
+    exit 1
   end
 
+  command = ARGV[0].downcase
+  case command
+  when "time"
+    print_latest( command )
+  when "get"
+    print_latest( command )
+  else
+    STDERR.puts "unknown command [#{command}]"
+  end
 end
+
+main