hrk 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e910ea77cfbd6307926ba296eba33f3a6b8e43
-  data.tar.gz: 73d1df2e9827bc0eaa1417e3c7f966d3a72b5aff
+  metadata.gz: c0e96c9119e9ab6760b61ed413b194342492abe0
+  data.tar.gz: d724167d86311058927c2f23071ecabbd660f773
 SHA512:
-  metadata.gz: b812509b8e4a20cbc67fc93646a01fc014dab686582baad96d6867ad15303595641d7afe0103298362baeffe3d0030dd0990adadbeaf78a57b6fdbb1fa592953
-  data.tar.gz: 293229e3d9b9db5f192e82308bb18a299ddd0176bdb79469a092575cd260abd9bbbfdaf8ce64056fe76e0507839c92f30a3c44e974d340affd6d3c3b31daa15f
+  metadata.gz: 8e31139f91797f411a26d4e1c845841d2610bccd1cb89cba0313ea4c2ce44b75072fb4de90f86bdeb5de9721d877a220573dcfa8579ba4fe32ed95d00a142a42
+  data.tar.gz: e275e2ec264e95371275d171cea050ba64c5f0ef1357437f6d835f621e84a950052396b48b78249cfa4ffc26bc4ba067583255716aaf650627edf010e7955c7b

data/lib/hrk/execute/error_trap.rb

@@ -7,10 +7,10 @@ module Hrk
 
       def call *args
         if args.include? '--hrk-testing'
-          @callee.call *(args - ['--hrk-testing'])
+          @callee.call(*(args - ['--hrk-testing']))
         else
           begin
-            @callee.call *args
+            @callee.call(*args)
           rescue
             puts "Error: #{$!.message}"
             false

data/lib/hrk/execute/help.rb

@@ -16,6 +16,7 @@ module Hrk
       def display
         puts <<-eos
 Usage:
+  hrk
   hrk command [(-r remote | -a appname)] [options]...
   hrk [h | help | -h | --help]
 
@@ -28,6 +29,9 @@ The command is whatever you would give heroku, except (obviously) for the
 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.
 
+You can pass no option to hrk to have it return current memorized remote (the
+command will fail when no remote have been defined).
+
 Options:
   -h --help     Display this screen.
   -r remote     Sets the remote for this command and the following.

data/lib/hrk/execute/remote_display.rb

@@ -0,0 +1,23 @@
+module Hrk
+  module Execute
+    class RemoteDisplay
+      def initialize fallback
+        @env = Hrk::Env.new
+        @fallback = fallback
+      end
+
+      def call *args
+        if args.empty?
+          if @env.remote?
+            puts @env.remote.join ' '
+            true
+          else
+            false
+          end
+        else
+          @fallback.call(*args)
+        end
+      end
+    end
+  end
+end

data/lib/hrk/execute.rb

@@ -4,13 +4,14 @@ module Hrk
     autoload :Help,           'hrk/execute/help'
     autoload :ErrorTrap,      'hrk/execute/error_trap'
     autoload :HerokuDetector, 'hrk/execute/heroku_detector'
+    autoload :RemoteDisplay,  'hrk/execute/remote_display'
 
     def self.call *args
       executer.call(*args)
     end
 
     def self.executer
-      ErrorTrap.new HerokuDetector.new Help.new Command.new
+      ErrorTrap.new HerokuDetector.new RemoteDisplay.new Help.new Command.new
     end
   end
 end

data/lib/hrk/version.rb

@@ -1,3 +1,3 @@
 module Hrk
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/hrk/execute/remote_display_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+RSpec.describe Hrk::Execute::RemoteDisplay do
+  describe '#call' do
+    let(:fallback)          { double }
+    let(:fallback_result)   { [true, false].sample }
+    let(:remote)            { [%w(-a -r).sample, "demo#{rand(1..9)}"] }
+    let(:there_be_a_remote) { [true, false].sample }
+
+    subject(:remote_display) { Hrk::Execute::RemoteDisplay.new(fallback) }
+
+    before { allow_any_instance_of(Hrk::Env).to receive(:remote?).and_return(there_be_a_remote) }
+    before { allow_any_instance_of(Hrk::Env).to receive(:remote).and_return(remote) }
+    before { allow(fallback).to receive(:call).and_return(fallback_result) }
+    before { allow(remote_display).to receive(:puts) }
+
+    subject!(:result) { remote_display.call(*args) }
+
+    context 'there are no arguments' do
+      let(:args) { [] }
+
+      context 'but there is a remote' do
+        let(:there_be_a_remote) { true }
+
+        it { expect(result).to eq true }
+        it { expect(remote_display).to have_received(:puts).with(remote.join(' ')) }
+        it { expect(fallback).not_to have_received(:call) }
+      end
+
+      context 'and no remote' do
+        let(:there_be_a_remote) { false }
+
+        it { expect(result).to eq false }
+        it { expect(remote_display).not_to have_received(:puts) }
+        it { expect(fallback).not_to have_received(:call) }
+      end
+    end
+
+    context 'there are arguments' do
+      let(:args) { %W(what#{rand(1..9)} --will we --do -to -- the drunken --whaler?) }
+
+      it { expect(result).to eq fallback_result }
+      it { expect(remote_display).not_to have_received(:puts) }
+      it { expect(fallback).to have_received(:call).with(*args) }
+    end
+  end
+end

data/spec/hrk/execute_spec.rb

@@ -20,12 +20,15 @@ RSpec.describe Hrk::Execute do
   describe '.executer' do
     let(:error_trap)      { double(Hrk::Execute::ErrorTrap) }
     let(:heroku_detector) { double(Hrk::Execute::HerokuDetector) }
+    let(:remote_display)  { double(Hrk::Execute::RemoteDisplay) }
     let(:help)            { double(Hrk::Execute::Help) }
     let(:command)         { double(Hrk::Execute::Command) }
-    before { allow(Hrk::Execute::ErrorTrap).to receive(:new).with(heroku_detector).and_return(error_trap) }
-    before { allow(Hrk::Execute::HerokuDetector).to receive(:new).with(help).and_return(heroku_detector) }
-    before { allow(Hrk::Execute::Help).to receive(:new).with(command).and_return(help) }
+
     before { allow(Hrk::Execute::Command).to receive(:new).and_return(command) }
+    before { allow(Hrk::Execute::Help).to receive(:new).with(command).and_return(help) }
+    before { allow(Hrk::Execute::RemoteDisplay).to receive(:new).with(help).and_return(remote_display) }
+    before { allow(Hrk::Execute::HerokuDetector).to receive(:new).with(remote_display).and_return(heroku_detector) }
+    before { allow(Hrk::Execute::ErrorTrap).to receive(:new).with(heroku_detector).and_return(error_trap) }
 
     it { expect(Hrk::Execute.executer).to eq error_trap }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Michel Belleville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -169,6 +169,7 @@ files:
 - lib/hrk/execute/error_trap.rb
 - lib/hrk/execute/help.rb
 - lib/hrk/execute/heroku_detector.rb
+- lib/hrk/execute/remote_display.rb
 - lib/hrk/heroku.rb
 - lib/hrk/version.rb
 - spec/hrk/env_spec.rb
@@ -176,6 +177,7 @@ files:
 - spec/hrk/execute/error_trap_spec.rb
 - spec/hrk/execute/help_spec.rb
 - spec/hrk/execute/heroku_detector_spec.rb
+- spec/hrk/execute/remote_display_spec.rb
 - spec/hrk/execute_spec.rb
 - spec/hrk/heroku_spec.rb
 - spec/spec_helper.rb