rutty 2.4.2 → 2.5.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.8.7@rutty --create

data/Gemfile

@@ -8,12 +8,13 @@ gem "net-scp", '~> 1.0.4'
 gem "builder", '~> 2.1.2'
 gem "treetop", '~> 1.4.8'
 gem "fastthread", '~> 1.0.7'
+gem "work_queue", '~> 1.0.0'
 
 group :development do
-  gem "jeweler", '~> 1.5.1'
+  gem "jeweler", '~> 1.6.2'
   gem "bundler", '~> 1.0.0'
   gem "shoulda", ">= 0"
-  gem "rcov", ">= 0"
   gem "xml-simple", '~> 1.0.12'
   gem "ruby-debug", ">= 0"
+  gem "rake", "~> 0.9.2"
 end

data/Gemfile.lock

@@ -2,14 +2,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (2.1.2)
-    columnize (0.3.1)
+    columnize (0.3.2)
     commander (4.0.3)
       highline (>= 1.5.0)
     fastthread (1.0.7)
     git (1.2.5)
     highline (1.6.1)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.4.6)
@@ -18,17 +18,17 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.0.23)
     polyglot (0.3.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    ruby-debug (0.10.3)
+    rake (0.9.2)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     shoulda (2.11.3)
     terminal-table (1.4.2)
-    treetop (1.4.8)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
+    work_queue (1.0.0)
     xml-simple (1.0.12)
 
 PLATFORMS
@@ -39,13 +39,14 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   commander (~> 4.0.3)
   fastthread (~> 1.0.7)
-  jeweler (~> 1.5.1)
+  jeweler (~> 1.6.2)
   json (~> 1.4.6)
   net-scp (~> 1.0.4)
   net-ssh (~> 2.0.23)
-  rcov
+  rake (~> 0.9.2)
   ruby-debug
   shoulda
   terminal-table (~> 1.4.2)
   treetop (~> 1.4.8)
+  work_queue (~> 1.0.0)
   xml-simple (~> 1.0.12)

data/README.md

@@ -111,21 +111,23 @@ will run the `uptime` command on any nodes that are tagged with "foo" **OR** "ba
 The pseudo-SQL tag query mode provides the most control over your tags. This allows you to pass in a string that looks
 a bit like SQL, letting you specify complex rules for your tag lookup. For example:
 
-	$ rutty dsh -g "'foo' AND 'bar'" uptime
+	$ rutty dsh -g "foo AND bar" uptime
 
 will run `uptime` on any node that has **BOTH** "foo" and "bar" tags. The command
 
-	$ rutty dsh -g "'foo' OR ('baz' AND 'bar')" uptime
+	$ rutty dsh -g "foo OR (baz AND bar)" uptime
 	
 will run `uptime` on any node that has a "foo" tag **OR** any node that has **BOTH** "baz" and "bar" tags.
 
 TODO
 ----
 
+* Add negation to tag query (eg something like "'foo' AND !'bar'" or "'foo' AND NOT 'bar'")
 * Refactor defaults config YAML to allow for a broader range of 
   configuration options (max number of threads, default output format, etc)
 * Implement `rutty upgrade` action, which will upgrade your config files to the latest version
 * Make a GitHub page
+* Add multi_progress_bar to scp command
 
 Note on Patches/Pull Requests
 -----------------------------

data/Rakefile

@@ -22,6 +22,9 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/jlindsey/rutty"
   gem.license = "MIT"
   gem.authors = ["Josh Lindsey"]
+
+  require './lib/rutty/version.rb'
+  gem.version = Rutty::Version::STRING
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -32,18 +35,12 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = false
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true 
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+task :default => :test
+
+namespace :treetop do
+  desc "Recompile the Treetop Ruby parser file"
+  task :regen do
+    puts %x(cd #{File.dirname __FILE__}/lib/rutty/treetop && tt tag_query.treetop 2>&1)
   end
 end
 
-task :default => :test
-

data/lib/rutty/actions.rb

@@ -37,7 +37,8 @@ module Rutty
         defaults_hash = { 
           :user => 'root', 
           :keypath => File.join(ENV['HOME'], '.ssh', 'id_rsa'), 
-          :port => 22
+          :port => 22,
+          :tags => []
         }
 
         File.open(general_file, 'w') do |f|
@@ -245,32 +246,33 @@ module Rutty
     # @see #scp
     #
     # @param [Nodes] nodes The {Node} objects to connect to
+    # @param [Bool] debug (false) Whether to output debugging info for each connection
     # @return [Array<Net:SSH::Connection>] The array of live connections
     def connect_to_nodes nodes, debug = false
       require 'logger'
       require 'net/ssh'
       require 'net/scp'
       require 'fastthread'
-      require 'rutty/thread_pool/pool'
+      require 'work_queue'
       
       connections = []
       cons_lock = Mutex.new
       returns_lock = Mutex.new
       
-      pool = Rutty::ThreadPool.new 10
+      pool = WorkQueue.new 10
       
       nodes.each do |node|
-        pool.process do
+        pool.enqueue_b do
           returns_lock.synchronize { 
             @returns[node.host] = { :exit => 0, :out => '' } 
           }
           begin
-            cons_lock.synchronize {
-              connections << Net::SSH.start(node.host, node.user, :port => node.port, :paranoid => false, 
-              :user_known_hosts_file => '/dev/null', :keys => [node.keypath], :timeout => 5,
-              :logger => Logger.new(debug ? $stderr : $stdout),
-              :verbose => (debug ? Logger::FATAL : Logger::DEBUG))
-            }
+            conn = Net::SSH.start(node.host, node.user, :port => node.port, :paranoid => false, 
+                :user_known_hosts_file => '/dev/null', :keys => [node.keypath], :timeout => 5,
+                :logger => Logger.new(debug ? $stderr : $stdout),
+                :verbose => (debug ? Logger::FATAL : Logger::DEBUG))
+
+            cons_lock.synchronize { connections << conn }
           rescue Errno::ECONNREFUSED
             returns_lock.synchronize {
               @returns[node.host][:out] = "ERROR: Connection refused"
@@ -308,7 +310,7 @@ module Rutty
         sleep 0.2
       end
       
-      pool.shutdown
+      pool.stop
       connections.compact
     end
     
@@ -337,7 +339,7 @@ module Rutty
 
           if hash[:exit] >= 10000
             padded_host = "<%= color('#{padded_host}', :critical) %>"
-            hash[:out] = "<%= color('#{hash[:out]}', :red) %>"
+            hash[:out] = "<%= color('#{hash[:out]}', :red) %>\n"
           elsif hash[:exit] > 0
             padded_host = "<%= color('#{padded_host}', :error) %>"
           else

data/lib/rutty/consts.rb

@@ -11,7 +11,7 @@ module Rutty
     DEFAULT_OUTPUT_FORMAT = 'human-readable'
     
     ## Name of the general (defaults) config file
-    GENERAL_CONF_FILE = 'defaults.yaml'
+    GENERAL_CONF_FILE = 'config.yaml'
     ## Name of the datastore file for user-defined nodes
     NODES_CONF_FILE = 'nodes.yaml'
     

data/lib/rutty/node.rb

@@ -38,6 +38,7 @@ module Rutty
     #
     # @param [String] tag The tag string to check for
     def has_tag? tag
+      return false if self.tags.nil? 
       self.tags.include? tag
     end
     

data/lib/rutty/nodes.rb

@@ -112,7 +112,7 @@ module Rutty
 
         parsed_syntax_tree = parser.parse(query_str)
 
-        raise InvalidTagQueryString.new "error: Unable to parse tag query string" if parsed_syntax_tree.nil?
+        raise InvalidTagQueryString.new "Unable to parse tag query string" if parsed_syntax_tree.nil?
         
         proc_str = recursive_build_query_proc_string parsed_syntax_tree.elements
         proc_str = proc_str.rstrip << ') }'
@@ -145,7 +145,7 @@ module Rutty
 
       case elem.class.to_s
       when 'TagQueryGrammar::Tag'
-        str << "n.has_tag?(#{elem.text_value}) "
+        str << "n.has_tag?('#{elem.text_value}') "
       when 'TagQueryGrammar::AndLiteral'
         str << "&& "
       when 'TagQueryGrammar::OrLiteral'
@@ -167,4 +167,4 @@ module Rutty
       recursive_build_query_proc_string elems, str
     end
   end
-end
+end

data/lib/rutty/treetop/tag_query.rb

@@ -109,44 +109,69 @@ module TagQueryGrammar
     end
 
     i0, s0 = index, []
-    if has_terminal?('\G["|\']', true, index)
-      r1 = true
-      @index += 1
+    i1 = index
+    i2 = index
+    r3 = _nt_quote
+    if r3
+      r2 = r3
     else
+      r4 = _nt_group
+      if r4
+        r2 = r4
+      else
+        r5 = _nt_boolean
+        if r5
+          r2 = r5
+        else
+          r6 = _nt_space
+          if r6
+            r2 = r6
+          else
+            r7 = _nt_group_start
+            if r7
+              r2 = r7
+            else
+              r8 = _nt_group_end
+              if r8
+                r2 = r8
+              else
+                @index = i2
+                r2 = nil
+              end
+            end
+          end
+        end
+      end
+    end
+    if r2
       r1 = nil
+    else
+      @index = i1
+      r1 = instantiate_node(SyntaxNode,input, index...index)
     end
     s0 << r1
     if r1
-      s2, i2 = [], index
+      s9, i9 = [], index
       loop do
         if has_terminal?('\G[\\w-]', true, index)
-          r3 = true
+          r10 = true
           @index += 1
         else
-          r3 = nil
+          r10 = nil
         end
-        if r3
-          s2 << r3
+        if r10
+          s9 << r10
         else
           break
         end
       end
-      if s2.empty?
-        @index = i2
-        r2 = nil
+      if s9.empty?
+        @index = i9
+        r9 = nil
       else
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      end
-      s0 << r2
-      if r2
-        if has_terminal?('\G["|\']', true, index)
-          r4 = true
-          @index += 1
-        else
-          r4 = nil
-        end
-        s0 << r4
+        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
       end
+      s0 << r9
     end
     if s0.last
       r0 = instantiate_node(Tag,input, i0...index, s0)
@@ -161,6 +186,48 @@ module TagQueryGrammar
     r0
   end
 
+  def _nt_quote
+    start_index = index
+    if node_cache[:quote].has_key?(index)
+      cached = node_cache[:quote][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if has_terminal?('"', false, index)
+      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('"')
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      if has_terminal?("'", false, index)
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure("'")
+        r2 = nil
+      end
+      if r2
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:quote][start_index] = r0
+
+    r0
+  end
+
   module Group0
     def group_start
       elements[0]

data/lib/rutty/treetop/tag_query.treetop

@@ -4,7 +4,11 @@ grammar TagQueryGrammar
   end
 
   rule tag
-    ["|'] [\w-]+ ["|'] <Tag>
+    !(quote / group / boolean / space / group_start / group_end) [\w-]+ <Tag>
+  end
+
+  rule quote
+    '"' / "'"
   end
 
   rule group

data/lib/rutty/version.rb

@@ -8,7 +8,7 @@ module Rutty
   # @see http://semver.org
   module Version
     MAJOR = 2
-    MINOR = 4
+    MINOR = 5
     PATCH = 2
     BUILD = nil
 

data/rutty.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutty}
-  s.version = "2.4.2"
+  s.version = "2.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lindsey"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2011-06-20}
   s.default_executable = %q{rutty}
   s.description = %q{
       RuTTY is a DSH (distributed / dancer's shell) written in Ruby. It's used to run commands 
@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rvmrc",
     ".yardopts",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
-    "VERSION",
     "bin/rutty",
     "lib/rutty.rb",
     "lib/rutty/actions.rb",
@@ -40,8 +40,6 @@ Gem::Specification.new do |s|
     "lib/rutty/node.rb",
     "lib/rutty/nodes.rb",
     "lib/rutty/proc_classes.rb",
-    "lib/rutty/thread_pool/pool.rb",
-    "lib/rutty/thread_pool/worker.rb",
     "lib/rutty/treetop/syntax_nodes.rb",
     "lib/rutty/treetop/tag_query.rb",
     "lib/rutty/treetop/tag_query.treetop",
@@ -64,26 +62,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jlindsey/rutty}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A DSH implementation in Ruby}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_action_add_node.rb",
-    "test/test_action_dsh.rb",
-    "test/test_action_init.rb",
-    "test/test_action_list_nodes.rb",
-    "test/test_action_scp.rb",
-    "test/test_actions.rb",
-    "test/test_config.rb",
-    "test/test_consts.rb",
-    "test/test_helpers.rb",
-    "test/test_node.rb",
-    "test/test_nodes.rb",
-    "test/test_runner.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -95,12 +77,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_runtime_dependency(%q<treetop>, ["~> 1.4.8"])
       s.add_runtime_dependency(%q<fastthread>, ["~> 1.0.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_runtime_dependency(%q<work_queue>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<xml-simple>, ["~> 1.0.12"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
       s.add_dependency(%q<terminal-table>, ["~> 1.4.2"])
@@ -110,12 +93,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_dependency(%q<treetop>, ["~> 1.4.8"])
       s.add_dependency(%q<fastthread>, ["~> 1.0.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<work_queue>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<xml-simple>, ["~> 1.0.12"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
@@ -126,12 +110,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
     s.add_dependency(%q<treetop>, ["~> 1.4.8"])
     s.add_dependency(%q<fastthread>, ["~> 1.0.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<work_queue>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<xml-simple>, ["~> 1.0.12"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
   end
 end
 

data/test/helper.rb

@@ -23,8 +23,8 @@ class Test::Unit::TestCase
   
   TMP_DIR = File.join(File.dirname(__FILE__), '..', 'tmp')
   TEST_CONF_DIR = File.join(TMP_DIR, 'config')
-  TEST_GENERAL_CONF = File.join(TEST_CONF_DIR, 'defaults.yaml')
-  TEST_NODES_CONF = File.join(TEST_CONF_DIR, 'nodes.yaml')
+  TEST_GENERAL_CONF = File.join(TEST_CONF_DIR, Rutty::Consts::GENERAL_CONF_FILE)
+  TEST_NODES_CONF = File.join(TEST_CONF_DIR, Rutty::Consts::NODES_CONF_FILE)
   
   RUTTY_BIN = File.join File.dirname(__FILE__), '..', 'bin', 'rutty'
   

data/test/test_consts.rb

@@ -3,18 +3,11 @@ require 'helper'
 class TestConsts < Test::Unit::TestCase
   context "The Rutty::Consts module" do
     should "have all the constants set" do
+      assert_not_nil Rutty::Consts::GENERAL_CONF_FILE
+      assert_not_nil Rutty::Consts::NODES_CONF_FILE
       assert_not_nil Rutty::Consts::CONF_DIR
       assert_not_nil Rutty::Consts::GENERAL_CONF
       assert_not_nil Rutty::Consts::NODES_CONF
     end
-    
-    should "have the constants be the proper values" do
-      assert_equal Rutty::Consts::GENERAL_CONF_FILE, 'defaults.yaml'
-      assert_equal Rutty::Consts::NODES_CONF_FILE, 'nodes.yaml'
-      
-      assert_equal Rutty::Consts::CONF_DIR, File.join(ENV['HOME'], '.rutty')
-      assert_equal Rutty::Consts::GENERAL_CONF, File.join(Rutty::Consts::CONF_DIR, 'defaults.yaml')
-      assert_equal Rutty::Consts::NODES_CONF, File.join(Rutty::Consts::CONF_DIR, 'nodes.yaml')
-    end
   end
 end

data/test/test_nodes.rb

@@ -59,7 +59,7 @@ class TestNodes < Test::Unit::TestCase
       Rutty::Nodes.publicize_methods do
         assert_instance_of Rutty::Procs::SingleTagQuery, @nodes.get_tag_query_filter('foo')
         assert_instance_of Rutty::Procs::MultipleTagQuery, @nodes.get_tag_query_filter('foo,bar')
-        assert_instance_of Rutty::Procs::SqlLikeTagQuery, @nodes.get_tag_query_filter("'foo' AND 'bar' OR 'baz'")
+        assert_instance_of Rutty::Procs::SqlLikeTagQuery, @nodes.get_tag_query_filter("foo AND bar OR baz")
       end
     end
     
@@ -71,12 +71,12 @@ class TestNodes < Test::Unit::TestCase
 
           parser = TagQueryGrammarParser.new
 
-          proc_str = @nodes.recursive_build_query_proc_string parser.parse("'foo' AND 'bar' OR 'baz'").elements
+          proc_str = @nodes.recursive_build_query_proc_string parser.parse("foo AND bar OR baz").elements
           proc_str = proc_str.rstrip << ') }'
           
           assert_equal "Procs::SqlLikeTagQuery.new { |n| !(n.has_tag?('foo') && n.has_tag?('bar') || n.has_tag?('baz')) }", proc_str
           
-          proc_str = @nodes.recursive_build_query_proc_string parser.parse("'test' OR ('example' AND 'foo')").elements
+          proc_str = @nodes.recursive_build_query_proc_string parser.parse("test OR (example AND foo)").elements
           proc_str = proc_str.rstrip << ') }'
           
           assert_equal "Procs::SqlLikeTagQuery.new { |n| !(n.has_tag?('test') || (n.has_tag?('example') && n.has_tag?('foo'))) }", proc_str
@@ -85,7 +85,7 @@ class TestNodes < Test::Unit::TestCase
     
     should "raise an exception on malformed tag query strings" do
       Rutty::Nodes.publicize_methods do
-        ["'foo' ARND 'bar'", "'fail", "'failure' AND )'foo'"].each do |str|
+        ["foo ARND bar", "'fail", "failure AND )foo"].each do |str|
           assert_raises Rutty::InvalidTagQueryString do
             @nodes.get_tag_query_filter str
           end
@@ -128,15 +128,15 @@ class TestNodes < Test::Unit::TestCase
     end
     
     should "correctly filter on a SQL-like tag query and return the correct node(s)" do
-      filtered = @nodes.filter(OpenStruct.new :tags => "'test' AND 'localhost'")
+      filtered = @nodes.filter(OpenStruct.new :tags => "test AND localhost")
       assert_equal 1, filtered.length
       assert_equal [@node1], filtered
       
-      filtered = @nodes.filter(OpenStruct.new :tags => "'example' OR 'localhost'")
+      filtered = @nodes.filter(OpenStruct.new :tags => "example OR localhost")
       assert_equal 2, filtered.length
       assert_equal [@node1, @node3], filtered
       
-      filtered = @nodes.filter(OpenStruct.new :tags => "'localhost' AND 'test' OR ('google')")
+      filtered = @nodes.filter(OpenStruct.new :tags => "localhost AND test OR (google)")
       assert_equal 2, filtered.length
       assert_equal [@node1, @node2], filtered
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutty
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 2
-  - 4
+  - 5
   - 2
-  version: 2.4.2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Josh Lindsey
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -05:00
+date: 2011-06-20 00:00:00 -04:00
 default_executable: rutty
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +32,11 @@ dependencies:
         - 0
         - 3
         version: 4.0.3
-  type: :runtime
   name: commander
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +48,11 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
-  type: :runtime
   name: terminal-table
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +64,11 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  type: :runtime
   name: json
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +80,11 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
-  type: :runtime
   name: net-ssh
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +96,11 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
-  type: :runtime
   name: net-scp
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +112,11 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  type: :runtime
   name: builder
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +128,11 @@ dependencies:
         - 4
         - 8
         version: 1.4.8
-  type: :runtime
   name: treetop
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,57 +144,59 @@ dependencies:
         - 0
         - 7
         version: 1.0.7
-  type: :runtime
   name: fastthread
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 23
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
-  type: :development
-  name: jeweler
-  prerelease: false
+        - 0
+        - 0
+        version: 1.0.0
+  name: work_queue
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 11
         segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  name: bundler
-  prerelease: false
+        - 6
+        - 2
+        version: 1.6.2
+  name: jeweler
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
-  type: :development
-  name: shoulda
-  prerelease: false
+        - 0
+        version: 1.0.0
+  name: bundler
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -202,11 +206,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: rcov
-  prerelease: false
+  name: shoulda
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -218,11 +222,11 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
-  type: :development
   name: xml-simple
-  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -232,10 +236,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   name: ruby-debug
-  prerelease: false
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  name: rake
+  version_requirements: *id015
 description: "\n      RuTTY is a DSH (distributed / dancer's shell) written in Ruby. It's used to run commands \n      on multiple remote servers at once, based on a tagging system. Also allows for multiple\n      SCP-style uploads.\n    "
 email: josh@cloudspace.com
 executables: 
@@ -246,13 +264,13 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .rvmrc
 - .yardopts
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - bin/rutty
 - lib/rutty.rb
 - lib/rutty/actions.rb
@@ -263,8 +281,6 @@ files:
 - lib/rutty/node.rb
 - lib/rutty/nodes.rb
 - lib/rutty/proc_classes.rb
-- lib/rutty/thread_pool/pool.rb
-- lib/rutty/thread_pool/worker.rb
 - lib/rutty/treetop/syntax_nodes.rb
 - lib/rutty/treetop/tag_query.rb
 - lib/rutty/treetop/tag_query.treetop
@@ -313,21 +329,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A DSH implementation in Ruby
-test_files: 
-- test/helper.rb
-- test/test_action_add_node.rb
-- test/test_action_dsh.rb
-- test/test_action_init.rb
-- test/test_action_list_nodes.rb
-- test/test_action_scp.rb
-- test/test_actions.rb
-- test/test_config.rb
-- test/test_consts.rb
-- test/test_helpers.rb
-- test/test_node.rb
-- test/test_nodes.rb
-- test/test_runner.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-2.4.2

data/lib/rutty/thread_pool/pool.rb

@@ -1,80 +0,0 @@
-require 'thread'
-require 'fastthread'
-require 'rutty/thread_pool/worker'
-
-module Rutty
-
-  ##
-  # A thread pool implementation using the work queue pattern. Shamelessly stolen from a StackOverflow question.
-  #
-  # @see http://stackoverflow.com/questions/81788/deadlock-in-threadpool/82777#82777
-  # @since 2.4.0
-  class ThreadPool
-    ## @return [Integer] The maximum number of concurrent {Worker} threads
-    attr_accessor :max_size
-
-    ##
-    # Creates a new {ThreadPool} instance with a maximum number of {Worker} threads.
-    def initialize max_size = 10
-      Thread.abort_on_exception = true
-      
-      @max_size = max_size
-      @queue = Queue.new
-      @workers = []
-    end
-
-    ##
-    # The current size of the <tt>@workers</tt> array.
-    #
-    # @return [Integer] The current number of {Worker} threads
-    def current_size
-      @workers.size
-    end
-
-    ##
-    # Whether any {Worker} threads are currently executing, determined by 
-    # comparing the sizes of the <tt>@workers</tt> array and the <tt>@queue</tt>.
-    #
-    # @return [Boolean] Any currently executing workers?
-    def busy?
-      @queue.size < current_size
-    end
-
-    ##
-    # Loops over every {Worker} and calls {Worker#stop}, then clears the <tt>@workers</tt> array.
-    def shutdown
-      @workers.each { |w| w.stop }
-      @workers = []
-    end
-    
-    alias :join :shutdown
-
-    ##
-    # Gets a free worker and passes it the specified closure.
-    #
-    # @see #get_worker
-    # @param [Proc, Lambda, #call] block An instance of any class that responds to <tt>#call</tt>
-    def process block = nil, &blk
-      block = blk if block_given?
-      get_worker.set_block block
-    end
-
-    private
-
-    ##
-    # Gets a free {Worker}. If the {#max_size} has been reached and the <tt>@queue</tt> isn't empty,
-    # pops an existing {Worker} from there. Otherwise spins up a new {Worker} and adds it to the <tt>@workers</tt>
-    # array.
-    #
-    # @return [Rutty::Worker] A {Worker} ready for a new job
-    def get_worker
-      if !@queue.empty? or current_size == @max_size
-        return @queue.pop
-      else
-        worker = Rutty::Worker.new @queue
-        @workers << worker
-        worker
-      end
-    end
-  end
-end

data/lib/rutty/thread_pool/worker.rb

@@ -1,103 +0,0 @@
-require 'thread'
-require 'fastthread'
-
-module Rutty
-  
-  ##
-  # The {ThreadPool} Thread wrapper, representing a single thread of execution in the pool.
-  #
-  # @since 2.4.0
-  class Worker
-    
-    ##
-    # Initialize a new {Worker}. Sets up the initial state of this instance, then spins out its thread. The thread will
-    # wait until it's signaled (by being passed a new closure to execute, or being told to die, etc.), then resume execution
-    # of its task. The Thread is wrapped in a <tt>while @running</tt> loop, allowing for easy termination from {#shutdown}.
-    #
-    # @param [Queue] thread_queue The thread queue from the {ThreadPool} instance to add this worker to
-    # @return [Worker] The new, available Worker object.
-    def initialize thread_queue
-      @mutex = Mutex.new
-      @cv = ConditionVariable.new
-      @queue = thread_queue
-      @running = true
-      
-      @thread = Thread.new do
-        @mutex.synchronize do
-          while @running
-            @cv.wait @mutex
-            block = get_block
-            
-            if block
-              @mutex.unlock
-              block.call
-              @mutex.lock
-              reset_block
-            end
-            
-            @queue << self
-          end
-        end
-      end
-    end
-
-    ##
-    # Returns the evaluation of <tt>@thread.inspect</tt>.
-    #
-    # @return [String] This thread's name
-    def name
-      @thread.inspect
-    end
-
-    ##
-    # Returns the value of <tt>@block</tt>.
-    #
-    # @return [Proc, Lambda, #call] The <tt>@block</tt> object previously passed.
-    def get_block
-      @block
-    end
-
-    ##
-    # Sets a new closure as the task for this worker. Signals the Thread to wakeup after assignment.
-    # 
-    # @param (see Rutty::ThreadPool#process)
-    # @raise [RuntimeError] If the thread is currently busy when called.
-    def set_block block
-      @mutex.synchronize do
-        raise RuntimeError, "Thread already busy." if @block
-        @block = block
-        # Signal the thread in this class, that there's a job to be done
-        @cv.signal
-      end
-    end
-    
-    ##
-    # Sets the <tt>@block</tt> to <tt>nil</tt>. Called after the Thread has finished execution of a task to
-    # ready itself for the next one.
-    def reset_block
-      @block = nil
-    end
-
-    ##
-    # Whether or not this Thread is currently executing. Determined by whether <tt>@block</tt> is <tt>nil</tt>.
-    #
-    # @return [Boolean] Is this Thread executing?
-    def busy?
-      @mutex.synchronize { !@block.nil? }
-    end
-
-    ##
-    # Sets <tt>@running</tt> to <tt>false</tt>, causing the Thread to finish after the current loop. Signals
-    # the Thread to wake and resume, then calls <tt>#join</tt>.
-    #
-    # @see #initialize
-    def stop
-      @mutex.synchronize do
-        @running = false
-        @cv.signal
-      end
-      
-      @thread.join
-    end
-  end
-end