Chee 0.2.0 → 0.3.0

data/README.md

@@ -20,9 +20,38 @@ Installation
 
     gem install Chee
 
-Usage
+Usage: DSL
 ------
 
+You could include the DSL into your own object:
+
+    require "Chee"
+    Class My_SSH
+
+      include Chee::DSL
+
+      def ssh cmd
+        super cmd.strip
+      end
+
+    end # === Class My_SSH
+
+Or you could use Chee directly:
+
+    require "Chee"
+    Chee.server 'my_server'
+    Chee.ssh "uptime"
+
+`:ssh` returns a `Chee::Result` object:
+
+    result = Chee.ssh( "uptime" )
+    
+    result.out         # ==> output from STDOUT
+    result.exit_status 
+
+Usage: Single Server
+-----
+
     require "Chee"
     
     # If you configured server using ~/.ssh/config:
@@ -39,21 +68,43 @@ Usage
     
     # Send a command
     Chee.ssh %^ sudo add-apt-repository ppa:nginx/stable ^
-<!-- sudo apt-get install nginx -->
-<!-- ^ -->
 
-Or you could include the DSL into your own object:
 
-    Class My_SSH
+Usage: Multiple Servers
+------
 
-      include Chee::DSL
+    Chee.server 'server_1'
+    Chee.server 'server_2', 'my_username'
 
-      def ssh cmd
-        super cmd.strip
-      end
+    Chee.ssh_to_all "uptime"
+    # --->  [ Chee::Result, Chee::Result ]
 
-    end # === Class My_SSH
+Usage: Multiple Line Command
+----
+
+Single Server, multiple commands:
+
+    Chee.server 'localhost'
+    
+    Chee.ssh %^
+    
+      sudo add-apt-repository ppa:nginx/stable
+      sudo apt-get install nginx
+      
+    ^
+    # ---> [ Chee::Result, Chee::Result ]
+    
+Multiple servers, multiple commands:
 
+    Chee.server 'localhost'
+    Chee.server 'my_other_host'
+    
+    Chee.ssh_to_all %^
+      echo "a"
+      echo "b"
+    ^
+    # ---> [ Chee::Result, Chee::Result, Chee::Result, Chee::Result ]
+    
 Run Tests
 ---------
 

data/lib/Chee/version.rb

@@ -1,3 +1,3 @@
 class Chee
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/Chee.rb

@@ -18,21 +18,41 @@ class Chee
   
   module DSL
 
+    def server_array
+      @server_array ||= []
+    end
+
     def server *args
       return @server if args.empty?
+      server_array << args
+      server_array.uniq!
       @server = args
     end
 
     def print_data &blok
-      return @print_data if blok.nil?
+      @print_data ||= proc { |d| print d; STDOUT.flush; } 
+      return(@print_data) if blok.nil? 
       @print_data = blok
     end
 
+    def ssh_to_all command
+      @server_array.map { |opts|
+        server *opts
+        ssh command
+      }.flatten
+    end
+
     # 
     # Thread technique came from: 
     # http://stackoverflow.com/questions/6942279/ruby-net-ssh-channel-dies
     # 
-    def ssh command
+    def ssh raw_cmd
+      command = raw_cmd.strip
+      if command["\n"]
+        return command.split("\n").map(&:strip).map { |s|
+          ssh s
+        }
+      end
       stdout = ""
       stderr = ""
       t      = nil # used to store a Thread
@@ -144,7 +164,7 @@ class Chee
       result.out stdout
       
       if !result.err.empty? || result.exit_status != 0
-        e = Exit_Error.new("Exit: #{result.exit_status}, STDERR: #{result.err}")
+        e = Exit_Error.new("Exit: #{result.exit_status}, COMMAND: #{command}")
         e.exit_status result.exit_status
         e.out         result.out
         e.err         result.err
@@ -158,9 +178,5 @@ class Chee
   end # === module DSL
 
   extend DSL
-  print_data { |d|
-    print d
-    STDOUT.flush
-  }
 
 end # === class Chee

data/spec/files/abc.rb

