shr 0.1.3 → 0.1.4

data/lib/shr/builtin.rb

@@ -0,0 +1,49 @@
+#coding: utf-8
+require 'stringio'
+
+module Shr
+  module Builtin
+
+    def capture(&block)
+      proc = Proc.new do |environment|
+        output = relay capture_stdout(&block)
+        if environment.key? :out
+          File.write(environment[:out], output.read)
+        end
+        [output, nil]
+      end
+      @commands << [:capture, proc]
+      self
+    end
+
+    def cd!(path=nil)
+      proc = Proc.new do
+        path ? Dir.chdir(path) : Dir.chdir
+        [nil, nil]
+      end
+      @commands << ["#cd! #{path}".strip, proc]
+      force
+      self
+    end
+
+    private
+
+    def capture_stdout
+      begin
+        $stdout = StringIO.new
+        yield
+        out = $stdout.string
+      ensure
+        $stdout = STDOUT
+      end
+      out
+    end
+
+    def relay(source)
+      r, w = IO.pipe
+      w.write source
+      w.close
+      r
+    end
+  end
+end

data/lib/shr/command.rb

@@ -30,23 +30,24 @@ module Shr
       @command.end_with? '!'
     end
 
-    # xxx
-    def run(environment, command_out)
-      io_r, io_w = IO.pipe
-      options = { :out => io_w }
-      options[:in] = command_out if command_out
-      options.merge!(environment)
-
-      pid = spawn(self.to_s, options)
-      watcher = Process.detach(pid)
-      io_w.close
-
-      [io_r, watcher]
-    end
-
-    # xxx
-    def run!
-      Open3.pipeline(self.to_s)
+    def to_proc
+      Proc.new do |environment, command_out|
+        if release?
+          Open3.pipeline(self.to_s)
+          [nil, nil]
+        else
+          io_r, io_w = IO.pipe
+          options = { :out => io_w }
+          options[:in] = command_out if command_out
+          options.merge!(environment)
+
+          pid = spawn(self.to_s, options)
+          watcher = Process.detach(pid)
+          io_w.close
+
+          [io_r, watcher]
+        end
+      end
     end
   end
 end

data/lib/shr/shell.rb

@@ -1,9 +1,12 @@
 #coding: utf-8
 require 'shr/command'
+require 'shr/builtin'
 
 module Shr
   class Shell
 
+    include Builtin
+
     def initialize
       @commands = []
     end
@@ -14,7 +17,7 @@ module Shr
         super
       else
         delay command
-        force! if command.release?
+        force if command.release?
         self
       end
     end
@@ -25,7 +28,7 @@ module Shr
     end
 
     def inspect
-      command_line = @commands.join(' | ').strip
+      command_line = @commands.map {|c| c.first }.join(' | ').strip
       force
       res =  "#<Shr::Shell>"
       res << "<:command => #{command_line}>" if command_line.size > 0
@@ -61,6 +64,14 @@ module Shr
     alias_method :<, :redirect_from
     alias_method :>, :redirect_to
 
+    def bake(name, command, options=[])
+      Shell.class_eval do
+        define_method(name) do |*args|
+          self.method_missing(command, *(options + args))
+        end
+      end
+    end
+
     private
 
     def filled?
@@ -68,23 +79,16 @@ module Shr
     end
 
     def delay(command)
-      @commands << command
+      @commands << [command, command.to_proc]
     end
 
     def force(args={})
       return if @commands.empty?
 
-      @commands.each do |command|
-        @command_out, @wait_thread = command.run(args, @command_out)
+      @commands.each do |_, command|
+        @command_out, @wait_thread = command.call(args, @command_out)
       end
-      @wait_thread.join
-      @commands.clear
-    end
-
-    def force!
-      return if @commands.empty?
-
-      @commands[-1].run!
+      @wait_thread.join if @wait_thread
       @commands.clear
     end
   end

data/lib/shr/version.rb

