Make style more consistent

lib/net/ssh/shell/process.rb

@@ -1,5 +1,4 @@
 module Net; module SSH; class Shell
-
   class Process
     attr_reader :state
     attr_reader :command
@@ -86,39 +85,36 @@ def on_finish(&callback)
       @on_finish = callback
     end
 
-    private
+    protected
 
-      def output!(data)
-        return unless @on_output
-        @on_output.call(self, data)
-      end
+    def output!(data)
+      @on_output.call(self, data) if @on_output
+    end
 
-      def on_stdout(ch, data)
-        if data.strip =~ /^#{manager.separator} (\d+)$/
-          before = $`
-          output!(before) unless before.empty?
-          finished!($1)
-        else
-          output!(data)
-        end
+    def on_stdout(ch, data)
+      if data.strip =~ /^#{manager.separator} (\d+)$/
+        before = $`
+        output!(before) unless before.empty?
+        finished!($1)
+      else
+        output!(data)
       end
+    end
 
-      def on_stderr(ch, type, data)
-        return unless @on_error_output
-        @on_error_output.call(self, data)
-      end
+    def on_stderr(ch, type, data)
+      @on_error_output.call(self, data) if @on_error_output
+    end
 
-      def on_close(ch)
-        manager.on_channel_close(ch)
-        finished!(-1)
-      end
+    def on_close(ch)
+      manager.on_channel_close(ch)
+      finished!(-1)
+    end
 
-      def finished!(status)
-        @state = :finished
-        @exit_status = status.to_i
-        @on_finish.call(self) if @on_finish
-        manager.child_finished(self)
-      end
+    def finished!(status)
+      @state = :finished
+      @exit_status = status.to_i
+      @on_finish.call(self) if @on_finish
+      manager.child_finished(self)
+    end
   end
-
 end; end; end

lib/net/ssh/shell/subshell.rb

@@ -1,23 +1,21 @@
 require 'net/ssh/shell/process'
 
 module Net; module SSH; class Shell
-
   class Subshell < Process
-    private
+    protected
 
-      def on_stdout(ch, data)
-        if !output!(data)
-          ch.on_data(&method(:look_for_finalize_initializer))
-          ch.send_data("export PS1=; echo #{manager.separator} $?\n")
-        end
+    def on_stdout(ch, data)
+      if !output!(data)
+        ch.on_data(&method(:look_for_finalize_initializer))
+        ch.send_data("export PS1=; echo #{manager.separator} $?\n")
       end
+    end
 
-      def look_for_finalize_initializer(ch, data)
-        if data =~ /#{manager.separator} (\d+)/
-          ch.on_close(&@master_onclose)
-          finished!($1)
-        end
+    def look_for_finalize_initializer(ch, data)
+      if data =~ /#{manager.separator} (\d+)/
+        ch.on_close(&@master_onclose)
+        finished!($1)
       end
+    end
   end
-
-end; end; end
+end; end; end