weave 0.1.0 → 0.2.0

checksums.yaml

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

data/README.md

@@ -22,19 +22,3 @@ examples (in `examples/`) to get started.
 * Commands:
 
   - `run`
-
-## Other ideas
-
-* Commands:
-
-  - `sudo`
-  - `rsync`
-  - `put`?
-  - `get`?
-
-* Handle password prompts (maybe just sudo prompt)
-* Handle ctrl-c correctly?
-
-## To do:
-
-* Full readme with detailed usage

data/lib/weave.rb

@@ -58,8 +58,10 @@ module Weave
 
   # A pool of SSH connections. Operations over the pool may be performed in serial or in parallel.
   class ConnectionPool
-    # @param [Array] host_list the array of hosts, of the form user@host
-    def initialize(host_list)
+    # @param [Array] host_list the array of hosts, of the form user@host. You may leave off this argument, and
+    # use #execute_with (instead of #execute) to specify the whole list of hosts each time.
+    def initialize(host_list = [])
+      @hosts = host_list
       @connections = host_list.reduce({}) { |pool, host| pool.merge(host => LazyConnection.new(host)) }
     end
 
@@ -73,18 +75,25 @@ module Weave
     # @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.
     def execute(options = {}, &block)
+      execute_with(@hosts, options, &block)
+    end
+
+    # This is the same as #execute, except that host_list overrides the list of connections with which this
+    # ConnectionPool was initialized. Any hosts in here that weren't already in the pool will be added.
+    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
       if options[:serial]
-        @connections.each_key { |host| @connections[host].self_eval args, &block }
+        host_list.each { |host| @connections[host].self_eval args, &block }
       elsif options[:batch_by]
-        @connections.each_key.each_slice(options[:batch_by]) do |batch|
+        host_list.each_slice(options[:batch_by]) do |batch|
           Weave.with_thread_pool(batch, options[:num_threads]) do |host, mutex|
             @connections[host].self_eval args, mutex, &block
           end
         end
       else
-        Weave.with_thread_pool(@connections.keys, options[:num_threads]) do |host, mutex|
+        Weave.with_thread_pool(host_list, options[: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.1.0"
+  VERSION = "0.2.0"
 end

data/test/integrations/sanity_test.rb

@@ -10,17 +10,17 @@ class SanityTest < Scope::TestCase
 
   setup_once do
     # Make sure the machines are up.
-    vagrant_status = `bundle exec vagrant status`
+    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 'bundle exec vagrant up'."
+            "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 'bundle exec vagrant ssh-config weave1'"
+              "You can use the output of 'vagrant ssh-config weave1'"
       end
     end
   end
@@ -33,7 +33,7 @@ class SanityTest < Scope::TestCase
       end
       TEST_HOSTS.each do |host|
         assert_empty output[host][:stderr]
-        assert_equal ["hello\n"], output[host][:stdout]
+        assert_equal "hello\n", output[host][:stdout]
       end
     end
 
@@ -51,24 +51,24 @@ class SanityTest < Scope::TestCase
 
     context "in serial" do
       should "run some commands in the expected order" do
-        output = []
+        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\n", "on time\n"], output
+        assert_equal "delayed\non time\n", output
       end
     end
 
     context "in parallel" do
       should "run some commands in the expected order" do
-        output = []
+        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\n", "delayed\n"], output
+        assert_equal "on time\ndelayed\n", output
       end
     end
 
@@ -80,9 +80,19 @@ class SanityTest < Scope::TestCase
         end
         TEST_HOSTS.each do |host|
           assert_empty output[host][:stderr]
-          assert_equal ["hello\n"], output[host][:stdout]
+          assert_equal "hello\n", output[host][:stdout]
         end
       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
+    end
   end
 end

data/weave.gemspec

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

metadata

@@ -1,82 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: weave
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Caleb Spare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70237392577060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70237392577060
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: &70237392576560 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: *70237392576560
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: scope
-  requirement: &70237392576180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237392576180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237392575720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237392575720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70237392575300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237392575300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70237392574880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237392574880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple parallel ssh.
 email:
 - cespare@gmail.com
@@ -100,27 +103,26 @@ 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: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple parallel ssh.
 test_files:
 - test/integrations/sanity_test.rb