Chee 0.1.0 → 0.2.0

data/Chee.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'Bacon_Colored'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'mocha-on-bacon'
+  s.add_development_dependency 'highline'
   
   # Specify any dependencies here; for example:
   s.add_runtime_dependency 'Get_Set'

data/README.md

@@ -25,15 +25,19 @@ Usage
 
     require "Chee"
     
-    Chee.server "my_server"  # If you configured server using ~/.ssh/config
-    Chee.server Hash[
-      :ip       => 'localhost', 
-      :user     => 'me', 
-      
-      # options other than :ip/:user are sent to Net::SSH
+    # If you configured server using ~/.ssh/config:
+    Chee.server "my_server"  
+    
+    # You can also use the same options you would send to
+    # Net::SSH:
+    Chee.server(
+      'localhost', 
+      'me', 
       :password => "try to use private/public keys", 
       :timeout  => 3  
-    ]
+    )
+    
+    # Send a command
     Chee.ssh %^ sudo add-apt-repository ppa:nginx/stable ^
 <!-- sudo apt-get install nginx -->
 <!-- ^ -->
@@ -60,8 +64,15 @@ To run the tests:
     bundle update
     bundle exec bacon spec/main.rb
     
-Don't forget to setup ssh server, firewall, and passwordless SSH using
-private keys. The following is useful for Ubuntu users:
+The tests assume you use passwordless SSH login using
+private keys and put the following in your ~/.ssh/config:
+
+    Host localhost
+      User *your username*
+      IdentityFile ~/.ssh/path_to_priv_key
+
+
+The following is useful for Ubuntu users:
 
     sudo apt-get install ufw openssh-server
     sudo ufw allow from 127.0.0.1 to any port 22

data/lib/Chee.rb

@@ -23,6 +23,11 @@ class Chee
       @server = args
     end
 
+    def print_data &blok
+      return @print_data if blok.nil?
+      @print_data = blok
+    end
+
     # 
     # Thread technique came from: 
     # http://stackoverflow.com/questions/6942279/ruby-net-ssh-channel-dies
@@ -102,8 +107,7 @@ class Chee
               stdout << d # .sub(%r!\r?\n\Z!,'')
 
               unless prev_cmd.to_s.strip == d.strip
-                print d
-                STDOUT.flush
+                print_data.call d
               end
 
               prev_data = d
@@ -131,13 +135,6 @@ class Chee
       rescue Net::SSH::AuthenticationFailed => e
         raise e.class, "Using: #{server.inspect}"
 
-        #rescue Net::SSH::HostKeyMismatch => e
-        #  if e.message[%r!fingerprint .+ does not match for!]
-        #    print "Try this", "ssh-keygen -f \"~/.ssh/known_hosts\" -R #{server[:ip]}\n"
-        #    raise Retry_Command, "Removed the RSA key."
-        #  end
-        #  
-        #  raise e
       ensure
         get_input = false
         t.exit if t
@@ -161,5 +158,9 @@ class Chee
   end # === module DSL
 
   extend DSL
+  print_data { |d|
+    print d
+    STDOUT.flush
+  }
 
 end # === class Chee

data/lib/Chee/version.rb

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

data/spec/files/input.rb

@@ -0,0 +1,35 @@
+cmd = %^ bundle exec ruby #{File.expand_path __FILE__} ^
+dir = File.expand_path('.')
+
+if ARGV == ['STDIN']
+  require "highline/import"
+  input = ask("Input text: ")
+  puts "You entered: #{input.inspect}"
+  exit 0
+end
+
+if ARGV == ['Chee']
+  require 'Chee'
+  Chee.server 'localhost'
+  Chee.ssh "cd #{dir} && #{cmd} STDIN"
+  exit 0
+end
+
+require 'open3'
+Open3.popen3( "#{cmd} Chee") do |i, o, e, w|
+  
+  sleep 2
+  print o.gets(' ')
+  print o.gets(' ')
+  i.puts 'a'
+  
+  while txt = o.gets do
+    puts txt
+  end
+  
+  while txt = e.gets do
+    puts txt
+  end
+  # Process.kill 'INT', w[:pid]
+end
+

data/spec/tests/Chee.rb

@@ -10,6 +10,11 @@ describe ":ssh_exec" do
     ]
     
     Chee.server @localhost
+    @data = ''
+    
+    Chee.print_data { |d|
+      @data << d
+    }
   end
   
   it 'accepts a String for the server info.' do
@@ -22,10 +27,20 @@ describe ":ssh_exec" do
     Chee.ssh("echo 'b'").out.should == 'b'
   end
 
+  it 'uses :print_data to print data' do
+    Chee.ssh 'echo c'
+    @data.strip.should == 'c'
+  end
+
   it 'uses a PTY' do
     Chee.ssh("tty").out.should.match %r!/dev/pts/\d+!
   end
   
+  it 'accepts input from STDIN' do
+    `bundle exec ruby spec/files/input.rb 2>&1`.strip
+    .should == %@Input text: a\nYou entered: "a"@
+  end
+
   it 'returns a SSH::Results' do
     Chee.ssh("hostname").should.be.is_a Chee::Result
   end
@@ -41,7 +56,6 @@ describe ":ssh_exec" do
       Chee.ssh "hostname"
     }.should.raise(Net::SSH::AuthenticationFailed)
     .message.should.match %r!Using: ..github.com..!
-
   end
 
   it 'raises Chee::Exit_Error if return status is not zero' do
@@ -54,31 +68,3 @@ describe ":ssh_exec" do
 
 end # === describe :ssh_exec
 
-__END__
-describe ":ssh_exits" do
-  
-  it 'captures exits based on key => int, val => Regexp' do
-    lambda {
-      ignore_exits("cat something.txt", 1=>%r!something\.txt\: No such file or directory!)
-    }.should.not.raise
-  end
-  
-  it 'captures exits based on key => int, val => String' do
-    lambda {
-      ignore_exits("cat something.txt", 1=>'something.txt: No such file or directory') 
-    }.should.not.raise
-  end
-  
-  it 'returns SSH::Results for a non-zero exit status' do
-    ignore_exits("cat something.txt", 1=>'something.txt: No such file or directory')
-    .should.be.is_a Unified_IO::Remote::SSH::Results
-  end
-  
-  it 'returns SSH::Results for a zero exit status' do
-    ignore_exits("uptime", 1=>'something.txt: No such file or directory')
-    .should.be.is_a Unified_IO::Remote::SSH::Results
-  end
-  
-end # === describe :ssh_exits
-  
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Chee
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: Get_Set
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +174,7 @@ files:
 - lib/Chee/version.rb
 - spec/files/errors_with_exit_0.rb
 - spec/files/exit_with_2.rb
+- spec/files/input.rb
 - spec/helper.rb
 - spec/main.rb
 - spec/tests/Chee.rb