coltrane 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e888d83950eea8d581348fb1ef12c40ab5577ea73e13398760c29a4957cdf9c
-  data.tar.gz: a5441c9bdfdc66d5d12426087164e2396ad49fdbc11bd179981590174104ca43
+  metadata.gz: 6f3a6358298a33b8fb7ad3553bdf3bf1a580e801e7736703284e0b8d181459f1
+  data.tar.gz: f34fa1941faadde24b563ca891c2222726c97edf1892a55a0f87f38cd3f1ae16
 SHA512:
-  metadata.gz: 6857cd706621735986c7ee7ca46bac9e226a6566539a93e03e9ca62c21bc6e39bd687dae45cb20845b8bbe960b9b7fc9974b8f59e5fcfdf1dc8851cd830fd7cc
-  data.tar.gz: 0df7240e3d1876a26bb44ca0e20b1490222da343d3c6654bb67c493ce094b7d9b6be14b13e8c47d44b8c2e703dda8a8568dd22074f4d0735f48da50fdcbb114e
+  metadata.gz: 65b8e34027979fc2dba3a18a4f56fa9e7be2d6c1d38a143e54e557f655bdbdc020b179e2b3ceb709e39c22d6dfc42b8c11eba305f82faf3489bc6777213139c0
+  data.tar.gz: 4e8c6b7d113a35124ec7409b50f89528ee469413a500129ccc3868451b8ab03f5a1be43c217eacff4b096e96b824b790f77cd669886bd77fda1e7ca4046b0983

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    coltrane (3.1.0)
+    coltrane (3.1.1)
       color (~> 1.8)
       dry-monads (~> 0.4)
-      mercenary (~> 0.3)
       paint (~> 2.0)
+      pedrozath-mercenary (= 0.3.8)
       tty-reader (~> 0.2)
 
 GEM
@@ -28,7 +28,6 @@ GEM
     hike (1.2.3)
     hitimes (1.2.6)
     json (2.1.0)
-    mercenary (0.3.6)
     method_source (0.9.0)
     necromancer (0.4.0)
     opal (0.10.5)
@@ -45,6 +44,7 @@ GEM
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
+    pedrozath-mercenary (0.3.8)
     powerpack (0.1.1)
     pry (0.11.3)
       coderay (~> 1.1.0)

data/bin/coltrane-interactive

@@ -14,8 +14,13 @@ Class.new do
     shell
   end
 
-  def quit_commands
-    /quit|exit/
+  def quit_cmd?(cmd)
+    cmd =~ /quit|exit/
+  end
+
+  def ignored_cmd?(cmd)
+    cmd =~ /shell/ ||
+    cmd.strip == ''
   end
 
   def command
@@ -24,8 +29,9 @@ Class.new do
 
   def shell
     command
-    .tap        { |cmd| exit if cmd =~ quit_commands }
-    .yield_self { |cmd| %x{coltrane #{cmd}}}
+    .tap        { |cmd| exit if quit_cmd?(cmd) }
+    .tap        { |cmd| shell and return if ignored_cmd?(cmd) }
+    .yield_self { |cmd| %x{coltrane #{cmd}} }
     .yield_self { |response| puts ["\n", response, "\n"].join }
     shell
   end

data/coltrane.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-monads',  '~> 0.4'
   spec.add_runtime_dependency 'paint',       '~> 2.0'
   spec.add_runtime_dependency 'color',       '~> 1.8'
-  spec.add_runtime_dependency 'mercenary',   '~> 0.3'
+  spec.add_runtime_dependency 'pedrozath-mercenary', '0.3.8'
   spec.add_development_dependency "bundler", '~> 1.14'
   spec.add_development_dependency "rake",    '~> 10.0'
 end

data/exe/coltrane

@@ -2,10 +2,13 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'bundler'
+Bundler.require(:default)
 
 require 'paint'
 require 'color'
-require 'mercenary'
+
+require 'pedrozath-mercenary'
 require 'coltrane/commands'
 
 Paint.mode = 0xFFFFFF
@@ -36,6 +39,22 @@ Mercenary.program(:Coltrane) do |p|
     end
   end
 
+  p.command(:help) do |c|
+    c.description 'May give you some help.'
+    c.syntax 'help <command> [subcommand, sub-subcommand, ...]'
+    c.action do |(*command_path), _options|
+      if command_path.empty?
+        puts p
+      else
+        puts begin
+          command_path.reduce(p) do |memo, key|
+            memo.commands.delete(key.to_sym)
+          end || "\n Sorry, command found."
+        end
+      end
+    end
+  end
+
   p.default_command(:shell)
 end
 

data/lib/coltrane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coltrane
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: mercenary
+  name: pedrozath-mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement