warp-dir 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f7d0d955f09ea1659fe34174a10a36840d7ded
-  data.tar.gz: 7ae441238d30b5795d4f309530338f09fa8ec4e4
+  metadata.gz: 1838ae6bcfd69ebc8bd9043ea689d4eba60839c6
+  data.tar.gz: f44b27945e973dfa316130dcd30d4af126b0fab5
 SHA512:
-  metadata.gz: cc00a401aebc98c4135ef1a04456896d32baa3cb772d821b5674448cac040a43935a3b63db6428b64d2e2767600cd3fd454b8a94392b0e5ac1779723d67d086b
-  data.tar.gz: f7cd6f85fdec69f52301d802eb5186cadcf7f566bb5f3c537c2b73b425a255a54b50803679d6a2d0484300872b28ecf62c5d4f51eb129fce4c23813818eeb9cd
+  metadata.gz: aafa1b87d2684660a1deb1427bb739436243e062c63d1ed586965c1d72cf5ccff995de6237a5dc4deb0a712093af4a17993ce909fb44a1b459fc0b605b82f3de
+  data.tar.gz: 426c0b4b70fb781853803a727afd238e360dcd3fdd5fc31bcf59437d56e50fbe4814ae18176bcbaed95178602962611fbb96682765ac4dae29b220f9f3164e20

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in warp-dir.gemspec
+gemspec

data/Rakefile

@@ -1,27 +1,35 @@
-task :default => [:rspec ]
 task :install do
-  [
-    %q(chmod -R o+r .),
+
+  [ %q(chmod -R o+r .),
     %q(rm -f *.gem),
     %q(rm -rf build),
-    %q(gem uninstall -a --executables warp-dir 2> /dev/null; true),
+    %q(gem uninstall -quiet -a --executables warp-dir 2> /dev/null; true),
     %q(gem build warp-dir.gemspec)
   ].each do |command|
     sh command
   end
-  sh <<-EOF
-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
-else
-  gem install $gem_file --no-ri --no-rdoc
-fi
+
+  sh <<-EOF.gsub(%r{^\s+}m, '')
+    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
+    else
+      gem install $gem_file --no-ri --no-rdoc
+    fi
   EOF
-  exit 0
 end
 
 require 'bundler'
 require "bundler/gem_tasks"
 require 'rake/clean'
-require 'rspec/core/rake_task'
+
+CLEAN.include %w(pkg coverage *.gem)
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
+task :default => [:spec]

data/bin/warp-dir.bash

@@ -32,3 +32,15 @@ wd_not_found() {
     printf "    $ hash -r\n"
     printf "    $ warp-dir install [ --dotfile ~/.bashrc ]\n"
 }
+
+_wd() {
+    local WDWORDS cur
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur
+
+    WDWORDS=$(wd list --no-color  | awk '{ print $1 }')
+    COMPREPLY=( $( compgen -W "$WDWORDS" -- "$cur" ) )
+}
+
+complete -F _wd wd

data/lib/colored.rb

@@ -0,0 +1,96 @@
+unless Object.const_defined? :Colored
+  module Colored
+    extend self
+
+    COLORS = {
+      'black'   => 30,
+      'red'     => 31,
+      'green'   => 32,
+      'yellow'  => 33,
+      'blue'    => 34,
+      'magenta' => 35,
+      'cyan'    => 36,
+      'white'   => 37
+    }
+
+    EXTRAS = {
+      'clear'     => 0,
+      'bold'      => 1,
+      'underline' => 4,
+      'reversed'  => 7
+    }
+
+    COLORS.each do |color, value|
+      define_method(color) do
+        colorize(self, :foreground => color)
+      end
+
+      define_method("on_#{color}") do
+        colorize(self, :background => color)
+      end
+
+      COLORS.each do |highlight, value|
+        next if color == highlight
+        define_method("#{color}_on_#{highlight}") do
+          colorize(self, :foreground => color, :background => highlight)
+        end
+      end
+    end
+
+    EXTRAS.each do |extra, value|
+      next if extra == 'clear'
+      define_method(extra) do
+        colorize(self, :extra => extra)
+      end
+    end
+
+    define_method(:to_eol) do
+      tmp = sub(/^(\e\[[\[\e0-9;m]+m)/, "\\1\e[2K")
+      if tmp == self
+        return "\e[2K" << self
+      end
+      tmp
+    end
+
+    def colorize(string, options = {})
+      colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
+      colored << string
+      colored << extra(:clear)
+    end
+
+    def colors
+      @@colors ||= COLORS.keys.sort
+    end
+
+    def extra(extra_name)
+      return '' if String.colors_disabled
+      extra_name = extra_name.to_s
+      "\e[#{EXTRAS[extra_name]}m" if EXTRAS[extra_name]
+    end
+
+    def color(color_name)
+      return '' if String.colors_disabled
+      background = color_name.to_s =~ /on_/
+      color_name = color_name.to_s.sub('on_', '')
+      return unless color_name && COLORS[color_name]
+      "\e[#{COLORS[color_name] + (background ? 10 : 0)}m"
+    end
+  end
+end
+
+String.send(:include, Colored)
+
+class String
+  class << self
+    attr_accessor :colors_disabled
+
+    def enable_colors
+      self.colors_disabled = false
+    end
+    def disable_colors
+      self.colors_disabled = true
+    end
+  end
+end
+
+

data/lib/warp/dir/app/cli.rb

@@ -37,6 +37,8 @@ module Warp
           config.command = :help if (opts.help? || no_arguments)
           config.command = :warp if config.warp || config.command == 'warp'
 
+          String.disable_colors if config.no_color
+
           if config[:command]
             self.validated = true
           else
@@ -93,6 +95,7 @@ module Warp
           opts.string  '-m', '--command', '<command>      – command to run, ie. add, ls, list, rm, etc.'
           opts.string  '-p', '--point',   '<point-name>   – name of the warp point'
           opts.string  '-w', '--warp',    '<warp-point>   – warp to a given point'
+          opts.bool          '--no-color','               - do not use ASCII color'
           opts.bool    '-f', '--force',   '               - force, ie. overwrite existing point when adding'
           opts.bool    '-h', '--help',    '               – show help'
           opts.bool    '-v', '--verbose', '               – enable verbose mode'

data/lib/warp/dir/command/list.rb

@@ -3,6 +3,7 @@ require 'warp/dir/formatter'
 
 class Warp::Dir::Command::List < Warp::Dir::Command
   description %q(Print all stored warp points)
+  aliases :l
 
   def run(*args)
     formatted_list = ::Warp::Dir::Formatter.new(store).format_store

data/lib/warp/dir/command/ls.rb

@@ -5,7 +5,7 @@ module Warp
       class LS < Warp::Dir::Command
         description %q(List directory contents of a Warp Point)
         needs_a_point? true
-        aliases :dir
+        aliases :dir, :ll
 
         # @param [Object] args
         def run(opts, *flags)

data/lib/warp/dir/config.rb

@@ -8,7 +8,8 @@ module Warp
         warprc: ENV['HOME'] + '/.warprc',
         shell: false,
         force: false,
-        debug: false
+        debug: false,
+        no_color: false
       }
 
       attr_accessor :variables

data/lib/warp/dir/version.rb

@@ -1,7 +1,7 @@
-require 'colored'
+require_relative '../../colored'
 module Warp
   module Dir
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
 
     @install_notice = <<-EOF
 

data/warp-dir.gemspec

@@ -1,32 +1,32 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
 require 'warp/dir/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = 'warp-dir'
-  gem.license       = 'MIT'
-  gem.authors       = ['Konstantin Gredeskoul']
-  gem.email         = ['kig@reinvent.one']
-  gem.version       = Warp::Dir::VERSION
+Gem::Specification.new do |s|
+  s.name          = 'warp-dir'
+  s.license       = 'MIT'
+  s.authors       = ['Konstantin Gredeskoul']
+  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.homepage      = 'https://github.com/kigster/warp-dir'
+  s.files         = `git ls-files`.split($\).reject{ |f| f.match(%r{^(doc|spec)/}) }
 
-  gem.summary       = %q{Warp-Dir (aka 'wd') is a command line tool that lets you bookmark any folders, and then 'wd' between any two points on file system in one command.}
-  gem.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).}
-  gem.homepage      = "https://github.com/kigster/warp-dir"
+  s.executables   << 'warp-dir'
+  s.bindir        = 'exe'
 
-  gem.files         = `git ls-files`.split($\).reject{ |f| f =~ /^doc\/|Gemfile/ }
-  gem.executables   << 'warp-dir'
+  s.post_install_message = ::Warp::Dir::INSTALL_NOTICE
+  s.require_paths = %w(lib)
 
-  gem.post_install_message = ::Warp::Dir::INSTALL_NOTICE
+  s.required_ruby_version     = '>= 2.0.0'
+  s.required_rubygems_version = '>= 1.3.6'
 
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = %w(lib)
+  s.add_dependency('slop', '~> 4.2')
 
