shr 0.0.1 → 0.1.1

data/README.md

@@ -10,7 +10,7 @@ This is a port of Python's [sh](https://github.com/amoffat/sh).
 
 Installation
 ------------
-TODO: Write installation here
+    gem install shr
 
 Usage
 -----
@@ -18,5 +18,5 @@ TODO: Write usage instructions here
 
 License
 -------
-Released under the MIT License. See the [LICENCE][licence] file for further details.
+Released under the MIT License. See the [LICENSE][license] file for further details.
 [license]: https://github.com/kukenko/shr/LICENSE.md

data/lib/shr/option.rb

@@ -2,45 +2,43 @@
 
 module Shr
   class Option
-    # xxx
     def initialize
-      @stack = []
+      @options   = []
+      @indicator = '-'
     end
+    attr_accessor :indicator
 
-    # xxx
-    # This method has not support Windows yet.
     def parse(options)
       options.each do |opt|
         case opt
         when String
-          unless opt.start_with? '-'
-            if @stack.last && @stack.last.start_with?('--')
-              @stack.push "#{@stack.pop}=#{opt}"
-            else
-              @stack.push opt
-            end
-          else
-            @stack.push opt
-          end
+          @options << opt
         when Symbol
-          @stack.push << "-#{opt.length > 1 ? '-' : ''}#{opt}"
+          @options << translate_from(opt)
         when Hash
           opt.each do |k, v|
             if v.eql?(true)
-              @stack.push << "-#{k.length > 1 ? '-' : ''}#{k}"
+              @options << translate_from(k)
             else
               if k.length > 1
-                @stack << "--#{k}=#{v}"
+                @options << "#{translate_from(k)}=#{v}"
               else
-                @stack << "-#{k.length > 1 ? '-' : ''}#{k}" << v
+                @options << translate_from(k) << v
               end
             end
           end
         when Fixnum
-          @stack.push << "-#{opt}"
+          @options << "#{@indicator}#{opt}"
         end
       end
-      @stack
+      @options
+    end
+
+    private
+
+    def translate_from(opt)
+      s = opt.to_s
+      "#{@indicator}#{(s.length > 1 ? '-' : '') if @indicator == '-'}#{s}"
     end
   end
 end

data/lib/shr/shell.rb

@@ -78,9 +78,17 @@ module Shr
       @command_out && !@command_out.closed?
     end
 
+    # xxx
     def command_line(name, args)
-      options = Option.new.parse(args).join(' ')
-      "#{name} #{options}".strip
+      option = Option.new
+      option.indicator = '/' if OS.windows?
+      options = option.parse(args).join(' ')
+
+      if OS.windows?
+        "cmd /c #{name} #{options}".strip
+      else
+        "#{name} #{options}".strip
+      end
     end
 
     def delay(name, args)

data/lib/shr/version.rb

@@ -1,3 +1,3 @@
 module Shr
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/lib/shr/which.rb

@@ -12,13 +12,52 @@ module Shr
       @@path += cwd
     end
 
+    if OS.windows?
+      @@builtins = %w{
+        assoc
+        call
+        cd chdir
+        cls
+        color
+        date
+        del erace
+        dir
+        echo
+        exit
+        ftype
+        md mkdir
+        mklink
+        move
+        path
+        pause
+        popd
+        prompt
+        pushd
+        rd rmdir
+        ren rename
+        set
+        start
+        time
+        title
+        var
+        verify
+        vol
+      }
+    end
+
     def self.exist?(program)
       programs = add_extensions(program)
 
       entries = paths.product(programs).map { |list| list.join '/' }
-      entries.find do |exe|
+      result = entries.find do |exe|
         File.executable?(exe) && !File.directory?(exe)
       end
+
+      if OS.windows?
+        result = program.to_s if @@builtins.include? program.to_s
+      end
+
+      result
     end
     class << self
       alias :exists? :exist?

data/spec/lib/shr/option_spec.rb

@@ -5,76 +5,68 @@ module Shr
   describe Option do
     let(:opt) { Option.new }
 
+    SHORT_FORM = ['-o', 'page.html']
+    LONG_FORM  = ['--shell=/bin/sh', '--silent']
+    MIXED_FORM = SHORT_FORM + LONG_FORM
+
     it 'has the following methods' do
       o = opt.methods
       o.should include(:parse)
     end
 
     describe '#parse' do
-      shared_examples 'with short-form options' do
-        it 'parses correctly' do
-          opt.parse(options).should eq(['-o', 'page.html'])
-        end
-      end
-
-      shared_examples 'with long-form options' do
-        it 'parses correctly' do
-          opt.parse(options).should eq(['--shell=/bin/sh', '--silent'])
-        end
-      end
-
-      shared_examples 'with mixed options' do
-        it 'parses correctly' do
-          opt.parse(options).should eq(['-o', 'page.html', '--shell=/bin/sh', '--silent'])
-        end
-      end
-
       describe String do
