rush2 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 138ab89d7e5dde2b93dc3e71009015e705a3121d
-  data.tar.gz: f4d4b23bb5147ab16379cb9b4d70c38915e206d9
+  metadata.gz: 57b0055c6516f9185ac3b4b5d742cbdc46430e3d
+  data.tar.gz: d7d7ea8dec9c9bd665e1f7a6446b2300840e0f45
 SHA512:
-  metadata.gz: 44baa45dd729f5904cfc775ec161dd81f8627a31769f0a5004b3acc9f650c3747f6c14b8a86064e9e8a5d10a37ac3026618aebea416e4dc2866c7e5c2b0fa461
-  data.tar.gz: 92401d933b62410986da1ac56932a08fb8009c9524b8a493fbc10e7705a103af27833cc76b5e9067b684ad66ed1c1dc07a9cd16c81c5b915c4bed293472b5acf
+  metadata.gz: 6b63d0a3b8858907d0c2642f088801825eadff80075fd2fe1b24e776288af93e7ba67c0709b42a6bac7255a78157ef206d77a501925f322d130ebfb5e64baf79
+  data.tar.gz: a26460bb88e642c1fa0e447ab8f8548dd078fc17ddd49628f3a934708280edbe1ebfe5c7319b8a1bb5cb92a51b21219b9412e5d7adf122d8e23d4726436fcc7a

data/Gemfile.lock

@@ -9,19 +9,19 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.2.9.1)
-    github_api (0.12.3)
+    github_api (0.12.4)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      nokogiri (~> 1.6.6)
       oauth2
-    hashie (3.4.0)
-    highline (1.7.1)
+    hashie (3.4.2)
+    highline (1.7.8)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -31,13 +31,13 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    jwt (1.4.1)
+    jwt (1.5.1)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-ssh (2.9.2)
+    net-ssh (3.0.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
@@ -46,26 +46,26 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.4)
     rake (10.4.2)
     rdoc (4.2.0)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     session (3.2.0)
     slop (3.6.0)
     thread_safe (0.3.5)

data/README.rdoc

@@ -2,7 +2,7 @@
 
 rush is a unix integration library and an interactive shell which uses pure Ruby syntax.  Walk directory trees; create, copy, search, and destroy files; find and kill processes - everything you'd normally do with shell commands, now in the strict and elegant world of Ruby.
 