-  gem.add_dependency('slop', '~> 4.2')
-  gem.add_dependency('colored', '~> 1')
-
-  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'
-  gem.add_development_dependency 'bundler', '~> 1.11'
-  gem.add_development_dependency 'rake', '~> 10.0'
-  gem.add_development_dependency 'rspec', '~> 3.4'
+  s.add_development_dependency 'codeclimate-test-reporter', '~> 0.5'
+  s.add_development_dependency 'bundler', '~> 1.11'
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rspec', '~> 3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warp-dir
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +101,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Gemfile
 - Guardfile
 - LICENSE
 - README.md
@@ -122,8 +109,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bin/warp-dir
 - bin/warp-dir.bash
+- exe/warp-dir
+- lib/colored.rb
 - lib/warp.rb
 - lib/warp/dir.rb
 - lib/warp/dir/app/cli.rb
@@ -146,20 +134,6 @@ files:
 - lib/warp/dir/serializer/dotfile.rb
 - lib/warp/dir/store.rb
 - lib/warp/dir/version.rb
-- spec/fixtures/warprc
-- spec/spec_helper.rb
-- spec/support/cli_expectations.rb
-- spec/warp/dir/app/cli_spec.rb
-- spec/warp/dir/app/response_spec.rb
-- spec/warp/dir/command_spec.rb
-- spec/warp/dir/commands/add_spec.rb
-- spec/warp/dir/commands/install_spec.rb
-- spec/warp/dir/commands/list_spec.rb
-- spec/warp/dir/config_spec.rb
-- spec/warp/dir/errors_spec.rb
-- spec/warp/dir/formatter_spec.rb
-- spec/warp/dir/point_spec.rb
-- spec/warp/dir/store_spec.rb
 - warp-dir.gemspec
 homepage: https://github.com/kigster/warp-dir
 licenses:
@@ -182,31 +156,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Warp-Dir (aka 'wd') is a command line tool that lets you bookmark any folders,
-  and then 'wd' between any two points on file system in one command.
-test_files:
-- spec/fixtures/warprc
-- spec/spec_helper.rb
-- spec/support/cli_expectations.rb
-- spec/warp/dir/app/cli_spec.rb
-- spec/warp/dir/app/response_spec.rb
-- spec/warp/dir/command_spec.rb
-- spec/warp/dir/commands/add_spec.rb
-- spec/warp/dir/commands/install_spec.rb
-- spec/warp/dir/commands/list_spec.rb
-- spec/warp/dir/config_spec.rb
-- spec/warp/dir/errors_spec.rb
-- spec/warp/dir/formatter_spec.rb
-- spec/warp/dir/point_spec.rb
-- spec/warp/dir/store_spec.rb
+summary: Warp-Dir (aka 'wd') replaces 'cd' and lets you instantly move between saved
+  "warp points" and regular folders.
+test_files: []

data/spec/fixtures/warprc

@@ -1,2 +0,0 @@
-tmp:/tmp
-log:/var/log

data/spec/spec_helper.rb

@@ -1,73 +0,0 @@
-require 'codeclimate-test-reporter'
-require 'warp/dir'
-require 'rspec/core'
-
-CodeClimate::TestReporter.start
-
-module Warp
-  module Dir
-    module App
-      class Response
-        class << self
-          attr_accessor :exit_disabled
-
-          def enable_exit!
-            self.exit_disabled = false
-          end
-
-          def disable_exit!
-            self.exit_disabled = true
-          end
-
-          def exit_disabled?
-            self.exit_disabled
-          end
-        end
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before do
-    Warp::Dir::App::Response.disable_exit!
-    srand 117
-  end
-end
-
-RSpec.shared_context :fake_serializer do
-  let(:file) { @file ||= ::Tempfile.new('warp-dir') }
-  let(:config) { Warp::Dir::Config.new(warprc: file.path) }
-  let(:serializer) {
-    @initialized_store ||= FakeSerializer ||= Class.new(Warp::Dir::Serializer::Base) do
-      def persist!;
-      end
-
-      def restore!;
-      end
-    end
-  }
-
-  after do
-    file.close
-    file.unlink
-  end
-end
-
-RSpec.shared_context :fixture_file do
-  let(:fixture_file) { 'spec/fixtures/warprc'}
-  let(:warprc_args)  { " --config #{fixture_file}" }
-  let(:config_path) { '/tmp/warprc' }
-  let(:file) {
-    FileUtils.cp(fixture_file, config_path)
-    File.new(config_path)
-  }
-  let(:config) { Warp::Dir::Config.new(warprc: file.path) }
-end
-
-RSpec.shared_context :initialized_store do
-  let(:store) { Warp::Dir::Store.new(config) }
-  let(:wp_path) { ENV['HOME'] + '/workspace/tinker-mania' }
-  let(:wp_name) { 'harro' }
-  let(:point) { Warp::Dir::Point.new(wp_name, wp_path) }
-end