jossh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065f5d98494010a3bc73bafd4317937e34aab7af
-  data.tar.gz: a293c204f348966006ae2d366d6f27ea9fa8a377
+  metadata.gz: 15cd40420f857c0961001c61dab3d683f89c907a
+  data.tar.gz: 884df776481c6aca398241d303fa6a58aceb3b80
 SHA512:
-  metadata.gz: bee1fe6fa0b70d08cd4624d7e162dc27a1107c0559ef3290da3bfb41e97a5edd6197ffbc2b2706ccdc18baf7c6367acf5f6e4a7ee9099293e4a979100f6ae43f
-  data.tar.gz: 01505c2b98995e22f7bb0234c3708516476d7e7f40b374d79e02ba5adae68107d15d44f720346fe12b32b50814c24a4fa4f243221d5e39144ab9cea8708a720d
+  metadata.gz: dab42099d80d7d3aff945323a136cdd6078d244c7b2dceaf4e8c36e104ed7cb44300a0f7fb06c926643761e7a0e5f54daed53df8a95e78c3dbd69d09d269706f
+  data.tar.gz: 13a3af70813a58a68dec6784389c48beee274a41655a60c5fcdb5e9acc3427b6fd94af16d5e315a38367aa686357d8eac5760e1392cdfad8a03a76f12b5805c9

data/lib/jossh/command_runner.rb

@@ -17,15 +17,15 @@ module Jossh
     end
 
     def ssh(hostspec, script, callback: nil)
-      callback ||= method :puts
+      callback ||= method :simple_puts
       script   = script.join "\n" if script.is_a? Array
       hostspec = load_spec(hostspec) if hostspec.is_a? Symbol
       host     = hostspec.delete :host
       user     = hostspec.delete :user
 
       Net::SSH.start( host, user, hostspec ) do |ssh| 
-        ssh.exec! script do |_ch, _stream, data|
-          callback.call data
+        ssh.exec! script do |_ch, stream, data|
+          callback.call data, stream
         end
       end
     end
@@ -40,12 +40,24 @@ module Jossh
 
     def ssh_hostfile(file)
       @hostfile = file
+
+      # force reload in case we were called after some ssh call was
+      # initiated (e.g. in tests...)
+      @ssh_hosts = nil 
     end
 
     private
 
+    def simple_puts(data, stream)
+      if stream == :stderr
+        STDERR.puts data
+      else
+        puts data
+      end
+    end
+
     def load_spec(key)
-      ssh_hosts[key] or abort "Cannot find :#{key} in #{hostfile}"
+      ssh_hosts[key] or raise "Cannot find :#{key} in #{hostfile}"
     end
 
     def ssh_hosts
@@ -53,7 +65,7 @@ module Jossh
     end
 
     def load_ssh_hosts
-      File.exist? hostfile or abort "Cannot find #{hostfile}"
+      File.exist? hostfile or raise "Cannot find #{hostfile}"
       YAML.load_file hostfile
     end
 
@@ -61,10 +73,6 @@ module Jossh
       @hostfile ||= 'ssh_hosts.yml'
     end
 
-    def hostfile=(file)
-      @hostfile = file
-    end
-
     def load_script(script)
       File.read script
     end

data/lib/jossh/output_handler.rb

@@ -22,11 +22,13 @@ module Jossh
     # ==== Credits:
     # This function was inspired by Heroku and based on code from Mina[https://github.com/mina-deploy/mina/blob/master/lib/mina/output_helpers.rb]
     #
-    def pretty_puts(lines)
+    def pretty_puts(lines, stream=nil)
       lines = lines.split("\n") if lines.is_a? String
       lines.each do |line|
-        line = line.rstrip.gsub /\t/, "        "
-        if line =~ /^\-+> (.*?)$/
+        line = line.rstrip.gsub(/\t/, "        ")
+        if stream == :stderr
+          puts_stderr line
+        elsif line =~ /^\-+> (.*?)$/
           puts_status $1
         elsif line =~ /^! (.*?)$/
           puts_error $1

data/lib/jossh/version.rb

@@ -1,3 +1,3 @@
 module Jossh
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jossh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Jossh is a wrapper around Ruby Net::SSH with a simpler interface and
   prettier output
 email: db@dannyben.com