-{<img src="https://travis-ci.org/s-mage/rush.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/s-mage/rush]
+{<img src="https://drone.io/github.com/s-mage/rush/status.png" alt="Build Status" />}[https://drone.io/github.com/s-mage/rush]
 
 
 == Install

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/lib/rush.rb

@@ -74,6 +74,7 @@ require_relative 'rush/exceptions'
 require_relative 'rush/config'
 require_relative 'rush/commands'
 require_relative 'rush/access'
+require_relative 'rush/path'
 require_relative 'rush/entry'
 require_relative 'rush/file'
 require_relative 'rush/dir'

data/lib/rush/box.rb

@@ -121,4 +121,10 @@ class Rush::Box
   def ==(other)          # :nodoc:
     host == other.host
   end
+
+  # Print last backtrace
+  def wtf
+    t = $last_backtrace
+    t.lines.count > 5 ? t.less : puts(t)
+  end
 end

data/lib/rush/commands.rb

@@ -1,5 +1,6 @@
 # The commands module contains operations against Rush::File entries, and is
-# mixed in to Rush::Entry and Array.  This means you can run these commands against a single
+# mixed in to Rush::Entry and Array.
+# This means you can run these commands against a single
 # file, a dir full of files, or an arbitrary list of files.
 #
 # Examples:
@@ -7,11 +8,12 @@
 #   box['/etc/hosts'].search /localhost/       # single file
 #   box['/etc/'].search /localhost/            # entire directory
 #   box['/etc/**/*.conf'].search /localhost/   # arbitrary list
+#
 module Rush::Commands
   # The entries command must return an array of Rush::Entry items.  This
   # varies by class that it is mixed in to.
   def entries
-    raise "must define me in class mixed in to for command use"
+    fail 'must define me in class mixed in to for command use'
   end
 
   # Search file contents for a regular expression.  A Rush::SearchResults
@@ -45,21 +47,6 @@ module Rush::Commands
     open_with ENV['EDITOR'], *args
   end
 
-  # Invoke vi on one or more files - only works locally.
-  def vi(*args)
-    if self.class == Rush::Dir
-      system "cd #{full_path}; vim"
-    else
-      open_with('vim', *args)
-    end
-  end
-  alias_method :vim, :vi
-
-  # Invoke TextMate on one or more files - only works locally.
-  def mate(*args)
-    open_with('mate', *args)
-  end
-
   # Open file with xdg-open.
   # Usage:
   #   home.locate('mai_failz').open
@@ -71,24 +58,36 @@ module Rush::Commands
   # Usage:
   #   home.locate('timetable').open_with :vim
   #   home['.vimrc'].vim { other: '+55', x: true, u: 'other_vimrc', cmd: 'ls' }
-  def open_with(app, *args, **opts)
-    system open_command(app, *args, opts)
+  #   home['my_app'].rails :c, env: { rails_env: 'test' } # environment vars
+  def open_with(app, *args)
+    system(*open_command(app, *args))
   end
 
-  def output_of(app, *args, **opts)
-    `#{open_command(app, *args, opts)}`
+  def output_of(app, *args)
+    `#{open_command(app, *args)}`
   end
 
-  def open_command(app, *args, **opts)
-    names = dir? ? '' : entries.map(&:to_s).join(' ')
-    options = opts.map do |k, v|
-      key = k.size == 1 ? "-#{k}" : "--#{k}"
-      case
-      when v == true then key
-      when k == 'other' || k == :other then v
-      else "#{key} #{v}"
-      end
-    end.join(' ')
-    "cd #{dirname}; #{app.to_s} #{names} #{options} #{args.join(' ')}"
+  def opt_to_s(k, v)
+    key = k.size == 1 ? "-#{k}" : "--#{k}"
+    case
+    when v == true then key
+    when k == 'other' || k == :other then v
+    else "#{key} #{v}"
+    end
+  end
+
+  def open_command(app, *args)
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    names = dir? ? '' : entries.map { |x| Rush.quote x.to_s }.join(' ')
+    options = opts
+      .reject { |k, _| k == :env }
+      .map    { |k, v| opt_to_s(k, v) }
+      .join(' ')
+    dir = Rush.quote dirname.to_s
+    cmd = "cd #{dir}; #{app} #{names} #{options} #{args.join(' ')}"
+    if vars = opts[:env]
+      env = vars.inject({}) { |r, (k, v)| r.merge(k.to_s.upcase => v.to_s) }
+    end
+    vars ? [env, cmd] : cmd
   end
 end

data/lib/rush/config.rb

@@ -6,7 +6,7 @@ class Rush::Config
 
   # By default, reads from the dir ~/.rush, but an optional parameter allows
   # using another location.
-  def initialize(location=nil)
+  def initialize(location = nil)
     @dir = Rush::Dir.new(location || "#{ENV['HOME']}/.rush")
     @dir.create
   end
@@ -67,7 +67,7 @@ class Rush::Config
 
   def passwords
     passwords_file.lines_or_empty.inject({}) do |result, line|
-      user, password = line.split(":", 2)
+      user, password = line.split(':', 2)
       result.merge user => password
     end
   end
@@ -80,7 +80,7 @@ class Rush::Config
   end
 
   def credentials
-    credentials_file.lines.first.split(":", 2)
+    credentials_file.lines.first.split(':', 2)
   end
 
   def save_credentials(user, password)
@@ -96,7 +96,7 @@ class Rush::Config
   end
 
   def ensure_credentials_exist
-    generate_credentials if credentials_file.contents_or_blank == ""
+    generate_credentials if credentials_file.contents_or_blank == ''
   end
 
   def generate_credentials
@@ -118,7 +118,7 @@ class Rush::Config
   end
 
   def secret_characters
-    [ ('a'..'z'), ('1'..'9') ].inject([]) do |chars, range|
+    [('a'..'z'), ('1'..'9')].inject([]) do |chars, range|
       chars += range.to_a
     end
   end
@@ -138,7 +138,7 @@ class Rush::Config
   end
 
   def save_tunnels(hash)
-    string = ""
+    string = ''
     hash.each do |host, port|
       string += "#{host}:#{port}\n"
     end

data/lib/rush/dir.rb

@@ -23,7 +23,7 @@ class Rush::Dir < Rush::Entry
 
 	# Entries contained within this dir - not recursive.
 	def contents
-		find_by_glob('*')
+		find_by_glob('*') + find_by_glob('.[!.]*')
 	end
 
 	# Files contained in this dir only.
@@ -49,7 +49,7 @@ class Rush::Dir < Rush::Entry
 	alias_method :/, :[]
 
   def locate(path)
-    located = bash("locate #{path}").split("\n").
+    located = bash("locate -i #{path}").split("\n").
       map { |x| x.dir? ? Rush::Dir.new(x) : Rush::File.new(x) }
     located.size == 1 ? located.first : located
   end
@@ -137,16 +137,9 @@ class Rush::Dir < Rush::Entry
 	end
 
 	# Text output of dir listing, equivalent to the regular unix shell's ls command.
-	def ls
-		out = [ "#{self}" ]
-		nonhidden_dirs.each do |dir|
-			out << "  #{dir.name}/"
-		end
-		nonhidden_files.each do |file|
-			out << "  #{file.name}"
-		end
-		out.join("\n")
-	end
+  def ls(*args)
+    output_of 'ls', *args
+  end
 
 	# Run rake within this dir.
 	def rake(*args)

data/lib/rush/entry.rb

@@ -22,9 +22,7 @@ class Rush::Entry
   end
 
   def executables
-    ENV['PATH'].split(':')
-      .map { |x| Rush::Dir.new(x).entries.map(&:name) }
-      .flatten
+    Rush::Path.executables
   end
 
   # The factory checks to see if the full path has a trailing slash for
@@ -41,7 +39,7 @@ class Rush::Entry
 
   def to_s      # :nodoc:
     if box.host == 'localhost'
-      "#{full_path}"
+      full_path
     else
       inspect
     end
@@ -61,7 +59,7 @@ class Rush::Entry
   end
 
   def full_path
-    "#{@path}/#{@name}"
+    "#{path}/#{name}"
   end
 
   def quoted_path

data/lib/rush/local.rb

@@ -142,7 +142,11 @@ class Rush::Connection::Local
   # Fetch the size of a dir, since a standard file stat does not include the
   # size of the contents.
   def size(full_path)
-    `du -sb #{Rush.quote(full_path)}`.match(/(\d+)/)[1].to_i
+    if RUBY_PLATFORM.match(/darwin/)
+      `find #{Rush.quote(full_path)} -print0 | xargs -0 stat -f%z`.split(/\n/).map(&:to_i).reduce(:+)
+    else
+      `du -sb #{Rush.quote(full_path)}`.match(/(\d+)/)[1].to_i
+    end
   end
 
   # Get the list of processes as an array of hashes.
@@ -153,7 +157,7 @@ class Rush::Connection::Local
       windows_processes
     else
       os_x_processes
-    end
+    end.uniq
   end
 
   # Process list on Linux using /proc.

data/lib/rush/path.rb

@@ -0,0 +1,9 @@
+# A tiny wrapper around ENV['PATH']
+class Rush::Path
+  def self.executables
+    ENV['PATH'].split(':')
+      .select { |f| ::File.directory?(f) }
+      .map { |x| Rush::Dir.new(x).entries.map(&:name) }
+      .flatten
+  end
+end

data/lib/rush/shell.rb

@@ -25,6 +25,7 @@ module Rush
       load_custom_commands
       set_readline
       @multiline_cmd = '' # Multiline commands should be stored somewhere
+      $last_backtrace = '' # Backtrace should too.
     end
 
     def set_readline
@@ -75,7 +76,9 @@ module Rush
       @multiline_cmd = ''
     rescue ::Exception => e
       puts "Exception #{e.class} -> #{e.message}"
-      e.backtrace.each { |t| puts "\t#{::File.expand_path(t)}" }
+      $last_backtrace = e.backtrace
+        .map { |t| "\t#{::File.expand_path(t)}" }
+        .join("\n")
       @multiline_cmd = ''
     end
 

data/lib/rush/shell/completion.rb

@@ -50,13 +50,13 @@ module Rush
         method: :complete_method
       },
       path: {
-        regexp: /^(\w|_|.|:)+[\[\/][\'\"].+$/,
+        regexp: /^(\w|_|.|:| )+[\[\/][\'\"].*$/,
         method: :complete_path
       }
     }
 
     def complete_constant(input)
-      Object.constants.map(&:to_s).select { |x| x.start_with? input }
+      Object.constants.map(&:to_s).select { |x| x.start_with? input }.sort
     end
 
     def complete_object_constant(input)
@@ -64,7 +64,7 @@ module Rush
       eval(receiver, pure_binding).constants
         .map(&:to_s)
         .select { |x| x.start_with? const_part }
-        .map { |x| receiver + delimiter + x }
+        .map    { |x| receiver + delimiter + x }
     end
 
     def complete_global_method(input)
@@ -89,9 +89,7 @@ module Rush
     end
 
     def executables
-      ENV['PATH'].split(':')
-        .map { |x| Rush::Dir.new(x).entries.map(&:name) }
-        .flatten
+      Rush::Path.executables
     end
 
     def complete_path(input)

data/lib/rush/string_ext.rb

@@ -13,4 +13,21 @@ class String
   def locate
     Rush::Dir.new(ENV['HOME']).locate self
   end
+
+  def open_with(meth, *args, &block)
+    if executables.include? meth.to_s
+      system [meth.to_s, *args, self].join(' ')
+    else
+      raise 'No such executable. Maybe something wrong with PATH?'
+    end
+  end
+  alias_method :e, :open_with
+
+  def |(meth, *args, &block)
+    Open3.capture2(meth, stdin_data: self).first
+  end
+
+  def executables
+    Rush::Path.executables
+  end
 end

data/spec/dir_spec.rb

@@ -130,12 +130,12 @@ describe Rush::Dir do
 		expect(@dir.nonhidden_dirs).to eq @dir.make_entries(%(show/))
 	end
 
-	if !RUBY_PLATFORM.match(/darwin/)   # doesn't work on OS X 'cause du switches are different
-		it "knows its size in bytes, which includes its contents recursively" do
-			@dir.create_file('a').write('1234')
-			expect(@dir.size).to eq(4096 + 4)
-		end
-	end
+  it "knows its size in bytes, which includes its contents recursively" do
+    @dir.create_file('a').write('1234')
+    # on OSX fs stat's size is 102, even though blksize=4096
+    # on Linux size is 4096
+    expect(@dir.size).to eq(::File.stat(@dir.path).size + 4)
+  end
 
 	it "can destroy itself when empty" do
 		@dir.destroy

data/spec/local_spec.rb

@@ -260,11 +260,9 @@ describe Rush::Connection::Local do
     @con.set_access('/some/path', access)
   end
 
-  unless RUBY_PLATFORM.match(/darwin/)   # doesn't work on OS X 'cause du switches are different
-    it "size gives size of a directory and all its contents recursively" do
-      system "mkdir -p #{@sandbox_dir}/a/b/; echo 1234 > #{@sandbox_dir}/a/b/c"
-      expect(@con.size(@sandbox_dir)).to eq (4096*3 + 5)
-    end
+  it "size gives size of a directory and all its contents recursively" do
+    system "mkdir -p #{@sandbox_dir}/a/b/; echo 1234 > #{@sandbox_dir}/a/b/c"
+    expect(@con.size(@sandbox_dir)).to eq (::File.stat(@sandbox_dir).size*3 + 5)
   end
 
   it "parses ps output on os x" do

data/spec/path_spec.rb

@@ -0,0 +1,13 @@
+require_relative 'base'
+require_relative '../lib/rush/path'
+
+describe Rush::Path do
+  it 'works' do
+    expect(Rush::Path.executables).to be_kind_of Array
+  end
+
+  it "doesn't fail with non-existent directories in PATH" do
+    expect(ENV).to receive(:[]).with("PATH").and_return("/foobar")
+    expect(Rush::Path.executables).to eq []
+  end
+end

data/spec/process_spec.rb

@@ -1,22 +1,36 @@
 require_relative 'base'
 
 describe Rush::Process do
+  let!(:pid_file) { "/tmp/rush_rspec_#{Process.pid}" }
+
   before do
-    @pid = fork do
+    @parent_pid = fork do
+      # OSX includes checking `ps` process into current Process#children
+      # as such isolate parent from the main thread
+      # but the instance_valriabes are unavailable since #fork - use fs
+      @pid = fork do
+        sleep 999
+      end
+      ::File.write(pid_file, @pid)
       sleep 999
     end
+
+    # wait parent to tell child's pid
+    sleep 0.3
+
+    @pid = ::File.read(pid_file).to_i
     @process = Rush::Process.all.detect { |p| p.pid == @pid }
   end
 
   after do
+    ::File.unlink(pid_file) if ::File.exists?(pid_file)
     system "kill -9 #{@pid}"
+    system "kill -9 #{@parent_pid}"
   end
 
-  unless RUBY_PLATFORM.match(/darwin/)   # OS x reports pids weird
-    it 'knows all its child processes' do
-      parent = Rush::Process.all.detect { |p| p.pid == Process.pid }
-      expect(parent.children).to eq [@process]
-    end
+  it 'knows all its child processes' do
+    parent = Rush::Process.all.detect { |p| p.pid == @parent_pid }
+    expect(parent.children).to eq [@process]
   end
 
   it 'gets the list of all processes' do
@@ -50,12 +64,12 @@ describe Rush::Process do
   end
 
   it 'knows the parent process pid' do
-    expect(@process.parent_pid).to eq Process.pid
+    expect(@process.parent_pid).to eq @parent_pid
   end
 
   it 'knows the parent process' do
     this = Rush::Box.new.processes
-      .select { |p| p.pid == Process.pid }
+      .select { |p| p.pid == @parent_pid }
       .first
     expect(@process.parent).to eq this
   end

data/spec/shell_spec.rb

@@ -21,8 +21,9 @@ describe Rush::Shell do
  end
 
  it 'Complete method names' do
+   # rbx has additional Rush.method_table, Rush.method_table=
    expect(@shell.complete('Rush.meth')).
-     to eq(["Rush.method_part", "Rush.method_defined?", "Rush.methods", "Rush.method"])
+     to include("Rush.method_part", "Rush.method_defined?", "Rush.methods", "Rush.method")
    expect(@shell.complete('Rush.methods.inc')).to include "Rush.methods.include?"
  end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush2
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Sergey Smagin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: session
@@ -154,6 +154,7 @@ files:
 - lib/rush/fixnum_ext.rb
 - lib/rush/head_tail.rb
 - lib/rush/local.rb
+- lib/rush/path.rb
 - lib/rush/process.rb
 - lib/rush/process_set.rb
 - lib/rush/search_results.rb
@@ -173,6 +174,7 @@ files:
 - spec/find_by_spec.rb
 - spec/fixnum_ext_spec.rb
 - spec/local_spec.rb
+- spec/path_spec.rb
 - spec/process_set_spec.rb
 - spec/process_spec.rb
 - spec/rush_spec.rb
@@ -200,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: A Ruby replacement for bash+ssh.