view_server 0.0.2 → 0.0.3

data/.gitignore

@@ -9,3 +9,4 @@ _yardoc
 coverage
 .DS_store
 doc/
+*.swp

data/bin/cbcopy

@@ -0,0 +1,11 @@
+#! /usr/bin/env ruby
+
+require 'main'
+require 'view_server'
+
+Main do
+  def run
+    ViewServer::Client.new.server.to_cb($stdin.read)
+  end
+end
+

data/bin/cbpaste

@@ -0,0 +1,11 @@
+#! /usr/bin/env ruby
+
+require 'main'
+require 'view_server'
+
+Main do
+  def run
+    $stdout << ViewServer::Client.new.server.paste
+  end
+end
+

data/bin/show

@@ -0,0 +1,50 @@
+#! /usr/bin/env ruby
+
+require 'main'
+require 'view_server'
+require 'optparse'
+require 'pry'
+require 'pry-nav'
+
+options = {}
+
+class ShowRunner
+  def self.parse(args)
+    options = {}
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage: show [options] [file]"
+
+      opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+        options[:verbose] = v
+      end
+
+      opts.on("-e", "--extension EXTENSION", "File extension") do |v|
+        options[:ext] = v
+      end
+
+      opts.on("-p", "--port PORT", "Port number") do |v|
+        options[:ext] = v
+      end
+    end
+
+    opt_parser.parse!(args)
+    filename = ARGV.first
+    if filename
+      data = File.read filename
+      ext = File.extname(filename)[1..-1]
+    else
+      data = $stdin.read
+      ext = options.fetch(:ext) {'txt'}
+    end
+
+    {:data => data, :ext => ext }
+  end
+
+  def self.run(args)
+    opts = self.parse args
+    ViewServer::Client.new.server.show(opts[:data], opts[:ext])
+  end
+end
+options = ShowRunner.run(ARGV)
+
+

data/bin/view_server

@@ -1,91 +1,3 @@
-#!/usr/bin/env ruby
+require 'view_server'
 
-# server
-require 'tmpdir'
-require 'fileutils'
-require 'digest'
-
-require "rubygems"
-require "clip"
-
-class TmpFile
-  def self.open(prefix = "", suffix= "")
-    begin
-      digest = Digest::MD5.hexdigest((Time.now.to_f + rand(10000)).to_s)
-      file_name = File.join(Dir.tmpdir, prefix + digest + suffix )
-      File.open(file_name, 'w+' ) do |f|
-        yield f 
-      end
-      ensure
-        FileUtils::rm(file_name) if File.exist?(file_name)
-      end
-  end
-end
-
-options = Clip do |p|
-  p.flag 's', 'server',:desc => 'Is a server', :default => false
-
-  p.optional 'p', 'port', :desc => 'The port', :default => 10021 do |v|
-    v.to_i # always deal with integers
-  end
-  p.flag 'c', 'copy_to_clipboard', :desc => "Send to clipboard" 
-  p.flag 'P', 'paste_from_clipboard', :desc => "Read from clipboard" 
-  p.flag 'v', 'verbose', :desc => 'Make it chatty'
-end
-
-if options.valid?
-  if options.verbose?
-    puts options.host
-    puts options.port
-    puts 'files:'
-    options.files.each do |f|
-      puts "\t#{f}"
-    end
-  end
-else
-  # print error message(s) and usage
-  $stderr.puts options.to_s
-end
-
-
-require 'drb'
-
-if options.server?
-  class Viewer
-    def affiche(file_ext, data)
-      TmpFile.open( "", "." + file_ext) do |a|
-        a << data
-        a.close
-        `open #{a.path} `
-        sleep 5 #We don't want to delete the file before it's loaded
-      end
-    end
-
-    def to_cb(data) # To clipboard
-      File.open("#{ENV['HOME']}/tmp/clipboard", "w"){|a| a << data}
-      IO.popen('pbcopy', 'w'){|a| a << data}
-    end
-
-    def paste # From clipboard
-      `pbpaste`
-    end
-  end
-
-  DRb.start_service "druby://localhost:#{options.port}", Viewer.new
-  puts DRb.uri
-
-  DRb.thread.join
-else
-  DRb.start_service
-  obj = DRbObject.new(nil, "druby://localhost:#{options.port}")
-
-  if options.copy_to_clipboard?
-    obj.to_cb(STDIN.read)
-  elsif options.paste_from_clipboard?
-    print obj.paste
-  else
-    if obj.remaining?
-      affiche("csv", "2,4,5\n3,4,5")
-    end  
-  end
-end
+ViewServer::Runner.run

data/lib/view_server.rb

@@ -1,5 +1,8 @@
 require "view_server/version"
 
 module ViewServer
-  # Your code goes here...
+  autoload :Server,  'view_server/server'
+  autoload :Client,  'view_server/client'
+  autoload :Runner,  'view_server/runner'
+  autoload :TmpFile, 'view_server/tmp_file'
 end

data/lib/view_server/client.rb

@@ -0,0 +1,13 @@
+require 'drb'
+require 'pry'
+
+module ViewServer
+  class Client
+    attr_reader :server
+
+    def initialize(port = 10021)
+      DRb.start_service
+      @server = DRbObject.new(nil, "druby://localhost:#{port}")
+    end
+  end
+end

