hrk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55c5d03bcb00380ffcff94955234658934ee118
-  data.tar.gz: 72e2a53ee349c5dbaece355c70b89085dc72827f
+  metadata.gz: 9a5606eeb5d8dc713063b4d76ef4633a60d0ba61
+  data.tar.gz: db35ff5cc2c2ea9445087056d1057a4a1db4100f
 SHA512:
-  metadata.gz: 4c5dfad9f5057ce40bda69d34dca06ccac6d068be94e607efabb66d29e08e7f838e72e5e58128e66d732b7e2ea31d52fda5f12e3dbb6f89cec7bb7e0626c4c1f
-  data.tar.gz: 57f0447db88c4739215ed04c94f046e12db6da9983d2c048d34c3c0576c9c10076af74960824e4eb6d156d48688e87f46dd0a3f840f7aa62adcf0393859e1825
+  metadata.gz: 425ecb4c9bb064204f13a074b1e3b21b1c066a754241a5d62bfa66ff6a01d9b2bd69736aa85f778e5d9996f50f697ec4b9514ad56f4b5d9ed8a431b62cca0eb9
+  data.tar.gz: c3d7d9ae715a2a0ba7846c6915b975bbf6e589dafd06b0554ca9f2e604491447fc1c2f8531a54b79fc6b6a07be1af6a5b147b048f4405182c82416284d2aed78

data/README.md

@@ -2,6 +2,25 @@
 
 Hrk 2 swim like a dolphin in a sea of heroku commands
 
+```
+      ,|
+     / ;
+    /  \
+   : ,'(
+   |( `.\
+   : \  `\       \.
+    \ `.         | `.
+     \  `-._     ;   \
+      \     ``-.'.. _ `._
+       `. `-.            ```-...__
+        .'`.        --..          ``-..____
+      ,'.-'`,_-._            ((((   <o.   ,'
+           `' `-.)``-._-...__````  ____.-'
+               ,'    _,'.--,---------'
+           _.-' _..-'   ),'
+          ``--''        `
+```
+
 ## Getting started
 
 You can install the Hrk gem using the gem command:
@@ -21,7 +40,7 @@ $ bundle install
 
 And enjoy the hrk command awesome power:
 ```
-$ hrk your-heroku-remote-name: logs && hrk : run console
+$ hrk logs -r your-heroku-remote-name && hrk run console
 ```
 
 
@@ -69,9 +88,9 @@ Yup. Now It doesn't look really that better now does it?
 Hrk remembers the previous remote you've used. So you can do:
 
 ```bash
-$ hrk this-relly-long-remote-name: run rake do:some:work && \
-  hrk : run rake arrange:stuff && \
-  hrk : run rake test:some:thingy
+$ hrk -r this-relly-long-remote-name run rake do:some:work && \
+  hrk run rake arrange:stuff && \
+  hrk run rake test:some:thingy
 ```
 
 Isn't it more fun?
@@ -85,9 +104,9 @@ close your terminal.
 
 ```bash
 $ git push demo && \
-  hrk demo: run rake set-this-once && \ # happens on demo
+  hrk -r demo run rake set-this-once && \ # happens on demo
   git push -f demo HEAD^ && \
-  hrk : restart                         # also on demo
+  hrk restart                             # also on demo
 ```
 
 **...I chain hrk commands on concurrent terminals for different remotes?**
@@ -97,11 +116,11 @@ Then:
 
 ```bash
 # on terminal 1
-$ hrk demo: run rake db:migrate && \ # happens on demo
-  hrk : restart                      # still on demo
+$ hrk -r demo run rake db:migrate && \ # happens on demo
+  hrk restart                          # still on demo
 # on terminal 2
-$ hrk prod: run rake db:migrate && \ # happens on prod
-  hrk : restart                      # still on prod
+$ hrk -r prod run rake db:migrate && \ # happens on prod
+  hrk restart                          # still on prod
 ```
 
 **...I set another remote after completing a bunch of commands?**
@@ -109,11 +128,21 @@ $ hrk prod: run rake db:migrate && \ # happens on prod
 The last remote set is the one used by default for subsequent commands. So:
 
 ```bash
-$ hrk demo: run rake db:migrate && \ # happens on demo
-  hrk : restart && \                 # also on demo
-  hrk prod: maintenance:on && \      # happens on prod
-  hrk : run rake db:migrate && \     # also on prod
-  hrk : maintenance:off              # still on prod
+$ hrk -r demo run rake db:migrate && \ # happens on demo
+  hrk  restart && \                    # also on demo
+  hrk -r prod maintenance:on && \      # happens on prod
+  hrk run rake db:migrate && \         # also on prod
+  hrk maintenance:off                  # still on prod
+```
+
+**...I place the "-r remote" argument at the end of the command, the heroku way**
+
+It just works.
+```bash
+# this command
+$ hrk run console -r demo
+# is the same as
+$ hrk -r demo run console
 ```
 
 ## Do I still need the heroku toolbelt?

data/lib/hrk/execute/command.rb

@@ -1,25 +1,32 @@
 module Hrk
   module Execute
     class Command
-      REMOTE_MATCHER = %r{\A(.+):\Z}
-
       attr_reader :env
 
       def initialize
         @env = Hrk::Env.new
       end
 
-      def call remote, *args
-        if remote == ':'
-          raise ArgumentError.new("No remote has been previously defined") unless @env.remote?
-          Hrk::Heroku.new(@env.remote).call(args.join(' '))
+      def call *args
+        remote = remote_name args
+        if remote
+          @env.remote = remote
+          Hrk::Heroku.new(remote).call(remoteless_command(remote, args))
         else
-          raise ArgumentError.new("#{remote.inspect} isn't a proper remote marker") unless remote =~ REMOTE_MATCHER
-          remote_name = remote[REMOTE_MATCHER, 1]
-          @env.remote = remote_name
-          Hrk::Heroku.new(remote_name).call(args.join(' '))
+          raise ArgumentError.new("No remote has been previously defined and the command does not explicitely mention a remote") unless @env.remote?
+          Hrk::Heroku.new(@env.remote).call(args.join(' '))
         end
       end
+
+      private
+
+      def remote_name args
+        args.each_cons(2).detect { |(parameter, _)| parameter == '-r' }.join ' ' rescue nil
+      end
+
+      def remoteless_command remote, args
+        args.join(' ').gsub(%r{\s*#{remote}\s*}, ' ').strip
+      end
     end
   end
 end

data/lib/hrk/heroku.rb

@@ -1,18 +1,18 @@
 module Hrk
   class Heroku
-    def initialize remote_name
-      @remote_name = remote_name
+    def initialize remote
+      @remote = remote
     end
 
     def call command
       validate! command
-      system %Q(heroku #{command} -r #{@remote_name})
+      system %Q(heroku #{command} #{@remote})
     end
 
     private
 
     def validate! command
-      raise ExplicitApplicationError.new, "You're calling a command on remote #{@remote_name} yet the command explicitely references #{command[%r{-[ar]\s+\S+}]}" if command =~ %r{ -[ra]\b}
+      raise ExplicitApplicationError.new, "You're calling a command on remote #{@remote} yet the command explicitly references #{command[%r{-[ar]\s+\S+}]}" if command =~ %r{ -[ra]\b}
     end
 
     class ExplicitApplicationError < Exception

data/spec/hrk/execute/command_spec.rb

@@ -21,16 +21,16 @@ RSpec.describe Hrk::Execute::Command do
           describe "when the command returns #{result}" do
             before { allow(heroku).to receive(:call).and_return(result) }
 
-            it { expect(command.call("#{remote}:", *args)).to eq result }
+            it { expect(command.call('-r', remote, *args)).to eq result }
           end
         end
 
         describe 'interactions' do
-          before { command.call "#{remote}:", *args }
+          before { command.call '-r', remote, *args }
 
-          it { expect(Hrk::Heroku).to have_received(:new).with(remote) }
+          it { expect(Hrk::Heroku).to have_received(:new).with("-r #{remote}") }
           it { expect(heroku).to have_received(:call).with("whatever that:may -b") }
-          it { expect(command.env).to have_received(:remote=).with(remote) }
+          it { expect(command.env).to have_received(:remote=).with("-r #{remote}") }
         end
       end
 
@@ -41,14 +41,13 @@ RSpec.describe Hrk::Execute::Command do
         before { expect(command.env).not_to receive(:remote=) }
 
         it { expect { command.call }.to raise_error ArgumentError }
-        it { expect { command.call "bad-remote", *other_args }.to raise_error ArgumentError }
-        it { expect { command.call ":misplaced-marker", *other_args }.to raise_error ArgumentError }
-        it { expect { command.call ":", *other_args }.to raise_error ArgumentError }
+        it { expect { command.call "parameterless-remote", *other_args }.to raise_error ArgumentError }
+        it { expect { command.call *other_args, '-r' }.to raise_error ArgumentError }
       end
     end
 
     context 'a remote was previously memorized' do
-      let(:previous_remote) { "ye-olde-remote#{rand(1..9)}" }
+      let(:previous_remote) { "-r ye-olde-remote#{rand(1..9)}" }
       before { allow(command.env).to receive(:remote).and_return(previous_remote) }
       before { allow(command.env).to receive(:remote?).and_return(true) }
 
@@ -60,16 +59,16 @@ RSpec.describe Hrk::Execute::Command do
           describe "when the command returns #{result}" do
             before { allow(heroku).to receive(:call).and_return(result) }
 
-            it { expect(command.call("#{remote}:", *args)).to eq result }
+            it { expect(command.call('-r', remote, *args)).to eq result }
           end
         end
 
         describe 'interactions' do
-          before { command.call "#{remote}:", *args }
+          before { command.call '-r', remote, *args }
 
-          it { expect(Hrk::Heroku).to have_received(:new).with(remote) }
+          it { expect(Hrk::Heroku).to have_received(:new).with("-r #{remote}") }
           it { expect(heroku).to have_received(:call).with("whatever that:may -b") }
-          it { expect(command.env).to have_received(:remote=).with(remote) }
+          it { expect(command.env).to have_received(:remote=).with("-r #{remote}") }
         end
       end
 
@@ -80,28 +79,17 @@ RSpec.describe Hrk::Execute::Command do
           describe "when the command returns #{result}" do
             before { allow(heroku).to receive(:call).and_return(result) }
 
-            it { expect(command.call(":", *args)).to eq result }
+            it { expect(command.call(*args)).to eq result }
           end
         end
 
         describe 'interactions' do
-          before { command.call ":", *args }
+          before { command.call *args }
 
           it { expect(Hrk::Heroku).to have_received(:new).with(previous_remote) }
           it { expect(heroku).to have_received(:call).with("whatever that:may -b") }
         end
       end
-
-      describe 'edge cases (no remote or improper remote)' do
-        let(:other_args) { %W(something-#{rand(1..9)} or-another) }
-
-        before { expect(heroku).not_to receive(:call) }
-        before { expect(command.env).not_to receive(:remote=) }
-
-        it { expect { command.call }.to raise_error ArgumentError }
-        it { expect { command.call "bad-remote", *other_args }.to raise_error ArgumentError }
-        it { expect { command.call ":misplaced-marker", *other_args }.to raise_error ArgumentError }
-      end
     end
   end
 end

data/spec/hrk/heroku_spec.rb

@@ -16,11 +16,11 @@ RSpec.describe Hrk::Heroku do
       before { allow(heroku).to receive(:system) }
 
       describe '(standard case)' do
-        calling 'call rake db:rollback', on_remote: 'demo',    starts: 'heroku call rake db:rollback -r demo'
-        calling 'call rake db:migrate',  on_remote: 'prod',    starts: 'heroku call rake db:migrate -r prod'
-        calling 'call console',          on_remote: 'staging', starts: 'heroku call console -r staging'
-        calling 'logs -t',               on_remote: 'prod',    starts: 'heroku logs -t -r prod'
-        calling 'pgbackups:capture',     on_remote: 'demo',    starts: 'heroku pgbackups:capture -r demo'
+        calling 'call rake db:rollback', on_remote: '-r demo',    starts: 'heroku call rake db:rollback -r demo'
+        calling 'call rake db:migrate',  on_remote: '-r prod',    starts: 'heroku call rake db:migrate -r prod'
+        calling 'call console',          on_remote: '-r staging', starts: 'heroku call console -r staging'
+        calling 'logs -t',               on_remote: '-r prod',    starts: 'heroku logs -t -r prod'
+        calling 'pgbackups:capture',     on_remote: '-r demo',    starts: 'heroku pgbackups:capture -r demo'
       end
 
       describe '(edge case)' do
@@ -32,7 +32,7 @@ RSpec.describe Hrk::Heroku do
     end
 
     describe 'the result of the command' do
-      subject(:heroku) { Hrk::Heroku.new('some-remote') }
+      subject(:heroku) { Hrk::Heroku.new('-r some-remote') }
       before { allow(heroku).to receive(:system).with('heroku some command -r some-remote').and_return(system_returns) }
 
       context 'the command result is truthy' do

metadata

@@ -1,58 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: hrk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michel Belleville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: nyan-cat-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.11'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Hrk 2 swim like a dolphin in a sea of heroku commands
+        version: 5.0.0
+description: |
+  Hrk gives you the hrk command that proxies commands to heroku, keeping track of
+  the latest remote you used so you don't have to keep on typing it on every
+  subsequent command.
 email: michel.belleville@gmail.com
 executables:
 - hrk
@@ -95,5 +116,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Hrk 2 swim like a dolphin in a sea of heroku commands
+summary: Hrk remembers your heroku remotes
 test_files: []