@@ -0,0 +1,29 @@
+
+def tmp
+  "/tmp/abc.txt"
+end
+
+def read
+  File.read(tmp).strip
+end
+
+def write txt
+  File.write tmp, txt
+end
+
+if File.file?(tmp)
+  case read
+  when "a"
+    write "b"
+  when "b"
+    write "c"
+  else
+    write "a"
+  end
+else
+  `echo "a" > #{tmp}`
+end
+
+puts read
+
+

data/spec/files/input.rb

@@ -18,11 +18,10 @@ end
 require 'open3'
 Open3.popen3( "#{cmd} Chee") do |i, o, e, w|
   
-  sleep 2
   print o.gets(' ')
   print o.gets(' ')
   i.puts 'a'
-  
+  sleep 1
   while txt = o.gets do
     puts txt
   end

data/spec/main.rb

@@ -5,6 +5,17 @@ require 'Bacon_Colored'
 require 'pry'
 require 'mocha-on-bacon'
 
+class My_SSH
+
+  include Chee::DSL
+
+  def print_data
+    @print_data ||= proc {}
+  end
+  
+end # === My_SSH
+
+File.write("/tmp/abc.txt", "")
 
 # ======== Include the tests.
 if ARGV.size > 1 && ARGV[1, ARGV.size - 1].detect { |a| File.exists?(a) }

data/spec/tests/Chee.rb

@@ -1,5 +1,5 @@
 
-describe ":ssh_exec" do
+describe "Chee :ssh" do
   
   before do
     @localhost = 'localhost'    
@@ -41,13 +41,19 @@ describe ":ssh_exec" do
     .should == %@Input text: a\nYou entered: "a"@
   end
 
-  it 'returns a SSH::Results' do
+  it 'returns a Chee::Result' do
     Chee.ssh("hostname").should.be.is_a Chee::Result
   end
+
+  it 'returns an Array of Chee::Result if command has multiple lines' do
+    cmd = "ruby #{File.expand_path 'spec/files/abc.rb'}"
+    Chee.ssh("#{cmd}\n#{cmd}\n#{cmd}")
+    .map(&:class).should == [ Chee::Result, Chee::Result, Chee::Result ]
+  end
   
   it "strips returned data" do
-    target = `uptime`.strip.gsub(%r!\d+!, '[0-9]{1,2}')
-    Chee.ssh("uptime").out.should.match %r!#{target}!
+    Chee.ssh("cat ~/.bashrc").out.gsub("\r", '')
+    .should == `cat ~/.bashrc`.strip
   end
   
   it 'raises Net::SSH::AuthenticationFailed if login/password are incorrect' do
@@ -68,3 +74,46 @@ describe ":ssh_exec" do
 
 end # === describe :ssh_exec
 
+describe "Chee :server" do
+
+  before { @m = My_SSH.new }
+  
+  it "adds server to server list" do
+    @m.server 'local'
+    @m.server_array.should.include ['local']
+  end
+  
+  it "adds server to server list only once" do
+    @m.server 'local'
+    @m.server 'local'
+    @m.server_array.should == [ ['local'] ]
+  end
+  
+end # === Chee :server
+
+describe "Chee :ssh_to_all" do
+
+  before { 
+    @m = My_SSH.new 
+    @m.server "localhost"
+    @m.server "localhost", nil
+    @m.server "localhost", `whoami`.strip
+  }
+
+  it "sends commands to all servers in :server_array" do
+    list = @m.ssh_to_all "ruby #{File.expand_path 'spec/files/abc.rb'}"
+    list.map { |o| o.out.strip }.should == %w{ a b c }
+  end
+
+  it "returns an Array with all elements Chee::Result" do
+    list = @m.ssh_to_all "uptime"
+    list.map(&:class).should == [ Chee::Result, Chee::Result, Chee::Result]
+  end
+
+  it "returns a flatten Array if command had multiple lines" do
+    list = @m.ssh_to_all "uptime\nuptime"
+    list.map(&:class).should == [ Chee::Result, Chee::Result ] * 3
+  end
+
+end # === Chee :ssh_to_all
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Chee
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -172,6 +172,7 @@ files:
 - Rakefile
 - lib/Chee.rb
 - lib/Chee/version.rb
+- spec/files/abc.rb
 - spec/files/errors_with_exit_0.rb
 - spec/files/exit_with_2.rb
 - spec/files/input.rb