ppl 1.5.1 → 1.5.2

data/lib/ppl/application/input.rb

@@ -3,10 +3,12 @@ class Ppl::Application::Input
 
   attr_accessor :arguments
   attr_accessor :options
+  attr_accessor :stdin
 
   def initialize(arguments=[])
     @arguments = arguments
     @options   = {}
+    @stdin     = $stdin
   end
 
 end

data/lib/ppl/command/shell.rb

@@ -16,20 +16,54 @@ class Ppl::Command::Shell < Ppl::Application::Command
 
   def execute(input, output)
     begin
-      while line = Readline.readline("ppl> ", true)
-        break if line == "exit"
-        break if line == false
-        Kernel.system "#{$0} #{line}"
-      end
+      shell(input, output)
     rescue SystemExit, Interrupt
-      output.line("")
-      return false
+      terminate_gracefully(input, output)
+      false
+    end
+  end
+
+
+  private
+
+  def shell(input, output)
+    welcome_user(input, output)
+    while line = read_line(input)
+      break if ["exit", false].include?(line)
+      process_line(line)
+    end
+    terminate_gracefully(input, output)
+    true
+  end
+
+  def welcome_user(input, output)
+    if input.stdin.tty?
+      output.line("ppl #{Ppl::Version} (type \"exit\" to leave)")
     end
+  end
+
+  def read_line(input)
+    prompt = determine_prompt(input.stdin)
+    line   = Readline.readline(prompt, true)
+  end
+
+  def process_line(line)
+    command = "#{$0} #{line}"
+    Kernel.system(command)
+  end
+
+  def determine_prompt(io)
+    if io.tty?
+      "ppl> "
+    else
+      ""
+    end
+  end
 
-    if $stdin.tty?
+  def terminate_gracefully(input, output)
+    if input.stdin.tty?
       output.line("")
     end
-    return true
   end
 
 end

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.5.1"
+  Version = "1.5.2"
 
   module Adapter
   end

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.5.1"
-  spec.date        = "2012-12-20"
+  spec.version     = "1.5.2"
+  spec.date        = "2012-12-23"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/spec/ppl/command/shell_spec.rb

@@ -14,18 +14,34 @@ describe Ppl::Command::Shell do
   end
 
   describe "#execute" do
-    before(:each) do
-      @output.should_receive(:line)
-    end
     it "should read a line of input from stdin" do
       Readline.should_receive(:readline)
+      @command.stub(:welcome_user)
+      @command.stub(:terminate_gracefully)
       @command.execute(@input, @output).should eq true
     end
   end
 
   describe "#execute" do
+
     before(:each) do
-      @output.should_receive(:line)
+      @input.stdin = double(IO)
+      @input.stdin.stub(:tty?) { true }
+    end
+
+    it "should not show a prompt if stdin isn't a tty" do
+      @input.stdin.stub(:tty?) { false }
+      Readline.should_receive(:readline).with("", true)
+      @command.stub(:welcome_user)
+      @command.execute(@input, @output)
+    end
+
+    it "should show a prompt if stdin is a tty" do
+      @input.stdin.stub(:tty?) { true }
+      Readline.should_receive(:readline).with("ppl> ", true)
+      @command.stub(:welcome_user)
+      @command.stub(:terminate_gracefully)
+      @command.execute(@input, @output)
     end
 
     it "should make a system call with the input from stdin" do
@@ -34,14 +50,52 @@ describe Ppl::Command::Shell do
       Kernel.should_receive(:system) do |command|
         command.should include "email fred"
       end
+      @command.stub(:welcome_user)
+      @command.stub(:terminate_gracefully)
       @command.execute(@input, @output).should eq true
     end
 
     it "should exit on ctrl+c" do
       Readline.should_receive(:readline).and_raise(Interrupt)
+      @command.stub(:welcome_user)
+      @command.stub(:terminate_gracefully)
       @command.execute(@input, @output).should eq false
     end
 
+    it "should print a final newline on EOF so the user's prompt looks nice" do
+      @input.stdin.stub(:tty?) { true }
+      @output.should_receive(:line).with("")
+      Readline.should_receive(:readline).and_return(false)
+      @command.stub(:welcome_user)
+      @command.execute(@input, @output)
+    end
+
+    it "should print a final newline on error so the user's prompt looks nice" do
+      @input.stdin.stub(:tty?) { true }
+      @output.should_receive(:line).with("")
+      @command.stub(:shell).and_raise(Interrupt)
+      @command.execute(@input, @output)
+    end
+
+    it "should not print a final newline on EOF if stdin isn't a tty" do
+      @input.stdin.stub(:tty?) { false }
+      @output.should_not_receive(:line).with("")
+      Readline.should_receive(:readline).and_return(false)
+      @command.stub(:welcome_user)
+      @command.execute(@input, @output)
+    end
+
+    it "should print a welcome message on the tty" do
+      @input.stdin.stub(:tty?) { true }
+      @output.should_receive(:line) do |line|
+        line.should include "ppl"
+        line.should include Ppl::Version
+      end
+      Readline.should_receive(:readline).and_return(false)
+      @command.stub(:terminate_gracefully)
+      @command.execute(@input, @output)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &14299780 !ruby/object:Gem::Requirement
+  requirement: &16217320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *14299780
+  version_requirements: *16217320
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &14298340 !ruby/object:Gem::Requirement
+  requirement: &16216640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *14298340
+  version_requirements: *16216640
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &14297560 !ruby/object:Gem::Requirement
+  requirement: &16215860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *14297560
+  version_requirements: *16215860
 description: CLI Address Book
 email: henry@henrysmith.org
 executables: