emptyd 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fda361182421082855d749acd1a551aa6e91945
-  data.tar.gz: 8241b5977d1abedae42f7ca337a2a97edef3b23c
+  metadata.gz: 32566e139b257acf527f779fd480c9fec01e4960
+  data.tar.gz: 81f6f5a86813270382e4c56a9ccc1294a53c377c
 SHA512:
-  metadata.gz: 3069fa9c80e7c57db53f45a3fa5a4831caab1ac53af6030fce57c7b1338aa976a1771f41388ddd51bfcbfaacaeb36829728df186c7a7597b7b186c92d1f82ff6
-  data.tar.gz: 418666a78701ae6ce58a443f8d0b8f9a3cac7acec237ea5d81b31254bf7e6b360aee176830fd3fd042e2c02f6c2cabb3a2207439901433370d3470ac5f09a5f6
+  metadata.gz: cbcd1d4083dfa2f247319607760d5f7fe7293e742319ee2bdd8464d4e614d5567032a4146bf9cb179544b481d9c5191fd5f5b45ae759152259d725489b148acf
+  data.tar.gz: 0e9b62a83582dc85de24904cfe22fe51b1843b477a2a875bac2227b03fbedaf28941d3cce298211c810959d331f4e8e19e64c1997f7dd96554d00186b56d66b0

data/bin/emptyd

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # vim: ai:ts=2:sw=2:et:syntax=ruby
 
-lp = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+lp = File.expand_path(File.join(File.dirname(File.realpath(__FILE__)), "..", "lib"))
 
 unless $LOAD_PATH.include?(lp)
   $LOAD_PATH.unshift(lp)
@@ -34,6 +34,8 @@ class MyHttpServer < EM::Connection
 
     begin
       case @http_path_info
+      when %r{/ping}
+        # nop
       when %r{/session/new}
         session = Emptyd::Session.new JSON.parse(@http_post_content, :symbolize_names => true).merge(:logger => @logger)
         response.content = JSON.dump({id: session.uuid})
@@ -50,6 +52,9 @@ class MyHttpServer < EM::Connection
             response.send_response
           end
         end
+      when %r{/session/(.*)/write/(.*)}
+        session = Emptyd::Session[$1]
+        session.write $2, @http_post_content
       when %r{/session/(.*)/write}
         session = Emptyd::Session[$1]
         session << @http_post_content
@@ -91,6 +96,9 @@ CONFIG = {
   end
 end
 
+# XXX: We need a shared environment for Session and Connection
+$PASSWORD = CONFIG[:password]
+
 EM.run do
   $0 = "emptyd"
   logger = Logger.new(STDOUT)

data/lib/emptyd/version.rb

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

data/lib/emptyd.rb

@@ -83,7 +83,9 @@ module Emptyd
           else
             @@count[self.key] = self
             @logger.debug "Created new conn: #{key}, quota = #{@@count.size}"
-            EM::Ssh.start(@host, @user, user_known_hosts_file: []) do |conn|
+            options = { :user_known_hosts_file => [] }
+            options[:password] = $PASSWORD if $PASSWORD
+            EM::Ssh.start(@host, @user, options) do |conn|
               conn.errback { |err| errback err }
               conn.on(:closed) { errback "closed" }
               conn.callback do |ssh|
@@ -133,11 +135,11 @@ module Emptyd
       @connecting = false
       if had_valid_conn
         @sessions.each do |session|
-          session.queue.push [self, :error, nil]
+          session.queue.push [self, :error, @error]
         end
       else
         @run_queue.each do |cmd,session,callback|
-          callback.call self, :error
+          callback.call self, :error, @error
         end
       end
     end
@@ -186,7 +188,6 @@ module Emptyd
 
         ch.on_close do
           @updated_at = Time.now
-          p "closed"
           callback.call self, :close
         end
 
@@ -264,10 +265,10 @@ module Emptyd
 
     def destroy
       @logger.debug "Destroying session #{@uuid}"
-      p @running.map{|h,v| [h, v.class.name]}
+      @logger.debug @running.map{|h,v| [h, v.class.name]}
       @running.each do |h,v| 
         if v.respond_to? :close
-          p "Closing channel for #{h}"
+          @logger.debug "Closing channel for #{h}"
           v.close
         end
       end
@@ -294,6 +295,7 @@ module Emptyd
       dead = @connections.values.select(&:dead?)
       alive = @connections.values.reject(&:dead?)
       @queue.push [nil,:dead,dead.map(&:key)]
+      @queue.push [nil,:done,nil] if alive.empty?
       alive.each { |h| @running[h.key] = true }
       alive.each do |h|
         h.run(cmd, self) { |h,e,c| callback h,e,c }
@@ -313,6 +315,14 @@ module Emptyd
       }
     end
 
+    def write key, data
+      v = @running[key]
+      raise KeyError unless @keys.include?(key)
+      if v.respond_to? :send_data
+        v.send_data data
+      end
+    end
+
     def << data
       @running.each do |k,v|
         if v.respond_to? :send_data

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kmeaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An HTTP interface to run a single command on a cluster.
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Run commands on multiple hosts over SSH