pastehub 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42857483fdc84f96368d04ba528141a859d6e16d
-  data.tar.gz: 164089c90b685d3a6d4af4bd0c755581366f047b
+  metadata.gz: 300e17e0bff6735ae6db0a197c415affc8c0a6d3
+  data.tar.gz: 3ae5d75cd033afb65875970336c4853d1256682e
 SHA512:
-  metadata.gz: 5a495f3dddc74bf8e4c5839735f665aa96695fa7a514a7a619309e99c054382d749646df12f56370fd38a810043afbc4c1eae267c5ffa9589de0871d7b41c7f9
-  data.tar.gz: e3f3d0dd045c300eab8f0e8fbff536facaa47b07b940c0e50980f17278f5dfef96a095b018057a0058efa189b9fc9ad420c108ef2b44d60b143a9a9b531def24
+  metadata.gz: 8d6711785ce25257563c8b6839c5a17a8ab730e1968763ceedb3edc97f4e2d210b2dbfbe09313f565d801a0db2e7b63edb54e98cc3a40cb7e08a2db49bd03851
+  data.tar.gz: 159303dc2b151b59ef9308f59703803c8bac8e68c09b99b9b933b97c3ad1d8b43c96af63b123110d48fd706a3b84197d2df20871511461f3715b88ffdfb32f07

data/README.md

@@ -16,8 +16,9 @@ MacOSX(gem)    |        OK      |         OK         |    OK     |
 Windows(gem)   |        OK      |      not yet       |  not yet  |
 Linux(gem)     |      not yet   |         OK         |    OK     |
 
-## Documents
+## How to install
 
++ [Dropbox](./doc/client/dropbox.md)
 + [RubyGems](./doc/client/ruby_gems.md)
 + [Setup Emacs](./doc/client/setup_emacs.md)
 + [Setup Vim](./doc/client/setup_vim.md)

data/Rakefile

@@ -32,7 +32,7 @@ begin
                              'lib/*.rb',
                              'lib/*/*.rb',
                             ].to_a
-    gemspec.add_dependency(            "json", "1.8.1")
+#    gemspec.add_dependency(            "json", "1.8.1")
     gemspec.add_dependency(            "clipboard", "1.0.5" )
     gemspec.add_dependency(            "ffi", "1.9.3")
   end
@@ -52,7 +52,7 @@ task :test do
   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        "
+  sh "ruby    -I ./lib `which rspec` -b   ./test/libutil_spec.rb        "
 end
 
 task :win32_test do

data/VERSION.yml

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

data/bin/PastehubSync

@@ -98,7 +98,9 @@ def main( argv )
         nil
       end
     else
-      lambda { |x| STDERR.puts '<< COUNTUP >>' }
+      lambda { |x|
+        # nothing to do.
+      }
     end
 
   clientSync.addNoitfyCallback( receiveNotifyFunc )

data/lib/pastehub/clientsync.rb

@@ -200,6 +200,7 @@ module PasteHub
 
     def sync_main()
       config = PasteHub::Config.instance
+      util   = PasteHub::Util.new
 
       STDERR.puts "Info: sync_main thread start"
       free_counter = 0
@@ -211,7 +212,7 @@ module PasteHub
         if path
           body = get_sync_entry_body( path )
           if body
-            STDERR.printf( "Info: push to OS's clipboard ([%s...] size=%d).\n", body[0...4], body.size )
+            STDERR.printf( "Info: push to OS's clipboard ([[%s]] size=%d).\n", util.stringLimit(body,config.notifyMessageMax), body.size )
             PasteHub::AbstractClipboard.push( body.dup )
             touch()
           else
@@ -227,6 +228,7 @@ module PasteHub
 
     def clipboard_check()
       config = PasteHub::Config.instance
+      util   = PasteHub::Util.new
 
       STDERR.puts "Info: clipboardCheck thread start"
       @prevData = ""
@@ -237,7 +239,7 @@ module PasteHub
           if @prevData != data
             entry = Entry.new( @hostname )
             entry.save( data )
-            STDERR.printf( "Info: clipboard to File ([%s...] size=%d).\n", data[0...4], data.size )
+            STDERR.printf( "Info: clipboard to File ([[%s]]] size=%d).\n", util.stringLimit(data,config.notifyMessageMax) , data.size )
             notifyToReceive( data )
             @prevData = data
           end

data/lib/pastehub/util.rb

@@ -31,37 +31,6 @@ module PasteHub
       self.key_seconds( self.currentTime() )
     end
 
-    def _splitKey( key )
-      key.split( /[=]/ )
-    end
-
-    def key_seconds( key )
-      arr = _splitKey( key )
-      if 1 < arr.size
-        arr[0].to_i
-      else
-        nil
-      end
-    end
-
-    def key_timestamp( key )
-      arr = _splitKey( key )
-      if 1 < arr.size
-        arr[1]
-      else
-        nil
-      end
-    end
-
-    def key_digest( key )
-      arr = _splitKey( key )
-      if 2 < arr.size
-        arr[2]
-      else
-        nil
-      end
-    end
-
     def diffList( list1, list2 )
       set1 = Set.new
       set2 = Set.new
@@ -92,62 +61,13 @@ module PasteHub
       end
     end
 
-    def say( message )
-      if USE_HIGHLINE
-        HighLine.new.say( message ) {|q|
-          q.readline = true
-        }
-      else
-        puts "#{message}"
-      end
-    end
-
-    def inputText( label )
-      if USE_HIGHLINE
-        HighLine.new.ask( label )  {|q|
-          q.readline = true
-        }
+    # Cut string with limit characters
+    def stringLimit( str, limit )
+      if limit < str.size()
+        str[0...(limit)] + "..."
       else
-        print "#{label}"
-        return gets.chomp
+        str
       end
     end
-    
-    def inputPassword( label )
-      if USE_HIGHLINE
-        HighLine.new.ask( label )  {|q|
-          q.readline = true
-          q.echo = '*'
-        }
-      else
-        print "#{label}"
-        return gets.chomp
-      end
-    end
-
-    # input utility
-    def inputPasswordTwice( message, firstLabel, secondLabel )
-      required_password_chars = 6
-
-      STDERR.puts( message )
-      3.times { |n|
-        firstStr = nil
-        while not firstStr
-          firstStr  = inputPassword(firstLabel)
-          if required_password_chars > firstStr.size()
-            STDERR.puts( "you must input #{required_password_chars} or more characters." )
-            firstStr = nil
-          elsif firstStr.match( /[ \t]/i )
-            STDERR.puts( "you must not use white space characters." )
-            firstStr = nil
-          end
-        end
-        secondStr = inputPassword(secondLabel)
-        if firstStr == secondStr
-          return firstStr
-        end
-      }
-      return nil
-    end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pastehub
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.9.3
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement