weave 0.2.0 → 1.0.0

data/Vagrantfile

@@ -1,6 +1,7 @@
 Vagrant::Config.run do |config|
   def apply_common_config_options(c)
-    c.vm.box = "lucid64"
+    c.vm.box = "precise64"
+    c.vm.box_url = "http://files.vagrantup.com/precise64.box"
     c.vm.provision :shell, :inline =>
         "sudo mkdir -p /root/.ssh && sudo cp /home/vagrant/.ssh/authorized_keys /root/.ssh/"
   end

data/lib/weave.rb

@@ -69,8 +69,8 @@ module Weave
     #
     # @param [Hash] options the various knobs
     # @option options [Array] :args the arguments to pass through to the block when it runs.
-    # @option options [Fixnum] :num_threads the number of concurrent threads to use to process this command.
-    #     Defaults to `DEFAULT_THREAD_POOL_SIZE`.
+    # @option options [Fixnum or Symbol] :num_threads the number of concurrent threads to use to process this
+    #     command, or :unlimited to use a thread for every host. Defaults to `DEFAULT_THREAD_POOL_SIZE`.
     # @option options [Boolean] :serial whether to process the command for each connection one at a time.
     # @option options [Fixnum] :batch_by if set, group the connections into batches of no more than this value
     #     and fully process each batch before starting the next one.
@@ -83,17 +83,19 @@ module Weave
     def execute_with(host_list, options = {}, &block)
       host_list.each { |host| @connections[host] ||= LazyConnection.new(host) }
       args = options[:args] || []
-      options[:num_threads] ||= DEFAULT_THREAD_POOL_SIZE
+      num_threads = options[:num_threads] || DEFAULT_THREAD_POOL_SIZE
       if options[:serial]
         host_list.each { |host| @connections[host].self_eval args, &block }
       elsif options[:batch_by]
+        num_threads = options[:batch_by] if num_threads == :unlimited
         host_list.each_slice(options[:batch_by]) do |batch|
-          Weave.with_thread_pool(batch, options[:num_threads]) do |host, mutex|
+          Weave.with_thread_pool(batch, num_threads) do |host, mutex|
             @connections[host].self_eval args, mutex, &block
           end
         end
       else
-        Weave.with_thread_pool(host_list, options[:num_threads]) do |host, mutex|
+        num_threads = host_list.size if num_threads == :unlimited
+        Weave.with_thread_pool(host_list, num_threads) do |host, mutex|
           @connections[host].self_eval args, mutex, &block
         end
       end

data/lib/weave/version.rb

@@ -1,3 +1,3 @@
 module Weave
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/test/integrations/sanity_test.rb

@@ -3,96 +3,85 @@ require File.expand_path(File.join(File.dirname(__FILE__), "../test_helper"))
 require "net/ssh"
 require "weave"
 
