frontier 0.0.1 → 0.0.2

data/README.md

@@ -49,18 +49,29 @@ Example
 -------
 
     require 'frontier'
-
     server = Frontier::Shell.new('user@server.tld')
 
+    # Run commands in the unix shell (bash or whatever you use)
     puts server.uname
     puts server.ls '*.rb'
-    
-    server.load('filesystem')
-    puts server['*.rb'].last
-    
+
+    # Find all ruby processes
     server.load('process')
     puts local.process.where(:command => /ruby/).fields(:pid, :rss).all
 
+    # Get a list of all *.rb files
+    server.load('filesystem')
+    puts server['*.rb']
+
+    # Recursively copy the ./config directory to the server
+    require 'pathname'
+    config = Pathname.new('./config/')
+    Frontier::Utils.xfer(server['destination/directory'], config)
+
+    # Copy file.txt from server to server2
+    server2 = Frontier::Shell.new('user@server2.tld')
+    Frontier::Utils.xfer(server2['.'], server['file.txt'])
+
 
 References
 ----------

data/bin/frontier

@@ -3,4 +3,4 @@
 require 'rubygems'
 require 'frontier'
 
-Frontier::Adapter.new
+Frontier::Adapter.new($stdin, $stdout)

data/lib/frontier.rb

@@ -6,6 +6,7 @@ module Frontier
   autoload :Mixin,            'frontier/mixin'
   autoload :Proxy,            'frontier/proxy'
   autoload :Shell,            'frontier/shell'
+  autoload :Utils,            'frontier/utils'
   autoload :Version,          'frontier/version'
 
 end

data/lib/frontier/adapter.rb

@@ -5,7 +5,7 @@ module Frontier
 
     def self.wrap(object)
       case object
-      when Numeric, String, Exception
+      when NilClass, TrueClass, FalseClass, Symbol, Numeric, String, Exception
         return object
       when Array
         return object.map { |o| wrap(o) }
@@ -16,27 +16,23 @@ module Frontier
       end
     end
 
+    def self.process(object, rx, tx)
+      req = Marshal.load(rx)
+      object = ObjectSpace._id2ref(req[:object]) if req.key?(:object)
+      reply = object.send(req[:name], *req[:args])
+      Marshal.dump(Adapter.wrap(reply), tx)
+    rescue Exception => e
+      Marshal.dump(e, tx)
+    ensure
+      tx.flush
+      return reply
+    end
 
-    def initialize
-      @cache = {}
 
+    def initialize(rx, tx, cache = {})
       while true do
-        begin
-          request = Marshal.load($stdin)
-
-          if request[:object]
-            object = ObjectSpace._id2ref(request[:object])
-          else
-            object = self
-          end
-
-          reply = object.send(request[:name], *request[:args])
-          @cache[reply.object_id] = reply
-          Marshal.dump(Adapter.wrap(reply), $stdout)
-        rescue Exception => e
-          Marshal.dump(e, $stdout)
-        end
-        $stdout.flush
+        reply = Adapter.process(self, rx, tx)
+        cache[reply.object_id] = reply if reply
       end
     end
 

data/lib/frontier/channel.rb

@@ -3,27 +3,32 @@ module Frontier
 
   class Channel
 
-    def self.hydrate(channel, object)
-      case object
-      when Array, Hash
-        object.each { |o| Channel.hydrate(channel, o) }
-      when Proxy
-        object.channel = channel
-      end
-
-      return object
-    end
-
-
     def initialize(host, port)
-      @channel = IO.popen("ssh #{host} frontier", "r+")
+      @remote = "#{host}:#{port}"
+      @channel = IO.popen("ssh -p #{port} #{host} frontier", "r+")
     end
 
     def submit(request)
       Marshal.dump(request, @channel)
-      return Channel.hydrate(self, Marshal.load(@channel))
+      return hydrate(Marshal.load(@channel))
     end
 
+    def inspect
+      "#<Frontier::Channel #{@remote}>"
+    end
+
+  private
+
+    def hydrate(object)
+      case object
+      when Array, Hash
+        object.each { |o| hydrate(o) }
+      when Proxy
+        object.channel = self
+      end
+
+      return object
+    end
   end
 
 end

data/lib/frontier/mixin/filesystem.rb

@@ -3,8 +3,8 @@ require 'pathname'
 
 module Frontier::Mixin::Filesystem
 
-  def [](glob)
-    Pathname.glob(glob)
+  def [](str)
+    str.include?('*') ? Pathname.glob(str) : Pathname.new(str)
   end
 
 end

data/lib/frontier/proxy.rb

@@ -14,6 +14,14 @@ module Frontier
       return @channel.submit(request)
     end
 
+    def to_s
+      method_missing(:to_s)
+    end
+
+    def inspect
+      "#<Frontier::Proxy #{method_missing(:inspect)}>"
+    end
+
   end
 
 end

data/lib/frontier/shell.rb

@@ -4,12 +4,10 @@ module Frontier
   class Shell
 
     def initialize(host = 'localhost', port = 22)
-      @host = host
-      @port = port
+      @channel = Channel.new(host, port)
     end
 
     def method_missing(name, *args)
-      @channel ||= Channel.new(@host, @port)
       return @channel.submit({ :name => name, :args => args })
     end
 

data/lib/frontier/utils.rb

@@ -0,0 +1,29 @@
+
+module Frontier
+
+  module Utils
+
+    def self.xfer(dst, src)
+      if src.file?
+        dst = dst + src.basename.to_s if dst.directory?
+        copy(dst, src)
+      elsif src.directory?
+        src.children.each do |child|
+          xfer(dst + src.basename.to_s, child)
+        end
+      end
+    end
+
+  private
+
+    def self.copy(dst, src)
+      dst.dirname.mkpath
+      dst, src = dst.open("w+"), src.open("r")
+      while chunk = src.read(4096)
+        dst.write(chunk)
+      end
+    end
+
+  end
+
+end

data/lib/frontier/version.rb

@@ -1,6 +1,6 @@
 
 module Frontier
 
-  Version = '0.0.1'
+  Version = '0.0.2'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frontier
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tomas Carnecky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 01:00:00 +02:00
+date: 2010-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/frontier/mixin.rb
 - lib/frontier/proxy.rb
 - lib/frontier/shell.rb
+- lib/frontier/utils.rb
 - lib/frontier/version.rb
 - lib/frontier.rb
 - LICENSE