hrk 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a9d0caab344b968fe75fdf67544614eee7c8510
-  data.tar.gz: f6bf197cf5943045989c0ff77f0cc5a7174cb88f
+  metadata.gz: 249a8378c38fae86402ccc5044724196514bb47c
+  data.tar.gz: cc1969e0eced0161a949b9f225c39d2878999ee7
 SHA512:
-  metadata.gz: 8ad9226be51959e0d073fe622e86e817536e5b59658451576bbc28b2a717b6b23d3caace733612939cd928aab3c4f84f9705bbbedbf7d7d15af5e2ef58387662
-  data.tar.gz: bd3fda9fe1058571c9b02f567c1440135bc0a2a54b2418d94979254c32703836af4268268b4407741c583d020fb2c6dfeea8261c86d700c35288cf95d0f5420a
+  metadata.gz: 5ec9446bb316c5a18cc6c9e21ab17754390ecae18533f8842b496f7615f310403bf2b3cf2d533498d39537068a6476f9a5d0e763fc13d70db27945eed1b78fe7
+  data.tar.gz: dd6513deeb046a20f65e9ef59571e00898c76ba7bd6d5d58cfeff94d968ff828d746768ca2f60fc0f03701d1241db77fa5e4bc41526b750a13dd09a0ec30f12f

data/lib/hrk/env.rb

@@ -73,11 +73,27 @@ module Hrk
     end
 
     def pid= value
-      pid_path.write(value)
+      pid_path.write value
     end
 
     def pid_path
       tmp_path.join "#{tty_digest}.pid"
     end
+
+    def last_time
+      Time.at(last_time_path.read.to_i) if last_time?
+    end
+
+    def last_time?
+      last_time_path.exist?
+    end
+
+    def last_time= value
+      last_time_path.write value.to_i
+    end
+
+    def last_time_path
+      tmp_path.join "#{tty_digest}.time"
+    end
   end
 end

data/lib/hrk/execute/ask_for_remote.rb

@@ -6,7 +6,7 @@ module Hrk
       end
 
       def call *args
-        @next_callee.call *insure_remote(args)
+        @next_callee.call(*insure_remote(args))
       end
 
       private

data/lib/hrk/execute/command.rb

@@ -11,8 +11,10 @@ module Hrk
 
       def call *args
         command, remote = command_and_remote args
-        @env.remote = remote
-        Hrk::Heroku.new(*remote).call(*command)
+        Hrk::Heroku.new(*remote).call(*command).tap do
+          @env.remote = remote
+          @env.last_time = Time.now
+        end
       end
 
       private

data/lib/hrk/execute/remember.rb

@@ -1,21 +1,43 @@
 module Hrk
   module Execute
     class Remember
+      class InvalidInputError < StandardError
+        def initialize input
+          super "Can't understand `#{input}` ; aborting"
+        end
+      end
+
       def initialize next_callee
         @next_callee = next_callee
       end
 
       def call *args
-        env = Hrk::Env.new
-        if remoteless?(args) && env.remote?
-          @next_callee.call(*args, *env.remote)
-        else
-          @next_callee.call(*args)
-        end
+        @next_callee.call(*remember_and_confirm!(args))
       end
 
       private
 
+      def remember_and_confirm! args
+        env = Hrk::Env.new
+        return args unless remoteless?(args) && env.remote? && reuse_or_confirm!(args, env)
+        args + env.remote
+      end
+
+      def reuse_or_confirm! args, env
+        !(env.last_time? && env.last_time + 5 < Time.now) || confirm!(args, env)
+      end
+
+      def confirm! args, env
+        puts "Please confirm that you want to run this command: `heroku #{(args + env.remote).join " "}` [Y]es [N]o:"
+        get_valid_input! =~ /\Ay(?:es)?\Z/i
+      end
+
+      def get_valid_input!
+        STDIN.gets.strip.tap do |input|
+          raise InvalidInputError.new(input) unless input =~ /\A(?:y(?:es)?)|(?:n(?:o)?)\Z/i
+        end
+      end
+
       def remoteless? args
         args.reverse.take(2).none? { |a| a =~ /\A-[ar]\Z/ }
       end

data/lib/hrk/version.rb

@@ -1,3 +1,3 @@
 module Hrk
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/hrk/env_spec.rb

@@ -19,6 +19,14 @@ RSpec.describe Hrk::Env do
     before { allow(env).to receive(:pid_path).and_return pid_path }
   end
 
+  shared_context 'fake last_time_path' do
+    let(:last_time_path) { double(Pathname) }
+
+    before { allow(last_time_path).to receive(:write) }
+    before { allow(last_time_path).to receive(:delete) }
+    before { allow(env).to receive(:last_time_path).and_return last_time_path }
+  end
+
   shared_context 'fake tty' do
     let(:tty) { "/dev/pts/#{rand(1..9)}" }
 
@@ -276,8 +284,66 @@ RSpec.describe Hrk::Env do
 
     let(:some_dir) { Pathname.new "/and#{rand(1..9)}/another_/dir" }
 
-    before { allow(env).to receive(:tmp_path).and_return(Pathname.new(some_dir)) }
+    before { allow(env).to receive(:tmp_path).and_return(some_dir) }
 
     it { expect(env.pid_path).to eq Pathname.new("#{some_dir}/#{Digest::MD5.hexdigest(tty)}.pid") }
   end
+
+  describe '#last_time' do
+    include_context 'fake last_time_path'
+
+    before { allow(last_time_path).to receive(:exist?).and_return it_pre_exist }
+    before { allow(last_time_path).to receive(:read).and_return last_time.to_i.to_s }
+
+    context 'no last_time file exists' do
+      let(:it_pre_exist) { false }
+      let(:last_time)    { nil }
+
+      it { expect(env.last_time).to eq nil }
+    end
+
+    context 'the last_time file exists' do
+      let(:it_pre_exist) { true }
+      let(:last_time) { Time.at(rand(Time.new(2015, 1, 1, 0, 0, 0).to_i..Time.new(2020, 1, 1, 0, 0, 0).to_i)) }
+
+      it { expect(env.last_time).to eq last_time }
+    end
+  end
+
+  describe '#last_time?' do
+    include_context 'fake last_time_path'
+
+    before { allow(last_time_path).to receive(:exist?).and_return it_pre_exist }
+
+    context 'the last_time file exists' do
+      let(:it_pre_exist) { true }
+
+      it { expect(env.last_time?).to eq true }
+    end
+
+    context 'the last_time file does not exist' do
+      let(:it_pre_exist) { false }
+
+      it { expect(env.last_time?).to eq false }
+    end
+  end
+
+  describe '#last_time=' do
+    let(:last_time) { Time.at(rand(Time.new(2015, 1, 1, 0, 0, 0).to_i..Time.new(2020, 1, 1, 0, 0, 0).to_i)) }
+    include_context 'fake last_time_path'
+
+    before { env.last_time = last_time }
+
+    it { expect(last_time_path).to have_received(:write).with(last_time.to_i) }
+  end
+
+  describe '#last_time_path' do
+    include_context "fake tty"
+
+    let(:some_dir) { Pathname.new "/stairway/#{rand(1..9)}/heavens" }
+
+    before { allow(env).to receive(:tmp_path).and_return(some_dir) }
+
+    it { expect(env.last_time_path).to eq Pathname.new("#{some_dir}/#{Digest::MD5.hexdigest(tty)}.time") }
+  end
 end

data/spec/hrk/execute/command_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe Hrk::Execute::Command do
     before { allow(Hrk::Heroku).to receive(:new).and_return(heroku) }
 
     before { allow(command.env).to receive(:remote=) }
+    before { allow(command.env).to receive(:last_time=) }
 
     context "no remote was previously memorized" do
       before { allow(command.env).to receive(:remote?).and_return(nil) }
@@ -28,11 +29,13 @@ RSpec.describe Hrk::Execute::Command do
             end
 
             describe "interactions" do
