rush2 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d815972048191a0c59d9ecfaae0ebf92e3ac2b5
-  data.tar.gz: 30347cadc8689b0f70b971b8f53a6f5d8b00b513
+  metadata.gz: 138ab89d7e5dde2b93dc3e71009015e705a3121d
+  data.tar.gz: f4d4b23bb5147ab16379cb9b4d70c38915e206d9
 SHA512:
-  metadata.gz: bc607021caa707ee9f336d4ee96dcd4947366291002e09bbb96f39cbeabea311116664e2e4d66588d9d3f67204fe73435a1f385f0fa5e0affe5fb1dd78b25e41
-  data.tar.gz: beb3f44862dff6723a2320755696e9c0988e427550b0d13ff6a0e075b828b0b426a80683cdf7cab50a03e7b8e829489a22462696afc05d5c4f7fb5bad2c30dd7
+  metadata.gz: 44baa45dd729f5904cfc775ec161dd81f8627a31769f0a5004b3acc9f650c3747f6c14b8a86064e9e8a5d10a37ac3026618aebea416e4dc2866c7e5c2b0fa461
+  data.tar.gz: 92401d933b62410986da1ac56932a08fb8009c9524b8a493fbc10e7705a103af27833cc76b5e9067b684ad66ed1c1dc07a9cd16c81c5b915c4bed293472b5acf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     builder (3.2.2)
     coderay (1.1.0)
     coolline (0.5.0)
@@ -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.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    git (1.2.8)
-    github_api (0.12.1)
+    git (1.2.9.1)
+    github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.3.1)
-    highline (1.6.21)
+    hashie (3.4.0)
+    highline (1.7.1)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -31,16 +31,15 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
+    jwt (1.4.1)
     method_source (0.8.2)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-ssh (2.9.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -51,25 +50,25 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.2)
