salticid 0.9.5 → 0.9.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64a66a4ad8d5621362736470e5e59de49304621e
+  data.tar.gz: 2d23c1e7bb6805f3930a8b7851c6df1d3249bd78
+SHA512:
+  metadata.gz: 0473e989e79da8851aca8d0c1db2f3a73590811a97d558d56d495bc5437aa412af6d4f4e86bc1121c60d615db4eb815e776543af4e1bebe6e3e14c67756aeeff
+  data.tar.gz: 3ab14e47b33c26ba52fcdd4742802e4729c59819dc657b3a985a1e65de4da90a89ec1bb9aca4d547d35dea46c9ac8783a8f2c0b7ee8fde52b76a65832f3c962a

data/README.markdown

@@ -1,12 +1,11 @@
 Salticid
 =====
 
-<a href="http://www.flickr.com/photos/robertwhyte/8034414631/" title="Salticidae Maratus sp. by Robert Whyte www.arachne.org.au, on Flickr"><img src="http://farm9.staticflickr.com/8034/8034414631_1d7906ac5d_b.jpg" width="850" height="674" alt="Salticidae Maratus sp."></a>
-
 Salticidae is the family of jumping spiders: small, nimble, and quite
 intelligent within a limited domain.
 
-<img src="http://aphyr.com/media/salticid.png" width="100%" alt="Salticid installing riak" />
+<a style="display: inline-block" href="http://www.flickr.com/photos/robertwhyte/8034414631/" title="Salticidae Maratus sp. by Robert Whyte www.arachne.org.au, on Flickr"><img src="http://farm9.staticflickr.com/8034/8034414631_1d7906ac5d_b.jpg" width="302px" height="240px" alt="Salticidae Maratus sp."></a> <img src="http://aphyr.com/media/salticid.png" style="display: inline-block;" width="409px" height="240px" alt="Salticid installing riak" />
+
 
 Salticid runs commands on other computers via SSH, with just enough
 programmability and structure to run small-scale (~10-20 nodes in parallel)
@@ -267,7 +266,7 @@ salticid riak.deploy
 Salticid parallelizes across hosts. Use the left and right arrow keys, or tab,
 to switch between hosts in the ncurses interface.
 
-Typically you'll use salticid with a common set of files over and over again, instead of loading files explicitly with `-l`. You can put any commands to source in `~/.salticidrc`; they'll be evaluated on the top-level salticid context:
+Typically you'll use salticid with a common set of files over and over again, instead of loading files explicitly with `-l`. You can put any commands to source in `~/.salticidrc` (or .salticidrc in the current working directory); they'll be evaluated on the top-level salticid context:
 
 ```ruby
 load ENV['HOME'] + '/my-deploy/salticid/*.rb'
@@ -340,7 +339,7 @@ the full interface:
 
 ```ruby
 task :console do
-  Hydra::Interface.shutdown false
+  Salticid::Interface.shutdown false
 
   if tunnel
     tunnel.open(name, 22) do |port|
