warp-dir 1.6.1 → 1.6.2

data/.travis.yml

@@ -2,21 +2,24 @@ language: ruby
 env:
   - CODECLIMATE_REPO_TOKEN=5306e7c3069bd3fef06f717d679f41e969e13bb05efef5bbe1fd781043b0c117
 rvm:
-- 2.2.7
-- 2.3.4
-- 2.4.1
+ - 2.3.8
+ - 2.4.9
+ - 2.5.7
+ - 2.6.5
+ - 2.7.0
 before_install:
-- gem install bundler --no-ri --no-rdoc
-after_success:
-- codeclimate-test-reporter
-script: rake
+- gem update --system
+- gem install bundler
+- bundle install --jobs 10 --redownload
+before_script:
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
+- ./cc-test-reporter before-build
+script:
+  - USER=travis bundle exec rspec --format documentation
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 cache: bundler
-notifications:
-  email:
-    recipients:
-    - kigster@gmail.com
-    on_success: change
-    on_failure: always
 addons:
   code_climate:
     repo_token:

data/Gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rubocop'
+if RUBY_VERSION.to_f > 2.3
+  gem 'simplecov'
+end 

data/Rakefile

@@ -1,7 +1,6 @@
-task :reinstall do
+task :reinstall => [ :'development:cleanup' ] do
   [ %q(chmod -R o+r .),
     %q(rm -f *.gem),
-    %q(rm -rf build),
     %q(gem uninstall -quiet -a --executables warp-dir 2> /dev/null; true),
     %q(gem build warp-dir.gemspec)
   ].each do |command|