+              around { |b| Timecop.freeze Time.now, &b }
               before { command.call(*args, opt, remote) }
 
               it { expect(Hrk::Heroku).to have_received(:new).with(opt, remote) }
               it { expect(heroku).to have_received(:call).with(*%w{whatever that:may -b}) }
               it { expect(command.env).to have_received(:remote=).with([opt, remote]) }
+              it { expect(command.env).to have_received(:last_time=).with(Time.now) }
             end
           end
         end
@@ -53,11 +56,13 @@ RSpec.describe Hrk::Execute::Command do
               end
 
               describe "interactions" do
+                around { |b| Timecop.freeze Time.now, &b }
                 before { command.call(opt, remote) }
 
                 it { expect(Hrk::Heroku).to have_received(:new).with(opt, remote) }
                 it { expect(heroku).to have_received(:call).with no_args }
                 it { expect(command.env).to have_received(:remote=).with([opt, remote]) }
+                it { expect(command.env).to have_received(:last_time=).with(Time.now) }
               end
             end
           end
@@ -68,6 +73,7 @@ RSpec.describe Hrk::Execute::Command do
 
           before { expect(heroku).not_to receive(:call) }
           before { expect(command.env).not_to receive(:remote=) }
+          before { expect(command.env).not_to receive(:last_time=) }
 
           it { expect { command.call }.to raise_error ArgumentError }
           it { expect { command.call(*other_args) }.to raise_error ArgumentError }

data/spec/hrk/execute/remember_spec.rb

@@ -50,15 +50,52 @@ RSpec.describe Hrk::Execute::Remember do
       before { allow(env).to receive(:remote?).and_return(true) }
       before { allow(env).to receive(:remote).and_return(remote) }
 
+      context "no remote in the args" do
+        before { allow(env).to receive(:last_time?).and_return true }
+        before { allow(env).to receive(:last_time).and_return(the_last_time) }
+
+        context "last command ended less than 5 seconds ago" do
+          let(:the_last_time) { Time.now - 4 }
+
+          receiving %w(restart), it_should_pass_on: -> { %w(restart) + remote }
+        end
+
+        context "last command ended more than 5 seconds ago" do
+          let(:the_last_time) { Time.now - 6 }
+          before { allow(remember).to receive(:puts) }
+          before { allow(STDIN).to receive(:gets).and_return(the_users_input) }
+
+          ["y", "Y", "yes", "YES", "Yes"].each do |confirmation|
+            context "and the user confirms with #{confirmation}" do
+              let(:the_users_input) { "#{confirmation}\n" }
+
+              receiving %w(restart), it_should_pass_on: -> { %w(restart) + remote }
+            end
+          end
+
+          ["n", "N", "no", "NO", "No"].each do |abortion|
+            context "and the user aborts with #{abortion}" do
+              let(:the_users_input) { abortion }
+
+              receiving %w(run rake db:migrate), it_should_pass_on: -> { %w(run rake db:migrate) }
+            end
+          end
+
+          ["o", "whatever", "dude", "-r demo"].each do |gibbrish|
+            context "and the user answers with #{gibbrish}" do
+              let(:the_users_input) { gibbrish }
+
+              it { expect { remember.call %w(run rails console) }.to raise_error Hrk::Execute::Remember::InvalidInputError }
+            end
+          end
+        end
+      end
+
       context "a remote in the args" do
         receiving %w(run rake some:task -r a-remote), it_should_pass_on: %w(run rake some:task -r a-remote)
         receiving %w(maintenance:on -a another-app), it_should_pass_on: %w(maintenance:on -a another-app)
       end
 
-      context "no remote in the args" do
-        receiving %w(restart), it_should_pass_on: -> { %w(restart) + remote }
-      end
-
       context "part of a remote in the args" do
         receiving %w(run console -r), it_should_pass_on: %w(run console -r)
         receiving %w(maintenance:on -a), it_should_pass_on: %w(maintenance:on -a)

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require 'coveralls'
+require 'timecop'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hrk
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Michel Belleville
@@ -150,6 +150,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 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