@@ -1,3 +1,3 @@
 module Shr
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/shr/builtin_spec.rb

@@ -0,0 +1,51 @@
+#coding: utf-8
+require 'spec_helper'
+require 'tempfile'
+
+module Shr
+  describe Builtin do
+    let(:sh) { Shell.new }
+
+    before(:all) do
+      @original = Dir.pwd
+    end
+
+    it 'has the following methods' do
+      m = sh.methods
+      m.should include(:capture)
+      m.should include(:cd!)
+    end
+
+    describe '#capture' do
+      it 'captures output from block' do
+        sh.capture { print 'hello capture' }.to_s.should eq("hello capture")
+      end
+
+      it 'redirects output from block to file' do
+        tempfile = Tempfile.new('temp')
+        sh.capture { print 'hello capture' }.redirect_to(tempfile.path)
+        File.read(tempfile.path).should eq('hello capture')
+        tempfile.close!
+      end
+    end
+
+    describe '#cd!' do
+      it 'changes the current working directory' do
+        sh.cd! Dir.home
+        Dir.pwd.should eq(Dir.home)
+        Dir.chdir @original
+      end
+
+      context 'with no argument' do
+        it 'changes the current working directory to users home' do
+          sh.cd!
+          Dir.pwd.should eq(Dir.home)
+        end
+      end
+    end
+
+    after(:all) do
+      Dir.chdir @original
+    end
+  end
+end

data/spec/lib/shr/command_spec.rb

@@ -11,7 +11,7 @@ module Shr
       m.should include(:to_s)
       m.should include(:exist?)
       m.should include(:release?)
-      m.should include(:run)
+      m.should include(:to_proc)
     end
 
     describe '#command' do

data/spec/lib/shr/shell_spec.rb

@@ -16,6 +16,7 @@ module Shr
       m.should include(:<)
       m.should include(:redirect_to)
       m.should include(:>)
+      m.should include(:bake)
     end
 
     unless OS.windows?
@@ -89,6 +90,18 @@ module Shr
         end
       end
 
+      describe '#bake' do
+        it 'bakes new command' do
+          sh.bake(:sort_r, :sort, [:r])
+
+          files = []
+          sh.ls(@tmpdir).sort_r.each do |file|
+            files << file.strip
+          end
+          files.should eq(['ruby.rb', 'python.py', 'perl.pl'])
+        end
+      end
+
       after(:all) do
         FileUtils.remove_entry_secure @tmpdir
       end

data/spec/lib/shr/shell_win_spec.rb

@@ -72,6 +72,19 @@ module Shr
         end
       end
 
+      describe '#bake' do
+        it 'bakes new command' do
+          sh.bake(:dir_B,  :dir,  [:B])
+          sh.bake(:sort_R, :sort, [:R])
+
+          files = []
+          sh.dir_B(@tmpdir.gsub('/', '\\')).sort_R.each do |file|
+            files << file.strip
+          end
+          files.should eq(['ruby.rb', 'python.py', 'perl.pl'])
+        end
+      end
+
       after(:all) do
         FileUtils.remove_entry_secure @tmpdir
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -41,12 +41,14 @@ files:
 - README.md
 - Rakefile
 - lib/shr.rb
+- lib/shr/builtin.rb
 - lib/shr/command.rb
 - lib/shr/option.rb
 - lib/shr/shell.rb
 - lib/shr/version.rb
 - lib/shr/which.rb
 - shr.gemspec
+- spec/lib/shr/builtin_spec.rb
 - spec/lib/shr/command_spec.rb
 - spec/lib/shr/option_spec.rb
 - spec/lib/shr/shell_spec.rb
@@ -79,6 +81,7 @@ signing_key:
 specification_version: 3
 summary: Make controlling subprocess easier in Ruby.
 test_files:
+- spec/lib/shr/builtin_spec.rb
 - spec/lib/shr/command_spec.rb
 - spec/lib/shr/option_spec.rb
 - spec/lib/shr/shell_spec.rb