@@ -12,9 +11,9 @@ task :reinstall do
     export gem_file=$(ls -1 *.gem | tail -1)
     export gem_name=${gem_file//.gem/}
     if [ "$(which ruby)" == "/usr/bin/ruby" ]; then
-      gem install $gem_file -n /usr/local/bin --no-ri --no-rdoc
+      gem install $gem_file -n /usr/local/bin
     else
-      gem install $gem_file --no-ri --no-rdoc
+      gem install $gem_file
     fi
   EOF
 end
@@ -26,14 +25,12 @@ namespace :development do
   desc 'Setup temporary Gemfile and install all dependencies.'
   task :setup do
     sh %q{
-      echo "source 'https://rubygems.org'; gemspec" > Gemfile
-      [[ -n $(which bundle) ]] || gem install bundler --no-ri --no-rdoc --quiet
-      bundle install --quiet
+      bundle install
     }.gsub(%r{^\s+}m, '')
   end
 
   task :cleanup do
-    sh %q{ rm -f Gemfile }
+    sh %q{ rm -f build }
   end
 
   namespace :bundler do

data/bin/warp-dir.bash

@@ -7,44 +7,54 @@
 #
 #
 wd() {
-  if [ -z "${warp_dir_exec_installed}" -o "${warp_dir_exec_installed}" == "1" ]; then
-    $(which 'warp-dir') 2>&1 > /dev/null
+  if [[ -z "${warp_dir_exec_installed}" || "${warp_dir_exec_installed}" -eq 1 ]]; then
+    $(which 'warp-dir') 2>&1 1>/dev/null
     export warp_dir_exec_installed=$?
   fi
 
-  if [ ${warp_dir_exec_installed} -eq 0 ]; then
-    IFS_BACKUP=$IFS
-    IFS="+"
-    output=$(WARP_DIR_SHELL=yes warp-dir $@ 2>&1)
+  if [[ ${warp_dir_exec_installed} -ne 0 ]]; then
+    wd_not_found
+    return 1
+  fi
+
+  local previous_ifs=$IFS
+  IFS="+"
+
+  local output=$(WARP_DIR_SHELL=yes RUBYOPT="-W0" warp-dir $@ 2>&1)
+  local code=$?
+
+  if [[ $code -eq 127 ]]; then
+    [[ -n $(command -v rbenv) ]] && rbenv rehash >/dev/null 2>&1
+    output=$(WARP_DIR_SHELL=yes RUBYOPT="-W0" warp-dir $@ 2>&1)
     code=$?
     if [ $code -eq 127 ]; then
       unset warp_dir_exec_installed
       wd_not_found
-    else
-      eval ${output}
-      IFS=$IFS_BACKUP
+      IFS=$previous_ifs
+      return 1
     fi
-  else
-    wd_not_found
   fi
+
+  eval "${output}"
+  export IFS=$previous_ifs
 }
 
 wd_not_found() {
-    printf "\nWhoops – I can't find 'warp-dir' executable.\n"
-    printf "Is the gem properly installed?\n"
-    printf "\nTry reinstalling the gem with, for example:\n\n"
-    printf "    $ gem install warp-dir --no-wrappers\n"
-    printf "    $ hash -r\n"
-    printf "    $ warp-dir install [ --dotfile ~/.bashrc ]\n"
+  printf "\nWhoops – I can't find 'warp-dir' executable.\n"
+  printf "Is the gem properly installed?\n"
+  printf "\nTry reinstalling the gem with, for example:\n\n"
+  printf "    $ gem install warp-dir --no-wrappers\n"
+  printf "    $ hash -r\n"
+  printf "    $ warp-dir install [ --dotfile ~/.bashrc ]\n"
 }
 
 _wd() {
-    local WD_OPTS WD_POINTS cur prev
+  local WD_OPTS WD_POINTS cur prev
 
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    COMPREPLY=()
+  COMPREPLY=()
 
     # Only perform completion if the current word starts with a dash ('-'),
     # meaning that the user is trying to complete an option.
@@ -65,6 +75,6 @@ _wd() {
     [[ $COMP_CWORD == 1 ]] && WD_COMP_OPTIONS="${WD_COMP_OPTIONS} ${WD_COMMANDS}"
     COMPREPLY=( $(compgen -W "${WD_COMP_OPTIONS}" -- ${cur}) )
     return 0
-}
+  }
 
 complete -F _wd wd

data/lib/warp/dir/store.rb

@@ -80,8 +80,8 @@ module Warp
       end
 
       # a version of add that save right after.
-      def insert(*args)
-        add(*args)
+      def insert(**opts)
+        add(**opts)
         save!
       end
 

data/lib/warp/dir/version.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 require_relative '../../colored'
 module Warp
   module Dir
-    VERSION = '1.6.1'
+    VERSION = '1.6.2'
 
-    @install_notice = <<-EOF
+    @install_notice = <<~EOF
 
-#{'>>> PLEASE READ THIS! '.bold.yellow}
+      #{'>>> PLEASE READ THIS! '.bold.yellow}
 
-For this gem to work, you must also install the coupled shell function
-into your shell initialization file. The following command should complete the
-setup (but please change '~/.bash_login' with whatever you use for shell
-initialization, although for most situations ~/.bash_login is good enough).
+      For this gem to work, you must also install the coupled shell function
+      into your shell initialization file. The following command should complete the
+      setup (but please change '~/.bash_profile' with whatever you use for shell
+      initialization, although for most situations ~/.bash_profile is good enough).
 
     EOF
     @install_notice += <<-EOF.bold.green
-  $ warp-dir install --dotfile ~/.bash_login
+  $ warp-dir install --dotfile ~/.bash_profile
 
     EOF
-    @install_notice += <<-EOF
-Restart your shell, and you should now have 'wd' shell function that
-should be used instead of the warp-dir executable.
+    @install_notice += <<~EOF
+      Restart your shell, and you should now have 'wd' shell function that
+      should be used instead of the warp-dir executable.
 
-Start with:
+      Start with:
 
     EOF
     @install_notice += <<-EOF.bold.blue
@@ -29,14 +31,13 @@ Start with:
   $ wd <directory>  # change directory – works just like "cd"
   $ wd add <name>   # add current directory as a warp point, call it <name>
     EOF
-    @install_notice += <<-EOF
+    @install_notice += <<~EOF
 
-Please submit issues to:
-https://github.com/kigster/warp-dir
+      Please submit issues and pull requests to:
+      https://github.com/kigster/warp-dir
 
-Thank you!
+      Thank you!
     EOF
     INSTALL_NOTICE = @install_notice
   end
 end
-

data/warp-dir.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib/', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $:.unshift lib unless $:.include?(lib)
 require 'warp/dir/version'
 
@@ -10,25 +11,24 @@ Gem::Specification.new do |s|
   s.email         = ['kig@reinvent.one']
   s.version       = Warp::Dir::VERSION
   s.summary       = %q{Warp-Dir (aka 'wd') replaces 'cd' and lets you instantly move between saved "warp points" and regular folders.}
-  s.description   = %q{Warp-Dir is compatible (and inspired by) the popular 'wd' tool available as a ZSH module. This one is written in ruby and so it should work in any shell. Credits for the original zsh-only tool go to (https://github.com/mfaerevaag/wd).}
+  s.description   = "Warp-Dir is compatible (and inspired by) the popular 'wd' tool available as a ZSH module. This one is written in ruby and so it should work in any shell. Credits for the original zsh-only tool go to (https://github.com/mfaerevaag/wd)."
   s.homepage      = 'https://github.com/kigster/warp-dir'
   s.files         = `git ls-files`.split($\).reject{ |f| f.match(%r{^(doc|spec)/}) }
 
-  s.executables   << 'warp-dir'
-  s.bindir        = 'exe'
+  s.executables << 'warp-dir'
+  s.bindir = 'exe'
 
   s.post_install_message = ::Warp::Dir::INSTALL_NOTICE
   s.require_paths = %w(lib)
 
-  s.required_ruby_version     = '>= 2.0.0'
+  s.required_ruby_version     = '>= 2.3.0'
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_dependency('slop', '~> 4.2')
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'codeclimate-test-reporter'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.6'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'codeclimate-test-reporter'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warp-dir
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Warp-Dir is compatible (and inspired by) the popular 'wd' tool available
   as a ZSH module. This one is written in ruby and so it should work in any shell.
   Credits for the original zsh-only tool go to (https://github.com/mfaerevaag/wd).
@@ -125,9 +111,11 @@ files:
 - ".idea/modules.xml"
 - ".idea/runConfigurations/All_Specs.xml"
 - ".idea/vcs.xml"
+- ".relaxed-rubocop-2.4.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Gemfile
 - Guardfile
 - LICENSE
 - README.md
@@ -167,14 +155,14 @@ licenses:
 metadata: {}
 post_install_message: "\n\e[33m\e[1m>>> PLEASE READ THIS! \e[0m\e[0m\n\nFor this gem
   to work, you must also install the coupled shell function\ninto your shell initialization
-  file. The following command should complete the\nsetup (but please change '~/.bash_login'
-  with whatever you use for shell\ninitialization, although for most situations ~/.bash_login
-  is good enough).\n\n\e[32m\e[1m  $ warp-dir install --dotfile ~/.bash_login\n\n\e[0m\e[0mRestart
+  file. The following command should complete the\nsetup (but please change '~/.bash_profile'
+  with whatever you use for shell\ninitialization, although for most situations ~/.bash_profile
+  is good enough).\n\n\e[32m\e[1m  $ warp-dir install --dotfile ~/.bash_profile\n\n\e[0m\e[0mRestart
   your shell, and you should now have 'wd' shell function that\nshould be used instead
   of the warp-dir executable.\n\nStart with:\n\n\e[34m\e[1m  $ wd help\n  $ wd <directory>
   \ # change directory – works just like \"cd\"\n  $ wd add <name>   # add current
-  directory as a warp point, call it <name>\n\e[0m\e[0m\nPlease submit issues to:\nhttps://github.com/kigster/warp-dir\n\nThank
-  you!\n"
+  directory as a warp point, call it <name>\n\e[0m\e[0m\nPlease submit issues and
+  pull requests to:\nhttps://github.com/kigster/warp-dir\n\nThank you!\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -182,15 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Warp-Dir (aka 'wd') replaces 'cd' and lets you instantly move between saved