marv 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab5d6c1f171290528aa4ac9c59827070ab4198f584e01cafe3199e1545763d8
-  data.tar.gz: 7159c03ed225e1670311fdc9cb7c327cbb9071e47d766ef841f54859a4c9b71f
+  metadata.gz: aead1f81bd54be742953a991c4f1f3da7145753835847800c537581be93bcf41
+  data.tar.gz: d411b5671cb3a63fc7759dc14958aee9c6a587a80eff0799b992fe76aa4a547c
 SHA512:
-  metadata.gz: 2c738c34949d7d2e91748c8eb44df56d8457125d2a52503a9d81089f11e5e6532f9e152cbdd67646abf0f2d27378f700daf3298af1b012f460003d6acdffaf10
-  data.tar.gz: 80a2e97c2268d29b9203152dbd4776d8c232b968095f5aa820e7d2c6f84bc92c10036f65ed0a71da2730d18504e2479b842ac3aa3ca9e9d24a4d90a01f4ffeac
+  metadata.gz: 9e2ac78aa59075debd2b3832ed6117badd7740e09c8abc71e0aa513e39d344cb2961fdea045376375885fdb44e0787d6bbc79cfc9df9330ad686a453e788f6fa
+  data.tar.gz: 5958235bf58734ee024fc001dd2fc0634b6933cf58b2a36ea3984a6b2aaffa1b56f3a28ebeaf47077f58fc6b4a83ee8b764bcc3da626aa4fe612e9e17cc560e3

data/lib/marv/project/guard/pry.rb

@@ -1,11 +1,42 @@
+require 'guard/jobs/base'
+
 module Guard
   module Jobs
     class PryWrapper < Base
 
+      def _setup(options)
+        Pry.config.should_load_rc = false
+        Pry.config.should_load_local_rc = false
+        history_file_path = options[:history_file] || HISTORY_FILE
+
+        if legacy_pry?
+          Pry.config.history.file = File.expand_path(history_file_path)
+        else
+          Pry.config.history_file = File.expand_path(history_file_path)
+        end
+
+        _add_hooks(options)
+
+        ::Guard::Commands::All.import
+        ::Guard::Commands::Change.import
+        ::Guard::Commands::Notification.import
+        ::Guard::Commands::Pause.import
+        ::Guard::Commands::Reload.import
+        ::Guard::Commands::Show.import
+        ::Guard::Commands::Scope.import
+
+        _setup_commands
+        _configure_prompt
+      end
+
       private
 
       attr_reader :thread
 
+      def legacy_pry?
+        Gem::Version.new(Pry::VERSION) < Gem::Version.new('0.13')
+      end
+
       # Colorizes message using Thor Color Util
       #
       def _colorize(text, color)
@@ -16,7 +47,22 @@ module Guard
       # `pry`.
       #
       def _configure_prompt
-        Pry.config.prompt = [_prompt(_colorize("\u00BB", :green)), _prompt(_colorize("*", :yellow))]
+        prompt_procs = [
+          _prompt(_colorize("\u00BB", :green)),
+          _prompt(_colorize("*", :yellow))
+        ]
+
+        if legacy_pry?
+          Pry.config.prompt = prompt_procs
+        else
+          prompt_args = [:marv, 'Marv prompt for guard watcher', prompt_procs]
+
+          Pry::Prompt.add(*prompt_args) do |context, nesting, pry_instance, sep|
+            sep.call(context, nesting, pry_instance)
+          end
+
+          Pry.config.prompt = Pry::Prompt[:marv]
+        end
       end
 
       # Returns a proc that will return itself a string ending with the given
@@ -30,7 +76,7 @@ module Guard
           hist_text  = _colorize("[#{history}]", :yellow)
           clip_text  = _colorize("(#{_clip_name(target_self)})", :cyan)
           level_text = _colorize("#{level}", :cyan)
-          path_text  = _colorize(Dir.pwd.sub(Dir.home, '~'), :magenta)
+          path_text  = _colorize(File.basename(Dir.pwd), :magenta)
 
           "#{hist_text} #{_scope_for_prompt}#{process} #{path_text} #{clip_text}#{level_text} #{ending_char} "
         end

data/lib/marv/version.rb

@@ -1,3 +1,3 @@
 module Marv
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Jonian Guveli
@@ -223,14 +223,14 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
@@ -286,7 +286,6 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,119 +0,0 @@
-PATH
-  remote: .
-  specs:
-    marv (0.7.2)
-      autoprefixer-rails (~> 9.3)
-      childprocess (~> 0.5)
-      coffee-script (~> 2.3)
-      guard (~> 2.8, < 2.9)
-      guard-livereload (~> 2.4)
-      less (~> 2.6)
-      mini_racer (~> 0.2)
-      mysql2 (~> 0.3)
-      pry (< 0.13)
-      rubyzip (~> 1.1)
-      sass (~> 3.4)
-      sprockets (~> 3.7)
-      thor (~> 0.19)
-      tilt (~> 1.1, != 1.3)
-      uglifier (~> 4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    autoprefixer-rails (9.7.6)
-      execjs
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.2)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    commonjs (0.2.7)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.7)
-    execjs (2.7.0)
-    ffi (1.12.2)
-    formatador (0.2.5)
-    guard (2.8.2)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-livereload (2.5.2)
-      em-websocket (~> 0.5)
-      guard (~> 2.8)
-      guard-compat (~> 1.0)
-      multi_json (~> 1.8)
-    hitimes (2.0.0)
-    http_parser.rb (0.6.0)
-    less (2.6.0)
-      commonjs (~> 0.2.7)
-    libv8 (7.3.492.27.1)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.2.4)
-    method_source (0.9.2)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
-    multi_json (1.14.1)
-    mysql2 (0.5.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.2.2)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubyzip (1.3.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    thor (0.20.3)
-    tilt (1.4.1)
-    timers (4.0.4)
-      hitimes
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  marv!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.1.2