itds 0.0.1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+
+rvm:
+  - 1.9.3-p547
+  - 2.0.0
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq freetds-dev
+  - bundle install
+
+script:
+  - bundle exec rake spec

data/README.md

@@ -1,6 +1,24 @@
-# Itds
+# Itds [![CI] (https://travis-ci.org/andl/itds.svg?branch=master)] (https://travis-ci.org/andl/itds)
 
-A very simple SQL server CLI tools just to ease the developer working on Mac or Linux.
+A deadly simple SQL server CLI tools just to ease the developer working on Mac or Linux.
+
+# Dependency
+
+Install freetds using the package manager of your system.
+## Mac
+```
+$homebrew install freetds
+```
+
+## Ubuntu
+```
+$sudo apt-get install freetds-dev
+```
+
+# Install
+```
+$gem install itds
+```
 
 # Usage
 
@@ -11,7 +29,7 @@ $itds --help
 
 Command parameters:
 ```
-$itds -h <hostname> -P <password> -u <username> -d <contained_database> [SQL]
+$itds -h <hostname> -p <password> -u <username> -d <contained_database> [SQL]
 ```
 
 Execute a command
@@ -24,15 +42,17 @@ $itds -h <hostname> -d <database> select 1
 +---+
 ```
 
-Interactive mode
+Cancel a request in interactive mode.
 ```
 $itds -h <hostname> -d <mydb>
-mydb> select(1)
-+---+
-
-+---+
-| 1 |
-+---+
-mydb> exit
+mydb> waitfor delay '00:00:04'
+^C
+mydb> select * from test
++----+
+| id |
++----+
+| 10 |
++----+
+mydb> ^C
 $
 ```

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/itds.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/itds/client.rb

@@ -8,15 +8,21 @@ module Itds
     def_delegators :@backend, :close
 
     DEFAULT_OPTS = {
-      port: 1433,
+      port:     1433,
       username: 'sa',
+      timeout:  5,
     }
 
     def initialize(opts={})
       opts = DEFAULT_OPTS.merge(opts)
       opts[:azure] = true if(opts[:database])
+      opts[:login_timeout] = opts[:timeout]
 
-      @backend = TinyTds::Client.new(opts)
+      @backend = new_backend(opts)
+    end
+
+    def new_backend(opts)
+      TinyTds::Client.new(opts)
     end
 
     def execute(sql)

data/lib/itds/repl.rb

@@ -8,15 +8,24 @@ module Itds
       def config(options)
         @options = options
         @client = Client.new(options)
-        self
       end
 
       def run
+        print_help
+
         while cmd = Readline.readline(prompt, true)
           execute_cmd(cmd)
         end
       end
 
+      def print_help
+        msg = <<-EOT
+itds SQL server interactive console.
+Press Ctrl-C to cancel current query, press again to quit.
+EOT
+        puts msg
+      end
+
       def prompt
         @prompt ||= "#{@options[:database]}> "
       end
@@ -24,10 +33,19 @@ module Itds
       def execute_cmd(cmd)
         begin
           stop if cmd == "exit"
-          res = @client.execute(cmd)
-          print_result(res)
+          @res = @client.execute(cmd)
+          print_result(@res)
         rescue => e
           print_err(e)
+        ensure
+          cancel_request
+        end
+      end
+
+      def cancel_request
+        if @res
+          @res.cancel
+          @res = nil
         end
       end
 
@@ -38,15 +56,42 @@ module Itds
           rows << rowset.values
         end
 
-        t = Terminal::Table.new :headings => fields, :rows => rows
-        puts t
+        output = {}
+        output[:headings] = fields unless fields.empty?
+        output[:rows] = rows unless rows.empty?
+
+        unless output.empty?
+          puts Terminal::Table.new output
+        end
+
+        print_affected_row(res)
+      end
+
+      def print_affected_row(res)
+        # tiny_tds seems not only return affected_rows for update/delete
+        # but also select.
+        affected = res.affected_rows
+
+        if affected > 0
+          puts ""
+          puts "Affected Rows: #{affected}"
+        end
       end
 
       def print_err(err)
         puts "Error: #{err.message}"
       end
 
+      def singal
+        if @res
+          cancel_request
+        else
+          stop
+        end
+      end
+
       def stop
+        @client.close
         exit
       end
     end
@@ -65,7 +110,7 @@ module Itds
           options[:host] = h
         end
 
-        opts.on("-p", "--port [PORT]", Integer, "port number, default is 1433") do |p|
+        opts.on("-P", "--port [PORT]", Integer, "port number, default is 1433") do |p|
           options[:port] = p
         end
 
@@ -77,10 +122,14 @@ module Itds
           options[:database] = d
         end
 
-        opts.on("-P", "--password [PASSWORD]", "optional password") do |p|
+        opts.on("-p", "--password [PASSWORD]", "optional password") do |p|
           options[:password] = p
         end
 
+        opts.on("--timeout [TIMEOUT]", "connect and query timeout, 5 secs by default") do |t|
+          options[:timeout] = t
+        end
+
         opts.on_tail("--help", "show this help message") do
           puts opts
           exit
@@ -105,8 +154,8 @@ module Itds
       end
 
       Repl.config(options)
-      if args.empty?
-        trap("INT") { exit }
+      if args.empty? #interactive
+        trap("INT") { Repl.singal }
         Repl.run
       else
         Repl.execute_cmd(args.join(" "))

data/lib/itds/version.rb

@@ -1,3 +1,3 @@
 module Itds
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/itds/client_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Itds
+  describe Client do
+
+    it "able to set login timeout" do
+      timeout = 2
+      t = Thread.new do
+        Client.new(
+          {
+            host:     localhost,
+            timeout:  timeout,
+          }
+        )
+      end
+
+      sleep(timeout + 1)
+      t.alive?.should be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rspec'
+require_relative '../lib/itds'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itds
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - liusandrew@gmail.com
@@ -84,6 +100,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,6 +111,8 @@ files:
 - lib/itds/client.rb
 - lib/itds/repl.rb
 - lib/itds/version.rb
+- spec/itds/client_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/andl/itds
 licenses:
 - MIT
@@ -119,5 +138,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A very simple SQL server client.
-test_files: []
+test_files:
+- spec/itds/client_spec.rb
+- spec/spec_helper.rb
 has_rdoc: