hrk 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d38e84f36d6da9b58b461882813c680b79eeec
-  data.tar.gz: b053a4c69d8c8dd28e2d4e1fda5662fb54e66859
+  metadata.gz: 71509f19c9d674c923c4fb3d375516d87d9d5593
+  data.tar.gz: 4fe443aec8e10bb1f2d22a13dd3d4bd3969056bf
 SHA512:
-  metadata.gz: 736aec490d90d32fff6744995a47260ba69b42d27954efdef0489bb938f7ee21b26bcc891d5d0eb1bc795f903957219178404850aa538ebc4601f95b01038508
-  data.tar.gz: 1f334cd212a2dbf9a5237ce581af3559feba44b14d3cfe7a9dca4f75e51c4b05d0e49d3369a9cbd4c8558a1b20b651b9f58c3b26fde79f4f3f5a153db5a23210
+  metadata.gz: 4fc36605682ffc7e8421c39e3a6ed04de752907d5fe422c4e0a8e0da04ff54b3b990ed90e369608d4fbbc4ca28ccee0fb3801de4907d5ccdc9a09183b7c9d2e4
+  data.tar.gz: facfef2698ff6257aa58bfbbe9f28856e07da25f183c769f059162ba0b346ca30550742d72a568d1f03fe5f96347247923a8f193634e552e5f8372d0301238db

data/lib/hrk/execute.rb

@@ -1,14 +1,15 @@
 module Hrk
   module Execute
-    autoload :Command, 'hrk/execute/command'
-    autoload :Help,    'hrk/execute/help'
+    autoload :Command,   'hrk/execute/command'
+    autoload :Help,      'hrk/execute/help'
+    autoload :ErrorTrap, 'hrk/execute/error_trap'
 
     def self.call *args
       executer.call(*args)
     end
 
     def self.executer
-      Help.new Command.new
+      ErrorTrap.new Help.new Command.new
     end
   end
 end

data/lib/hrk/execute/error_trap.rb

@@ -0,0 +1,22 @@
+module Hrk
+  module Execute
+    class ErrorTrap
+      def initialize callee
+        @callee = callee
+      end
+
+      def call *args
+        if args.include? '--hrk-testing'
+          @callee.call *(args - ['--hrk-testing'])
+        else
+          begin
+            @callee.call *args
+          rescue
+            puts "Error: #{$!.message}"
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hrk/execute/help.rb

@@ -16,7 +16,7 @@ module Hrk
       def display
         puts <<-eos
 Usage:
-  hrk command [(-r remote | -a appname)]...
+  hrk command [(-r remote | -a appname)] [options]...
   hrk [h | help | -h | --help]
 
 The hrk command remembers the last app you've send a command to on a terminal
@@ -29,9 +29,11 @@ Note that whatever argument and/or options the command is composed of should not
 be tampered with and passed as is to the heroku toolbelt command.
 
 Options:
-  -h --help   Display this screen.
-  -r remote   Sets the remote for this command and the following
-  -a appname  Sets the heroku app name for this command and the following
+  -h --help     Display this screen.
+  -r remote     Sets the remote for this command and the following.
+  -a appname    Sets the heroku app name for this command and the following.
+
+  --hrk-testing Full exceptions stack trace delivered (testing purposes only).
 
 More on the hrk command on the gem's website:
 https://github.com/Bastes/hrk

data/lib/hrk/version.rb

@@ -1,3 +1,3 @@
 module Hrk
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/hrk/execute/error_trap_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+RSpec.describe Hrk::Execute::ErrorTrap do
+  describe '#call' do
+    let(:next_callee) { double }
+
+    subject(:error_trap) { Hrk::Execute::ErrorTrap.new(next_callee) }
+
+    context 'no --hrk-testing option' do
+      let(:args)   { %W(-a b#{rand(1..9)} --cd) }
+
+      context 'no exception is raised' do
+        let(:expected_result) { [true, false].sample }
+
+        before { allow(next_callee).to receive(:call).and_return(expected_result) }
+
+        subject!(:result) { error_trap.call(*args) }
+
+        it { expect(result).to eq expected_result }
+        it { expect(next_callee).to have_received(:call).with(*args) }
+      end
+
+      context 'an exception is raised' do
+        let(:exception) { ArgumentError.new "blah #{rand(1..9)} blah" }
+
+        before { allow(next_callee).to receive(:call).and_raise(exception) }
+        before { allow(error_trap).to receive(:puts) }
+
+        it { expect { error_trap.call(*args) }.not_to raise_exception }
+        it { expect(error_trap.call(*args)).to eq false }
+
+        context 'interactions' do
+          before { error_trap.call(*args) }
+
+          it { expect(error_trap).to have_received(:puts).with("Error: #{exception.message}") }
+        end
+      end
+    end
+
+    context 'an --hrk-testing option' do
+      let(:args)   { %w(-r remote --hrk-testing logs -t) }
+
+      context 'no exception is raised' do
+        let(:expected_result) { [true, false].sample }
+
+        before { allow(next_callee).to receive(:call).and_return(expected_result) }
+
+        subject!(:result) { error_trap.call(*args) }
+
+        it { expect(result).to eq expected_result }
+        it { expect(next_callee).to have_received(:call).with(*%w(-r remote logs -t)) }
+      end
+
+      context 'an exception is raised' do
+        let(:exception) { ArgumentError.new "blah #{rand(1..9)} blah" }
+
+        before { allow(next_callee).to receive(:call).with(*%w(-r remote logs -t)).and_raise(exception) }
+        before { allow(error_trap).to receive(:puts) }
+
+        it { expect { error_trap.call(*args) }.to raise_exception exception }
+
+        context 'interactions' do
+          before { error_trap.call(*args) rescue nil }
+
+          it { expect(error_trap).not_to have_received(:puts) }
+        end
+      end
+    end
+  end
+end

data/spec/hrk/execute_spec.rb

@@ -18,11 +18,13 @@ RSpec.describe Hrk::Execute do
   end
 
   describe '.executer' do
-    let(:help)    { double(Hrk::Execute::Help) }
-    let(:command) { double(Hrk::Execute::Command) }
+    let(:error_trap) { double(Hrk::Execute::ErrorTrap) }
+    let(:help)       { double(Hrk::Execute::Help) }
+    let(:command)    { double(Hrk::Execute::Command) }
+    before { allow(Hrk::Execute::ErrorTrap).to receive(:new).with(help).and_return(error_trap) }
     before { allow(Hrk::Execute::Help).to receive(:new).with(command).and_return(help) }
     before { allow(Hrk::Execute::Command).to receive(:new).and_return(command) }
 
-    it { expect(Hrk::Execute.executer).to eq help }
+    it { expect(Hrk::Execute.executer).to eq error_trap }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michel Belleville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -166,11 +166,13 @@ files:
 - lib/hrk/env.rb
 - lib/hrk/execute.rb
 - lib/hrk/execute/command.rb
+- lib/hrk/execute/error_trap.rb
 - lib/hrk/execute/help.rb
 - lib/hrk/heroku.rb
 - lib/hrk/version.rb
 - spec/hrk/env_spec.rb
 - spec/hrk/execute/command_spec.rb
+- spec/hrk/execute/error_trap_spec.rb
 - spec/hrk/execute/help_spec.rb
 - spec/hrk/execute_spec.rb
 - spec/hrk/heroku_spec.rb