-      json (~> 1.4)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rack (1.6.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     session (3.2.0)
     slop (3.6.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     unicode_utils (1.4.0)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/lib/rush.rb

@@ -86,6 +86,5 @@ require_relative 'rush/array_ext'
 require_relative 'rush/process'
 require_relative 'rush/process_set'
 require_relative 'rush/local'
-require_relative 'rush/remote'
 require_relative 'rush/box'
 require_relative 'rush/embeddable_shell'

data/lib/rush/commands.rb

@@ -39,6 +39,12 @@ module Rush::Commands
     end
   end
 
+  # Open file with $EDITOR.
+  #
+  def edit(*args)
+    open_with ENV['EDITOR'], *args
+  end
+
   # Invoke vi on one or more files - only works locally.
   def vi(*args)
     if self.class == Rush::Dir
@@ -64,13 +70,25 @@ module Rush::Commands
   # Open file with any application you like.
   # Usage:
   #   home.locate('timetable').open_with :vim
-  def open_with(app, *args)
-    names = dir? ? '' : entries.map(&:to_s).join(' ')
-    system "cd #{dirname}; #{app.to_s} #{names} #{args.join(' ')}"
+  #   home['.vimrc'].vim { other: '+55', x: true, u: 'other_vimrc', cmd: 'ls' }
+  def open_with(app, *args, **opts)
+    system open_command(app, *args, opts)
   end
 
-  def output_of(app, *args)
-    names = entries.map(&:to_s).join(' ')
-    `cd #{dirname}; #{app.to_s} #{names} #{args.join(' ')}`
+  def output_of(app, *args, **opts)
+    `#{open_command(app, *args, opts)}`
+  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(' ')}"
   end
 end

data/lib/rush/shell.rb

@@ -19,6 +19,15 @@ module Rush
       pwd = Rush::Dir.new(ENV['PWD']) if ENV['PWD']
 
       @config = Rush::Config.new
+      @box = Rush::Box.new
+      @pure_binding = @box.instance_eval 'binding'
+      $last_res = nil
+      load_custom_commands
+      set_readline
+      @multiline_cmd = '' # Multiline commands should be stored somewhere
+    end
+
+    def set_readline
       @history = Coolline::History.new config.history_file.full_path
       Coolline::Settings[:word_boundaries] = [' ', "\t"]
       Coolline::Settings[:completion_word_boundaries] = [' ', "\t"]
@@ -26,19 +35,26 @@ module Rush
         c.transform_proc  = proc { syntax_highlight c.line }
         c.completion_proc = proc { complete c.completed_word }
       end
+    end
 
-      @box = Rush::Box.new
-      @pure_binding = @box.instance_eval 'binding'
-      $last_res = nil
-
+    def load_custom_commands
       eval config.load_env, @pure_binding
       commands = config.load_commands
       Rush::Dir.class_eval commands
       Rush::File.class_eval commands
       Array.class_eval     commands
+    end
 
-      # Multiline commands should be stored somewhere
-      @multiline_cmd = ''
+    # Run the interactive shell using coolline.
+    def run
+      loop do
+        prompt = self.class.prompt || "#{`whoami`.chomp} $ "
+        cmd = @readline.readline prompt
+        finish if cmd.nil? || cmd == 'exit'
+        next   if cmd.empty?
+        @history << cmd
+        execute cmd
+      end
     end
 
     # Run a single command.
@@ -63,18 +79,6 @@ module Rush
       @multiline_cmd = ''
     end
 
-    # Run the interactive shell using coolline.
-    def run
-      loop do
-        prompt = self.class.prompt || "#{`whoami`.chomp} $ "
-        cmd = @readline.readline prompt
-        finish if cmd.nil? || cmd == 'exit'
-        next   if cmd.empty?
-        @history << cmd
-        execute cmd
-      end
-    end
-
     # Tune the prompt with
     #   Rush::Shell.prompt = 'hey there! > '
     class << self

data/spec/access_spec.rb

@@ -14,55 +14,55 @@ describe Rush::Access do
 	end
 
 	it "gets parts from a one-part symbol like :user" do
-		@access.parts_from(:user).should == %w(user)
+		expect(@access.parts_from(:user)).to eq(%w(user))
 	end
 
 	it "gets parts from a two-part symbol like :read_write" do
-		@access.parts_from(:read_write).should == %w(read write)
+		expect(@access.parts_from(:read_write)).to eq(%w(read write))
 	end
 
 	it "allows use of 'and' in multipart symbols, like :user_and_group" do
-		@access.parts_from(:user_and_group).should == %w(user group)
+		expect(@access.parts_from(:user_and_group)).to eq( %w(user group))
 	end
 
 	it "extract_list verifies that all the parts among the valid choices" do
-		@access.should_receive(:parts_from).with(:red_green).and_return(%w(red green))
-		@access.extract_list('type', :red_green, %w(red blue green)).should == %w(red green)
+		expect(@access).to receive(:parts_from).with(:red_green).and_return(%w(red green))
+		expect(@access.extract_list('type', :red_green, %w(red blue green))).to eq(%w(red green))
 	end
 
 	it "extract_list raises a BadAccessSpecifier when there is part not in the list of choices" do
-		lambda do
+		expect do
 			@access.extract_list('role', :user_bork, %w(user group))
-		end.should raise_error(Rush::BadAccessSpecifier, "Unrecognized role: bork")
+		end.to raise_error(Rush::BadAccessSpecifier, "Unrecognized role: bork")
 	end
 
 	it "sets one value in the matrix of permissions and roles" do
 		@access.set_matrix(%w(read), %w(user))
-		@access.user_can_read.should == true
+		expect(@access.user_can_read).to eq(true)
 	end
 
 	it "sets two values in the matrix of permissions and roles" do
 		@access.set_matrix(%w(read), %w(user group))
-		@access.user_can_read.should == true
-		@access.group_can_read.should == true
+		expect(@access.user_can_read).to eq(true)
+		expect(@access.group_can_read).to eq(true)
 	end
 
 	it "sets four values in the matrix of permissions and roles" do
 		@access.set_matrix(%w(read write), %w(user group))
-		@access.user_can_read.should == true
-		@access.group_can_read.should == true
-		@access.user_can_write.should == true
-		@access.group_can_write.should == true
+		expect(@access.user_can_read).to eq(true)
+		expect(@access.group_can_read).to eq(true)
+		expect(@access.user_can_write).to eq(true)
+		expect(@access.group_can_write).to eq(true)
 	end
 
 	it "parse options hash" do
 		@access.parse(:user_can => :read)
-		@access.user_can_read.should == true
+		expect(@access.user_can_read).to eq(true)
 	end
 
 	it "generates octal permissions from its member vars" do
 		@access.user_can_read = true
-		@access.octal_permissions.should == 0400
+		expect(@access.octal_permissions).to eq(0400)
 	end
 
 	it "generates octal permissions from its member vars" do
@@ -71,7 +71,7 @@ describe Rush::Access do
 		@access.user_can_execute = true
 		@access.group_can_read = true
 		@access.group_can_execute = true
-		@access.octal_permissions.should == 0750
+		expect(@access.octal_permissions).to eq(0750)
 	end
 
 	it "applies its settings to a file" do
@@ -80,7 +80,7 @@ describe Rush::Access do
 			system "rm -rf #{file}; touch #{file}; chmod 770 #{file}"
 			@access.user_can_read = true
 			@access.apply(file)
-			`ls -l #{file}`.should match(/^-r--------/)
+			expect(`ls -l #{file}`).to match(/^-r--------/)
 		ensure
 			system "rm -rf #{file}; touch #{file}"
 		end
@@ -88,47 +88,47 @@ describe Rush::Access do
 
 	it "serializes itself to a hash" do
 		@access.user_can_read = true
-		@access.to_hash.should == {
+		expect(@access.to_hash).to eq({
 			:user_can_read => 1, :user_can_write => 0, :user_can_execute => 0,
 			:group_can_read => 0, :group_can_write => 0, :group_can_execute => 0,
 			:other_can_read => 0, :other_can_write => 0, :other_can_execute => 0,
-		}
+		})
 	end
 
 	it "unserializes from a hash" do
 		@access.from_hash(:user_can_read => '1')
-		@access.user_can_read.should == true
+		expect(@access.user_can_read).to eq(true)
 	end
 
 	it "initializes from a serialized hash" do
-		@access.class.should_receive(:new).and_return(@access)
-		@access.class.from_hash(:user_can_read => '1').should == @access
-		@access.user_can_read.should == true
+		expect(@access.class).to receive(:new).and_return(@access)
+		expect(@access.class.from_hash(:user_can_read => '1')).to eq(@access)
+		expect(@access.user_can_read).to eq(true)
 	end
 
 	it "initializes from a parsed options hash" do
-		@access.class.should_receive(:new).and_return(@access)
-		@access.class.parse(:user_and_group_can => :read).should == @access
-		@access.user_can_read.should == true
+		expect(@access.class).to receive(:new).and_return(@access)
+		expect(@access.class.parse(:user_and_group_can => :read)).to eq(@access)
+		expect(@access.user_can_read).to eq(true)
 	end
 
 	it "converts and octal integer into an array of integers" do
-		@access.octal_integer_array(0740).should == [ 7, 4, 0 ]
+		expect(@access.octal_integer_array(0740)).to eq([ 7, 4, 0 ])
 	end
 
 	it "filters out anything above the top three digits (File.stat returns some extra data there)" do
-		@access.octal_integer_array(0100644).should == [ 6, 4, 4 ]
+		expect(@access.octal_integer_array(0100644)).to eq([ 6, 4, 4 ])
 	end
 
 	it "taskes permissions from an octal representation" do
 		@access.from_octal(0644)
-		@access.user_can_read.should == true
-		@access.user_can_write.should == true
-		@access.user_can_execute.should == false
+		expect(@access.user_can_read).to eq(true)
+		expect(@access.user_can_write).to eq(true)
+		expect(@access.user_can_execute).to eq(false)
 	end
 
 	it "computes a display hash by dropping false keys and converting the 1s to trues" do
-		@access.should_receive(:to_hash).and_return(:red => 1, :green => 0, :blue => 1)
-		@access.display_hash.should == { :red => true, :blue => true }
+		expect(@access).to receive(:to_hash).and_return(:red => 1, :green => 0, :blue => 1)
+		expect(@access.display_hash).to eq({ :red => true, :blue => true })
 	end
 end

data/spec/array_ext_spec.rb

@@ -1,15 +1,15 @@
 require_relative 'base'
 
 describe Array do
-	it "mixes commands into array" do
-		[ 1,2,3 ].entries.should == [ 1, 2, 3 ]
-	end
+  it 'mixes commands into array' do
+    expect([1, 2, 3].entries).to eq([1, 2, 3])
+  end
 
-	it "can call head" do
-		[ 1,2,3 ].head(1).should == [ 1 ]
-	end
+  it 'can call head' do
+    expect([1, 2, 3].head(1)).to eq([1])
+  end
 
-	it "can call tail" do
-		[ 1,2,3 ].tail(1).should == [ 3 ]
-	end
+  it 'can call tail' do
+    expect([1, 2, 3].tail(1)).to eq([3])
+  end
 end

data/spec/box_spec.rb

@@ -1,76 +1,76 @@
 require_relative 'base'
 
 describe Rush::Box do
-	before do
-		@sandbox_dir = "/tmp/rush_spec.#{Process.pid}"
-		system "rm -rf #{@sandbox_dir}; mkdir -p #{@sandbox_dir}"
-
-		@box = Rush::Box.new('localhost')
-	end
-
-	after do
-		system "rm -rf #{@sandbox_dir}"
-	end
-
-	it "looks up entries with [] syntax" do
-		@box['/'].should == Rush::Dir.new('/', @box)
-	end
-
-	it "looks up processes" do
-		@box.connection.should_receive(:processes).and_return([ { :pid => 123 } ])
-		@box.processes.should == [ Rush::Process.new({ :pid => 123 }, @box) ]
-	end
-
-	it "executes bash commands" do
-		@box.connection.should_receive(:bash).with('cmd', nil, false, false).and_return('output')
-		@box.bash('cmd').should == 'output'
-	end
-
-	it "executes bash commands with an optional user" do
-		@box.connection.should_receive(:bash).with('cmd', 'user', false, false)
-		@box.bash('cmd', :user => 'user')
-	end
-
-	it "executes bash commands in the background, returning a Rush::Process" do
-		@box.connection.should_receive(:bash).with('cmd', nil, true, false).and_return(123)
-		@box.stub(:processes).and_return([ double('ps', :pid => 123) ])
-		@box.bash('cmd', :background => true).pid.should == 123
-	end
-
-	it "builds a script of environment variables to prefix the bash command" do
-		@box.command_with_environment('cmd', { :a => 'b' }).should == "export a=\"b\"\ncmd"
-	end
-
-	it "escapes quotes on environment variables" do
-		@box.command_with_environment('cmd', { :a => 'a"b' }).should == "export a=\"a\\\"b\"\ncmd"
-	end
-
-	it "escapes backticks on environment variables" do
-		@box.command_with_environment('cmd', { :a => 'a`b' }).should == "export a=\"a\\\`b\"\ncmd"
-	end
-
-	it "converts environment variables to_s" do
-		@box.command_with_environment('cmd', { :a => nil, :b => 123 }).should == "export a=\"\"\nexport b=\"123\"\ncmd"
-	end
-
-	it "sets the environment variables from the provided hash" do
-		@box.connection.stub(:bash)
-		@box.should_receive(:command_with_environment).with('cmd', { 1 => 2 })
-		@box.bash('cmd', :env => { 1 => 2 })
-	end
-
-	it "checks the connection to determine if it is alive" do
-		@box.connection.should_receive(:alive?).and_return(true)
-		@box.should be_alive
-	end
-
-	it "establish_connection to set up the connection manually" do
-		@box.connection.should_receive(:ensure_tunnel)
-		@box.establish_connection
-	end
-
-	it "establish_connection can take a hash of options" do
-		@box.connection.should_receive(:ensure_tunnel).with(:timeout => :infinite)
-		@box.establish_connection(:timeout => :infinite)
-	end
+  before do
+    @sandbox_dir = "/tmp/rush_spec.#{Process.pid}"
+    system "rm -rf #{@sandbox_dir}; mkdir -p #{@sandbox_dir}"
+
+    @box = Rush::Box.new('localhost')
+  end
+
+  after do
+    system "rm -rf #{@sandbox_dir}"
+  end
+
+  it "looks up entries with [] syntax" do
+    expect(@box['/']).to eq Rush::Dir.new('/', @box)
+  end
+
+  it "looks up processes" do
+    expect(@box.connection).to receive(:processes).and_return([{ :pid => 123 }])
+    expect(@box.processes).to eq [Rush::Process.new({ :pid => 123 }, @box)]
+  end
+
+  it "executes bash commands" do
+    expect(@box.connection).to receive(:bash).with('cmd', nil, false, false).and_return('output')
+    expect(@box.bash('cmd')).to eq 'output'
+  end
+
+  it "executes bash commands with an optional user" do
+    expect(@box.connection).to receive(:bash).with('cmd', 'user', false, false)
+    @box.bash('cmd', :user => 'user')
+  end
+
+  it "executes bash commands in the background, returning a Rush::Process" do
+    expect(@box.connection).to receive(:bash).with('cmd', nil, true, false).and_return(123)
+    allow(@box).to receive(:processes).and_return([double('ps', :pid => 123)])
+    expect(@box.bash('cmd', :background => true).pid).to eq 123
+  end
+
+  it "builds a script of environment variables to prefix the bash command" do
+    expect(@box.command_with_environment('cmd', { :a => 'b' })).to eq "export a=\"b\"\ncmd"
+  end
+
+  it "escapes quotes on environment variables" do
+    expect(@box.command_with_environment('cmd', { :a => 'a"b' })).to eq "export a=\"a\\\"b\"\ncmd"
+  end
+
+  it "escapes backticks on environment variables" do
+    expect(@box.command_with_environment('cmd', { :a => 'a`b' })).to eq "export a=\"a\\\`b\"\ncmd"
+  end
+
+  it "converts environment variables to_s" do
+    expect(@box.command_with_environment('cmd', { :a => nil, :b => 123 })).to eq "export a=\"\"\nexport b=\"123\"\ncmd"
+  end
+
+  it "sets the environment variables from the provided hash" do
+    allow(@box.connection).to receive(:bash)
+    expect(@box).to receive(:command_with_environment).with('cmd', { 1 => 2 })
+    @box.bash('cmd', :env => { 1 => 2 })
+  end
+
+  it "checks the connection to determine if it is alive" do
+    expect(@box.connection).to receive(:alive?).and_return(true)
+    expect(@box).to be_alive
+  end
+
+  it "establish_connection to set up the connection manually" do
+    expect(@box.connection).to receive(:ensure_tunnel)
+    @box.establish_connection
+  end
+
+  it "establish_connection can take a hash of options" do
+    expect(@box.connection).to receive(:ensure_tunnel).with(:timeout => :infinite)
+    @box.establish_connection(:timeout => :infinite)
+  end
 end