data/lib/view_server/runner.rb

@@ -0,0 +1,59 @@
+require 'main'
+
+module ViewServer
+  class Runner
+    def self.old_run
+      options = Clip do |p|
+        p.flag 's', 'server',:desc => 'Is a server', :default => false
+
+        p.optional 'p', 'port', :desc => 'The port', :default => 10021 do |v|
+          v.to_i # always deal with integers
+        end
+        p.flag 'c', 'copy_to_clipboard', :desc => "Send to clipboard" 
+        p.flag 'P', 'paste_from_clipboard', :desc => "Read from clipboard" 
+        p.flag 'v', 'verbose', :desc => 'Make it chatty'
+      end
+
+      if options.valid?
+        if options.verbose?
+          puts options.host
+          puts options.port
+          puts 'files:'
+          options.files.each do |f|
+            puts "\t#{f}"
+          end
+        end
+        if options.server?
+          Server.serve(options) 
+        else
+          Client.new(options.port).send(options) 
+        end
+      else
+        # print error message(s) and usage
+        $stderr.puts options.to_s
+      end
+    end
+
+    def self.run 
+      main.run
+    end
+
+    def self.main
+      main = Main.new do
+        option 'port', 'p' do
+          cast :int
+          default 10021
+        end
+
+        option 'verbose', 'v' do
+          default false
+        end
+
+        def run
+          puts "serving on port #{params['port']}"
+          Server.serve params['port'].value
+        end
+      end
+    end
+  end
+end

data/lib/view_server/server.rb

@@ -0,0 +1,31 @@
+require 'drb'
+
+module ViewServer
+  class Server
+    # I wanted to use the display method but it conflicts 
+    # with the Object#display method
+    def show(data, file_ext = 'txt')
+      TmpFile.open("", "." + file_ext) do |a|
+        a << data
+        a.close
+        `open #{a.path} `
+        sleep 5 #We don't want to delete the file before it's loaded
+      end
+    end
+
+    def to_cb(data) # To clipboard
+      File.open("#{ENV['HOME']}/tmp/clipboard", "w"){|a| a << data}
+      IO.popen('pbcopy', 'w'){|a| a << data}
+    end
+
+    def paste # From clipboard
+      `pbpaste`
+    end
+
+    def self.serve(port)
+      DRb.start_service "druby://localhost:#{port}", Server.new
+      puts DRb.uri
+      DRb.thread.join
+    end
+  end
+end

data/lib/view_server/tmp_file.rb

@@ -0,0 +1,20 @@
+require 'tmpdir'
+require 'fileutils'
+require 'digest'
+
+module ViewServer
+  class TmpFile
+    def self.open(prefix = "", suffix= "")
+      begin
+        digest = Digest::MD5.hexdigest((Time.now.to_f + rand(10000)).to_s)
+        file_name = File.join(Dir.tmpdir, prefix + digest + suffix )
+        File.open(file_name, 'w+' ) do |f|
+          yield f 
+        end
+      ensure
+        FileUtils::rm(file_name) if File.exist?(file_name)
+      end
+    end
+  end
+end
+

data/lib/view_server/version.rb

@@ -1,3 +1,3 @@
 module ViewServer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/runner_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'ViewServer Runner Main' do
+  before do
+    @main = ViewServer.main
+  end
+
+  it 'should start as a sever' do
+  end
+end

data/test/{test_helper.rb → spec_helper.rb}

@@ -1,4 +1,4 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
-require 'minitest/unit'
+require 'minitest/spec'
 require 'minitest/autorun'

data/view_server.gemspec

@@ -7,9 +7,12 @@ Gem::Specification.new do |gem|
   gem.name          = "view_server"
   gem.version       = ViewServer::VERSION
   gem.add_dependency "clip"
+  gem.add_dependency "main"
   gem.add_development_dependency 'rake'
   gem.add_development_dependency "bundler", "~> 1.0"
   gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'pry-nav'
   gem.authors       = ["Martin Chabot"]
   gem.email         = ["chabotm@gmail.com"]
   gem.description   = %q{Allow local viewing of remote files}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clip
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: main
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,10 +91,45 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allow local viewing of remote files
 email:
 - chabotm@gmail.com
 executables:
+- cbcopy
+- cbpaste
+- show
 - view_server
 extensions: []
 extra_rdoc_files: []
@@ -88,10 +139,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cbcopy
+- bin/cbpaste
+- bin/show
 - bin/view_server
 - lib/view_server.rb
+- lib/view_server/client.rb
+- lib/view_server/runner.rb
+- lib/view_server/server.rb
+- lib/view_server/tmp_file.rb
 - lib/view_server/version.rb
-- test/test_helper.rb
+- test/runner_spec.rb
+- test/spec_helper.rb
 - test/view_server_test.rb
 - view_server.gemspec
 homepage: ''
@@ -108,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2501156995423652076
+      hash: 4172687942151470953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,13 +176,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2501156995423652076
+      hash: 4172687942151470953
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Allow local viewing of remote files
 test_files:
-- test/test_helper.rb
+- test/runner_spec.rb
+- test/spec_helper.rb
 - test/view_server_test.rb