-class SanityTest < Scope::TestCase
-  TEST_HOSTS = [1, 2].map { |i| "weave#{i}" }
+TEST_HOSTS = [1, 2].map { |i| "weave#{i}" }
+
+# Make sure the machines are up.
+vagrant_status = `vagrant status`
+unless $?.to_i.zero? && TEST_HOSTS.each { |host| vagrant_status =~ /#{host}\w+running/ }
+  abort "You need to set up the test vagrant virtual machines to run the sanity test." \
+  "Run 'vagrant up'."
+end
+# Make sure the user's ssh config has weave entries.
+TEST_HOSTS.each do |host|
+  config = Net::SSH::Config.load("~/.ssh/config", host)
+  unless config["hostname"] == "127.0.0.1"
+    abort "You need to add weave{1,2} to your ~/.ssh/config." \
+      "You can use the output of 'vagrant ssh-config weave1'"
+  end
+end
+
+class SanityTest < Minitest::Test
   ROOT_AT_TEST_HOSTS = TEST_HOSTS.map { |host| "root@#{host}" }
   SINGLE_TEST_HOST = ["root@#{TEST_HOSTS[0]}"]
 
-  setup_once do
-    # Make sure the machines are up.
-    vagrant_status = `/usr/bin/vagrant status`
-    unless $?.to_i.zero? && TEST_HOSTS.each { |host| vagrant_status =~ /#{host}\w+running/ }
-      abort "You need to set up the test vagrant virtual machines to run the sanity test." \
-            "Run 'vagrant up'."
+  def test_executing_commands_simple
+    output = Hash.new { |h, k| h[k] = [] }
+    Weave.connect(ROOT_AT_TEST_HOSTS) do
+      output[host] = run("echo 'hello'", :output => :capture)
     end
-    # Make sure the user's ssh config has weave entries.
     TEST_HOSTS.each do |host|
-      config = Net::SSH::Config.load("~/.ssh/config", host)
-      unless config["hostname"] == "127.0.0.1"
-        abort "You need to add weave{1,2} to your ~/.ssh/config." \
-              "You can use the output of 'vagrant ssh-config weave1'"
-      end
+      assert_empty output[host][:stderr]
+      assert_equal "hello\n", output[host][:stdout]
     end
   end
 
-  context "executing some commands" do
-    should "run some simple commands" do
-      output = Hash.new { |h, k| h[k] = [] }
-      Weave.connect(ROOT_AT_TEST_HOSTS) do
-        output[host] = run("echo 'hello'", :output => :capture)
-      end
-      TEST_HOSTS.each do |host|
-        assert_empty output[host][:stderr]
-        assert_equal "hello\n", output[host][:stdout]
-      end
+  def test_executing_commands_raises_exception_with_non_zero_exit
+    assert_raises(Weave::Error) do
+      Weave.connect(SINGLE_TEST_HOST) { run("cd noexist", :output => :capture) }
     end
 
-    should "raise an exception when a command exits with non-zero exit status." do
-      assert_raises(Weave::Error) do
-        Weave.connect(SINGLE_TEST_HOST) { run("cd noexist", :output => :capture) }
-      end
-
-      results = {}
-      Weave.connect(SINGLE_TEST_HOST) do
-        results = run("exit 123", :output => :capture, :continue_on_failure => true)
-      end
-      assert_equal 123, results[:exit_code]
+    results = {}
+    Weave.connect(SINGLE_TEST_HOST) do
+      results = run("exit 123", :output => :capture, :continue_on_failure => true)
     end
+    assert_equal 123, results[:exit_code]
+  end
 
-    context "in serial" do
-      should "run some commands in the expected order" do
-        output = ""
-        Weave.connect(ROOT_AT_TEST_HOSTS, :serial => true) do
-          command = (host == "weave1") ? "sleep 0.2; echo 'delayed'" : "echo 'on time'"
-          output += run(command, :output => :capture)[:stdout]
-        end
-        assert_equal "delayed\non time\n", output
-      end
+  def test_in_serial_commands_run_in_expected_order
+    output = ""
+    Weave.connect(ROOT_AT_TEST_HOSTS, :serial => true) do
+      command = (host == "weave1") ? "sleep 0.2; echo 'delayed'" : "echo 'on time'"
+      output += run(command, :output => :capture)[:stdout]
     end
+    assert_equal "delayed\non time\n", output
+  end
 
-    context "in parallel" do
-      should "run some commands in the expected order" do
-        output = ""
-        Weave.connect(ROOT_AT_TEST_HOSTS) do
-          command = (host == "weave1") ? "sleep 0.2; echo 'delayed'" : "echo 'on time'"
-          result = run(command, :output => :capture)
-          output += result[:stdout]
-        end
-        assert_equal "on time\ndelayed\n", output
-      end
+  def test_in_parallel_commands_run_in_expected_order
+    output = ""
+    Weave.connect(ROOT_AT_TEST_HOSTS) do
+      command = (host == "weave1") ? "sleep 0.2; echo 'delayed'" : "echo 'on time'"
+      result = run(command, :output => :capture)
+      output += result[:stdout]
     end
+    assert_equal "on time\ndelayed\n", output
+  end
 
-    context "on a connection pool" do
-      should "run basic commands" do
-        output = Hash.new { |h, k| h[k] = [] }
-        Weave.connect(ROOT_AT_TEST_HOSTS).execute do
-          output[host] = run("echo 'hello'", :output => :capture)
-        end
-        TEST_HOSTS.each do |host|
-          assert_empty output[host][:stderr]
-          assert_equal "hello\n", output[host][:stdout]
-        end
-      end
+  def test_on_a_connection_pool_basic_commands_should_run
+    output = Hash.new { |h, k| h[k] = [] }
+    Weave.connect(ROOT_AT_TEST_HOSTS).execute do
+      output[host] = run("echo 'hello'", :output => :capture)
     end
+    TEST_HOSTS.each do |host|
+      assert_empty output[host][:stderr]
+      assert_equal "hello\n", output[host][:stdout]
+    end
+  end
 
-    context "with a different host list" do
-      should "run only on the listed hosts" do
-        output = ""
-        Weave::ConnectionPool.new.execute_with(SINGLE_TEST_HOST) do
-          output += run("echo 'hello'", :output => :capture)[:stdout]
-        end
-        assert_equal "hello\n", output
-      end
+  def test_with_a_different_host_list_only_run_on_listed_hosts
+    output = ""
+    Weave::ConnectionPool.new.execute_with(SINGLE_TEST_HOST) do
+      output += run("echo 'hello'", :output => :capture)[:stdout]
     end
+    assert_equal "hello\n", output
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
 $:.unshift File.join(File.dirname(__FILE__), "../lib")
 
-require "scope"
 require "minitest/autorun"

data/weave.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "net-ssh", ">= 2.2.0"
 
   # For running integration tests.
-  gem.add_development_dependency "scope"
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   # For generating the docs
   gem.add_development_dependency "yard"

metadata

@@ -1,83 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: weave
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Caleb Spare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: scope
+  name: minitest
   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: rake
   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: yard
   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: redcarpet
   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: Simple parallel ssh.
@@ -103,26 +114,27 @@ files:
 - weave.gemspec
 homepage: https://github.com/cespare/weave
 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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple parallel ssh.
 test_files:
 - test/integrations/sanity_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a59144545dbba7f902dae6c32554a3f2743861e1
-  data.tar.gz: 495f658b7d46a8dd442e299f1b2e6b5f18974238
-SHA512:
-  metadata.gz: ca9f0be174aa7bae005d03c9937944539e1826c680dda6cf6c8fdc5fcf3d36abefb4649ee3344d65d6b5a585f093fee8dee017c3112a3f704d4e87e9feb7db6e
-  data.tar.gz: 226c169a961c1cb2f40238c10be1ce68ce881d3bc1d67e447e9c32785b3f46317e0721d34dfc33bd17e0871904defee92fb1c170bb2a8bfb56151a377fbae4c6