-        it_behaves_like 'with short-form options' do
-          let(:options) { ['-o', 'page.html'] }
-        end
-
-        it_behaves_like 'with long-form options' do
-          let(:options) { ['--shell', '/bin/sh', '--silent'] }
-        end
-
-        it_behaves_like 'with mixed options' do
-          let(:options) { ['-o', 'page.html', '--shell', '/bin/sh', '--silent'] }
+        it 'remains argument unchanged' do
+          opt.parse(MIXED_FORM).should eq(MIXED_FORM)
         end
       end
 
       describe Symbol do
-        it_behaves_like 'with short-form options' do
-          let(:options) { [:o, 'page.html'] }
-        end
+        context 'with a character' do
+          it 'tranlate argument to short-form' do
+            opt.parse([:o]).should eq(['-o'])
+          end
 
-        it_behaves_like 'with long-form options' do
-          let(:options) { [:shell, '/bin/sh', :silent] }
+          it 'may be indicated by @indicator' do
+            opt.indicator = '/'
+            opt.parse([:o]).should eq(['/o'])
+          end
         end
 
-        it_behaves_like 'with mixed options' do
-          let(:options) { [:o, 'page.html', :shell, '/bin/sh', :silent] }
+        context 'with some characters' do
+          it 'translates argument to long-form' do
+            opt.parse([:silent]).should eq(['--silent'])
+          end
+
+          it 'may be indicated by @indicator' do
+            opt.indicator = '/'
+            opt.parse([:silent]).should eq(['/silent'])
+          end
         end
       end
 
       describe Hash do
-        it_behaves_like 'with short-form options' do
-          let(:options) { [{ :o => 'page.html' }] }
-        end
-
-        it_behaves_like 'with long-form options' do
-          let(:options) { [{ :shell => '/bin/sh', :silent => true }] }
-        end
+        it { opt.parse([{ :o => 'page.html' }]).should eq(SHORT_FORM) }
+        it { opt.parse([{ :shell => '/bin/sh', :silent => true }]).should eq(LONG_FORM) }
 
-        it_behaves_like 'with mixed options' do
-          let(:options) { [{ :o => 'page.html', :shell => '/bin/sh', :silent => true }] }
+        context 'with indicator' do
+          it 'may be indicated by @indicator' do
+            opt.indicator = '/'
+            opt.parse([{ :o => 'page.html' }]).should eq(['/o', 'page.html'])
+          end
         end
       end
 
       describe Fixnum do
-        it 'parses short-form options' do
-          options = [1, 2, 3]
-          opt.parse(options).should eq(['-1', '-2', '-3'])
+        it 'translates argument to short-form' do
+          opt.parse([1, 2, 3]).should eq(['-1', '-2', '-3'])
+        end
+
+        context 'with indicator' do
+          it 'may be indicated by @indicator' do
+            opt.indicator = '/'
+            opt.parse([1, 2, 3]).should eq(['/1', '/2', '/3'])
+          end
         end
       end
     end

data/spec/lib/shr/shell_spec.rb

@@ -74,8 +74,8 @@ module Shr
 
     describe '#exitstatus' do
       it "shows an exit status of process" do
-        sh.ruby(:e, "'exit 0'").exitstatus.should eq(0)
-        sh.ruby(:e, "'exit 1'").exitstatus.should eq(1)
+        sh.ruby('-e', "'exit 0'").exitstatus.should eq(0)
+        sh.ruby('-e', "'exit 1'").exitstatus.should eq(1)
       end
     end
 

data/spec/lib/shr/which_spec.rb

@@ -10,18 +10,44 @@ module Shr
     end
 
     describe '#exist?' do
-      it 'returns true if any of executables are found' do
-        Which.exist?(:pwd).should be_true
+      shared_examples 'if any of executables are found' do
+        it { Which.exist?(command).should be_true }
       end
 
-      it 'returns false if any of executables are not found' do
-        Which.exist?(:not_found).should be_false
+      shared_examples 'if any of executables are not found' do
+        it { Which.exist?(command).should be_false }
       end
 
-      context 'with argument String' do
-        it 'returns true if any of executables are found' do
-          Which.exist?('pwd').should be_true
+      unless ENV['OS'] == 'Windows_NT'
+        it_behaves_like 'if any of executables are found' do
+          let(:command) { :pwd }
         end
+
+        context 'with String' do
+          it_behaves_like 'if any of executables are found' do
+            let(:command) { 'pwd' }
+          end
+        end
+      else
+        it_behaves_like 'if any of executables are found' do
+          let(:command) { :notepad }
+        end
+
+        context 'with builtin command' do
+          it_behaves_like 'if any of executables are found' do
+            let(:command) { :chdir }
+          end
+        end
+
+        context 'with String' do
+          it_behaves_like 'if any of executables are found' do
+            let(:command) { 'chdir' }
+          end
+        end
+      end
+
+      it_behaves_like 'if any of executables are not found' do
+        let(:command) { :not_found }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
-  requirement: &70190202007440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190202007440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Make controlling subprocess easier in Ruby.
 email:
 - m.kukenko@gmail.com
@@ -66,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Make controlling subprocess easier in Ruby.