@@ -352,7 +351,7 @@ task :console do
 end
 ```
 
-Now `hydra -h my.host.com console` will drop you into an SSH console on that
+Now `salticid -h my.host.com console` will drop you into an SSH console on that
 node.
 
 History

data/bin/salticid

@@ -5,13 +5,19 @@ require 'trollop'
 require "#{File.dirname(__FILE__)}/../lib/salticid"
 require 'salticid/interface'
 
+rcfiles = [File.join(ENV["HOME"], '.salticidrc'), ".salticidrc"].select do |f|
+  File.exist? f
+end
+# NB: Trollop seems to turn the :multi into a boolean if it's empty (shrug)
+rcfiles = [File.join(ENV["HOME"], '.salticidrc')] if rcfiles.empty?
+
 opts = Trollop::options do
-  opt :exec, 'A command line to execute.', :type => :string
-  opt :group, 'One or more groups to run task on', :type => :string, :multi => true
-  opt :host, 'One or more hosts to run task on', :type => :string, :multi => true
-  opt :load, 'Files to load', :default => [File.join(ENV["HOME"], '.salticidrc')], :multi => true
-  opt :role, 'One or more roles. Every host in the role will have the specified task run.', :type => :string, :multi => true
-  opt :show, 'Show roles, tasks, hosts, and groups. Try --show salticid or --show <host>', :type => :string
+  opt :exec,    'A command line to execute.', :type => :string
+  opt :group,   'One or more groups to run task on', :type => :string, :multi => true
+  opt :host,    'One or more hosts to run task on', :type => :string, :multi => true
+  opt :load,    'Files to load', :default => rcfiles, :multi => true
+  opt :role,    'One or more roles. Every host in the role will have the specified task run.', :type => :string, :multi => true
+  opt :show,    'Show roles, tasks, hosts, and groups. Try --show salticid or --show <host>', :type => :string
 end
 
 task = ARGV.first
@@ -20,6 +26,10 @@ STDOUT.sync = true
 @h = Salticid.new
 
 # Load files
+if !opts[:load] || opts[:load].empty?
+  Trollop::die 'No salticidrc files found, nothing to do'
+end
+
 opts[:load].each do |file|
   @h.load file
 end
@@ -45,6 +55,12 @@ if opts[:show]
   case opts[:show]
   when 'salticid'
     puts @h.to_string
+  when 'all-tasks'
+    @h.roles.each do |role|
+      role.tasks.each do |task|
+        puts "#{role}.#{task.name}"
+      end
+    end
   else
     begin
       o = @h.send(opts[:show].to_sym)
@@ -95,6 +111,7 @@ begin
   # When the interface exits, wait for each thread to complete work.
   threads.each { |t| t.join rescue nil }
 rescue => e
-  interface.shutdown
+  interface.shutdown false rescue nil
   raise e
 end
+

data/lib/salticid.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'net/ssh'
 require 'net/scp'
 require 'net/ssh/gateway'
+require 'thread'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
@@ -25,7 +26,7 @@ class Salticid
   require 'salticid/gateway'
   require 'salticid/group'
 
-  attr_accessor :gw, :groups, :hosts, :roles, :tasks
+  attr_accessor :gw, :groups, :hosts, :roles, :tasks, :mutex
 
   def initialize
     @gw = nil
@@ -33,6 +34,7 @@ class Salticid
     @groups = []
     @roles = []
     @tasks = []
+    @mutex = Mutex.new
   end
 
   # Define a gateway.

data/lib/salticid/host.rb

@@ -152,7 +152,7 @@ class Salticid::Host
     end
 
     # After command, add a semicolon...
-    unless command =~ /;\s*$/
+    unless command =~ /;\s*\z/
       command += ';'
     end
 
@@ -182,7 +182,7 @@ class Salticid::Host
         # Handle STDOUT
         ch.on_data do |c, data|
           # Could this data be the status code?
-          if pos = (data =~ /(\d{1,3})\n$/)
+          if pos = (data =~ /(\d{1,3})\n\z/)
             # Set status
             status = $1
 

data/lib/salticid/interface.rb

@@ -1,6 +1,6 @@
 class Salticid
   class Interface
-    require 'ncurses'
+    require 'curses'
     require 'salticid/interface/ncurses'
     require 'salticid/interface/resizable'
     require 'salticid/interface/view'
@@ -8,11 +8,11 @@ class Salticid
     require 'salticid/interface/host_view'
 
     COLORS = {
-      :info => Ncurses::COLOR_WHITE,
-      :error => Ncurses::COLOR_RED,
-      :warn => Ncurses::COLOR_YELLOW,
-      :debug => Ncurses::COLOR_CYAN,
-      :finished => Ncurses::COLOR_GREEN
+      :info => Curses::COLOR_WHITE,
+      :error => Curses::COLOR_RED,
+      :warn => Curses::COLOR_YELLOW,
+      :debug => Curses::COLOR_CYAN,
+      :finished => Curses::COLOR_GREEN
     }
     COLOR_PAIRS = {}
 
@@ -37,15 +37,17 @@ class Salticid
     def initialize(salticid)
       self.class.interfaces << self
 
+
       # Set up ncurses
-      Ncurses.initscr
-      Ncurses.cbreak
-      Ncurses.noecho
-      Ncurses.nonl
-      Ncurses.stdscr.intrflush false
-      Ncurses.stdscr.keypad true
-      Ncurses.start_color
-      Ncurses.use_default_colors
+      Curses.init_screen
+      Curses.cbreak
+      Curses.noecho
+      Curses.nonl
+      # Gone in Ruby Curses because ???
+      # Curses.stdscr.intrflush false
+      Curses.stdscr.keypad true
+      Curses.start_color
+      Curses.use_default_colors
 
       @salticid = salticid
       @hosts = []
@@ -67,7 +69,7 @@ class Salticid
         self,
         :host => host,
         :top => 1,
-        :height => Ncurses.LINES - 1
+        :height => Curses.lines - 1
       )
       hv.on_state_change do |state|
         @tabs.render
@@ -76,10 +78,12 @@ class Salticid
       tab.show
     end
 
+    # Set up colors
     def colorize
       COLORS.each_with_index do |c, i|
-        Ncurses.init_pair i + 1, c.last, -1
-        COLOR_PAIRS[c.first] = Ncurses.COLOR_PAIR(i + 1)
+        pair_num = i + 1
+        Curses.init_pair pair_num, c.last, -1
+        COLOR_PAIRS[c.first] = pair_num
       end
     end
 
@@ -97,16 +101,12 @@ class Salticid
       @main.join
     end
 
-    # List channels and topics
-    def list(*channels)
-      @connection.list *channels
-    end
-
     # Mainloop
     def main
       @main = Thread.new do
         Thread.current.priority = -1
-        trap("WINCH") { resize if Thread.current.alive? }
+        main_thread = Thread.current
+        trap("WINCH") { resize if main_thread.alive? }
 
         loop do
           # Get character
@@ -117,23 +117,27 @@ class Salticid
             next
           end
 
+          File.open("/tmp/curses.log", "a") { |f|
+            f.puts char.inspect
+          }
+
           # Do stuff
           case char
           when 9 # tab
             @tabs.scroll
-          when 113 # q
+          when "q" # q
             shutdown
-          when Ncurses::KEY_LEFT
+          when Curses::KEY_LEFT
             @tabs.scroll -1
-          when Ncurses::KEY_RIGHT
+          when Curses::KEY_RIGHT
             @tabs.scroll 1
-          when Ncurses::KEY_PPAGE
+          when Curses::KEY_PPAGE
             tab.scroll -tab.height / 2
-          when Ncurses::KEY_NPAGE
+          when Curses::KEY_NPAGE
             tab.scroll tab.height / 2
-          when Ncurses::KEY_UP
+          when Curses::KEY_UP
             tab.scroll -1 
-          when Ncurses::KEY_DOWN
+          when Curses::KEY_DOWN
             tab.scroll 1
           end
         end
@@ -143,10 +147,10 @@ class Salticid
     # Resize to fit display
     def resize
       # We need to nuke ncurses to pick up the new dimensions
-      Ncurses.def_prog_mode
-      Ncurses.endwin
-      Ncurses.reset_prog_mode
-      height, width = Ncurses.dimensions
+      Curses.def_prog_mode
+      Curses.close_screen
+      Curses.reset_prog_mode
+      height, width = Curses.dimensions
    
       # Resize tabs 
       @tabs.resize(
@@ -162,10 +166,10 @@ class Salticid
       @tabs.shutdown
      
       # Shut down ncurses
-      Ncurses.echo
-      Ncurses.nocbreak
-      Ncurses.nl
-      Ncurses.endwin
+      Curses.echo
+      Curses.nocbreak
+      Curses.nl
+      Curses.close_screen
 
       # Stop interface
       @main.exit rescue nil

data/lib/salticid/interface/host_view.rb

@@ -41,7 +41,7 @@ class Salticid
       def render
         return if @hidden
 
-        @window.erase
+        @window.clear
 
         lines_left = @height
         message_i = @scroll_position
@@ -72,20 +72,20 @@ class Salticid
 
             if i.zero?
               # Put top line
-              @window.move lines_left, 0
+              @window.setpos lines_left, 0
               @window.addstr time + ' '
-              @window.attron Ncurses::A_BOLD
-              @window.attron color if color
+              @window.attron Curses::A_BOLD
+              @window.color_set color if color
               @window.addstr line
             else
               # Put hanging line
-              @window.attron Ncurses::A_BOLD
+              @window.attron Curses::A_BOLD
               @window.attron color if color
-              @window.move lines_left, offset
+              @window.setpos lines_left, offset
               @window.addstr line
             end
-            @window.attroff color if color
-            @window.attroff Ncurses::A_BOLD
+            @window.color_set Interface::COLOR_PAIRS[:info] if color
+            @window.attroff Curses::A_BOLD
 
             unless @window.cursor[1] == 0
               # Clear rest of line

data/lib/salticid/interface/ncurses.rb

@@ -1,13 +1,10 @@
-module Ncurses
+module Curses
   # Returns size of screen [y, x]
   def self.dimensions
-    x = Array.new
-    y = Array.new
-    Ncurses.getmaxyx(Ncurses.stdscr, y, x)
-    [y.first, x.first]
+    [Curses.stdscr.maxy, Curses.stdscr.maxx]
   end
 
-  class WINDOW
+  class Window
     # Adds a FormattedString
     def add_formatted_string(string)
       string.each do |part|
@@ -21,10 +18,7 @@ module Ncurses
 
     # Returns cursor y and x coordinates.
     def cursor
-      y = Array.new
-      x = Array.new
-      getyx y, x
-      [y.first, x.first]
+      [cury, curx]
     end
   end
 end

data/lib/salticid/interface/resizable.rb

@@ -12,7 +12,7 @@ class Salticid
 
           if @window
             # Resize window
-            @window.mvwin @top, @left
+            @window.move @top, @left
             @window.resize @height, @width
           end
 

data/lib/salticid/interface/tab_view.rb

@@ -66,21 +66,21 @@ class Salticid
         end
 
         # Move to start
-        @window.move 0,0
+        @window.setpos 0,0
 
         @tabs.each_with_index do |tab, i|
           if i > 0
-            @window.addch Ncurses::ACS_VLINE
+            @window.addstr '|'
           end
 
           color = Interface::COLOR_PAIRS[tab.state]
-          @window.attron color if color
-          @window.attron Ncurses::A_BOLD
-          @window.attron Ncurses::A_REVERSE if i == @active
+          @window.color_set color if color
+          @window.attron Curses::A_BOLD
+          @window.attron Curses::A_REVERSE if i == @active
           @window.addstr tab.to_s.slice(0,regions[i]).center(regions[i])
-          @window.attroff Ncurses::A_REVERSE if i == @active
-          @window.attroff Ncurses::A_BOLD
-          @window.attroff color if color
+          @window.attroff Curses::A_REVERSE if i == @active
+          @window.attroff Curses::A_BOLD
+          @window.color_set Interface::COLOR_PAIRS[:info]
         end
 
         @window.refresh

data/lib/salticid/interface/view.rb

@@ -7,12 +7,12 @@ class Salticid
 
       def initialize(interface, params = {})
         @interface = interface
-        @height = params[:height] || Ncurses.LINES
-        @width = params[:width] || Ncurses.COLS
+        @height = params[:height] || Curses.lines
+        @width = params[:width] || Curses.cols
         @top = params[:top] || 0
         @left = params[:left] || 0
 
-        @window = Ncurses::WINDOW.new @height, @width, @top, @left
+        @window = Curses::Window.new @height, @width, @top, @left
       end
 
       def height=(height)
@@ -22,7 +22,7 @@ class Salticid
 
       def hide
         @hidden = true
-        @window.erase
+        @window.clear
       end
 
       def left=(left)

data/lib/salticid/version.rb

@@ -1,3 +1,3 @@
 class Salticid
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: salticid
 version: !ruby/object:Gem::Version
-  version: 0.9.5
-  prerelease: 
+  version: 0.9.6
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,65 +27,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   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: net-ssh
   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: net-ssh-gateway
   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: net-ssh-multi
   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'
 description: 
@@ -106,7 +95,6 @@ files:
 - lib/salticid/host.rb
 - lib/salticid/host/ip.rb
 - lib/salticid/interface.rb
-- lib/salticid/interface/conversation_view.rb
 - lib/salticid/interface/host_view.rb
 - lib/salticid/interface/ncurses.rb
 - lib/salticid/interface/resizable.rb
@@ -128,26 +116,25 @@ files:
 - bin/salticid
 homepage: https://github.com/aphyr/salticid
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Run commands over SSH, with Ruby magic.
 test_files: []

data/lib/salticid/interface/conversation_view.rb

@@ -1,150 +0,0 @@
-module IRC
-  require ROOT + '/interface'
-  require ROOT + '/view'
-  class Interface
-    class ConversationView < View
-
-      attr_accessor :messages, :window
-
-      COLORS = [
-        Ncurses::COLOR_WHITE,
-        Ncurses::COLOR_RED,
-        Ncurses::COLOR_GREEN,
-        Ncurses::COLOR_YELLOW,
-        Ncurses::COLOR_BLUE,
-        Ncurses::COLOR_MAGENTA,
-        Ncurses::COLOR_CYAN
-      ] 
-
-      def initialize(interface, params = {})
-        @messages = []
-
-        @scroll_position = -1
-
-        super
-
-        @color_index = 0
-
-        @color_map = Hash.new do |hash, key|
-          if key
-            hash[key] = @color_index.modulo Ncurses.COLOR_PAIRS
-            @color_index += 1
-          else
-            nil
-          end
-        end
-
-        colorize
-      end
-
-      def <<(message)
-        # Scroll if at bottom
-        @scroll_position += 1 if @scroll_position == @messages.size - 1
-
-        # Add color
-        if message.respond_to? :user
-          @color_map[message.user.nick]
-        end
-
-        @messages << message
-        render
-      end
-
-      # Set up colors
-      def colorize
-        COLORS.each_with_index do |color, i|
-          Ncurses.init_pair i, color, Ncurses::COLOR_BLACK
-        end
-      end
-
-      def render
-        if @hidden
-          return
-        end
-
-        @window.erase
-
-        lines_left = @height
-        message_i = @scroll_position
-        while message_i >= 0
-          # Message
-          message = @messages[message_i]
-          message_i -= 1
-
-          IRC.log "displaying message #{message}"
-
-          # Time
-          time = message.time.strftime "%H:%M:%S"
-
-          case message
-          when PrivMsg
-            color = Ncurses.COLOR_PAIR(@color_map[message.user.nick])
-            user = message.user.to_s || ''
-            text = message.text
-          when Event
-            user = ''
-            text = message.text
-          when Command
-            user = message.user.to_s || ''
-            text = message.text
-          else
-            user = message.user.to_s || ''
-            text = message.command + ' ' + message.params.join(" ")
-          end
-          
-          offset = time.length + user.length + 3
-
-          lines = [text[0, @width - offset]]
-          if remaining = text[@width - offset..-1]
-            lines += remaining.lines(@width - offset - 1)
-          end
-
-          # Put lines in reverse
-          i = lines.size
-          while i > 0
-            i -= 1
-            line = lines[i]
-
-            lines_left -= 1
-            break if lines_left < 0
-
-            if i.zero?
-              # Put top line
-              @window.move lines_left, 0
-              @window.addstr time + ' '
-              @window.attron Ncurses::A_BOLD
-              @window.attron color if color
-              @window.addstr user
-              @window.attroff color if color
-              @window.attroff Ncurses::A_BOLD
-              @window.addstr ': '
-              @window.addstr line
-            else
-              # Put hanging line
-              @window.move lines_left, offset
-              @window.addstr line
-            end
-
-            unless @window.cursor[1] == 0
-              # Clear rest of line
-              @window.clrtoeol
-            end
-          end
-        end
-        @window.refresh
-      end
-
-      # Scrolls the window by delta messages
-      def scroll(delta)
-        @scroll_position += delta
-        if @scroll_position < 0
-          @scroll_position = 0
-        elsif @scroll_position >= @messages.size
-          @scroll_position = @messages.size - 1
-        end
-
-        render
-      end
-    end
-  end
-end