db2c 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in template_gem.gemspec
+gemspec

data/Rakefile

@@ -9,6 +9,13 @@ def git(command)
   system("git #{command}")
 end
 
+desc "Build and install gem"
+task :build do
+  sh "ronn man/*.ronn"
+  sh "gem build db2c.gemspec"
+  sh "gem install db2c-#{version}.gem"
+end
+
 desc "Push new version"
 task :publish do
   git "tag v#{version}"

data/bin/db2c

@@ -1,37 +1,22 @@
 #!/usr/bin/env ruby
 
-if !system("which db2 > /dev/null 2> /dev/null")
-  puts "The db2 command was not found!"
-  exit
-end
-
-if !ARGV.include?('--no-rlwrap') && !system("which rlwrap > /dev/null 2> /dev/null")
-  puts "This program depends on rlwrap, install rlwrap"
-  exit
-end
-
-cdir = File.dirname(__FILE__)
-unless (ARGV & %w{h help -help --help --man}).empty?
-  exec "man #{cdir}/../man/db2c.1"
-end
-unless ARGV.include? '--no-rlwrap'
-  exec "rlwrap -z pipeto -i -r -s 999999 -pBLUE -f #{cdir}/ac -H ~/.db2c_history db2c --no-rlwrap #{ARGV.join(' ')}"
-end
-
 $LOAD_PATH.unshift 'lib'
 require "db2c"
 
-Db2c::Command.debug = !(ARGV & %w{ -d --debug -debug debug }).empty?
+run = Db2c::Run.new *ARGV
+
+exec "man #{run.gdir}/man/db2c.1" if run.help?
+exec "rlwrap -z pipeto -i -r -s 999999 -pBLUE -f #{run.autocomplete} -H ~/.db2c_history db2c --no-rlwrap #{run.args}" if run.wrap?
 
 loop do
   print Db2c::Command.prompt
-
   begin
     command = Db2c::Command.new $stdin.gets
   rescue Interrupt
     exit
   end
-
   exit if command.quit?
+  system 'less ~/.db2c_history' if command.history?
+  system "man #{run.gdir}/man/db2c.1" if command.help?
   command.execute
 end

data/db2c.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'db2c'
+
+Gem::Specification.new do |s|
+  s.name          = "db2c"
+  s.version       = Db2c::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.date          = Time.now.strftime('%Y-%m-%d')
+  s.summary       = "a smarter db2 console"
+  s.description   = "a db2 console with with history and autocomplete support, and few other goodies"
+  s.homepage      = "http://github.com/on-site/db2c"
+  s.email         = "samer@on-siteNOSPAM.com"
+  s.authors       = ["Samer Abukhait"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "rspec"
+end

data/{bin/ac → lib/autocomplete}

@@ -145,7 +145,6 @@ deferred
 delete
 desc
 describe
-descriptor
 deterministic
 diagnostics
 dimensions
@@ -158,7 +157,6 @@ domain
 do
 double
 drop
-dropin
 dynamic
 dynamic_function
 each
@@ -181,7 +179,6 @@ exclusive
 exec
 execute
 exists
-exit
 explain
 extension
 external
@@ -239,7 +236,6 @@ insert
 instead
 insts_per_argbyte
 insts_per_invoc
-int
 integer
 integrity
 intersect
@@ -247,7 +243,6 @@ interval
 into
 ios_per_argbyte
 ios_per_invoc
-iso
 iterate
 isolation
 java
@@ -381,7 +376,6 @@ reads
 real
 recommend
 recovery
-ref
 reference
 references
 referencing
@@ -433,14 +427,12 @@ seconds
 secqty
 section
 select
-self
 sequence
 serializable
 server
 server_name
 session
 session_user
-set
 sets
 share
 signal
@@ -452,7 +444,6 @@ some
 source
 space
 specific
-sql
 sqlcode
 sqlerror
 sqlexception
@@ -475,7 +466,6 @@ synonym
 system
 system_user
 table
-tables
 table_name
 tablespace
 tablespaces
@@ -487,7 +477,6 @@ timestamp
 timezone
 timezone_hour
 timezone_minute
-to
 trailing
 transaction
 transform
@@ -536,5 +525,4 @@ wrapper
 write
 year
 years
-yes
 zone

data/lib/db2c.rb

@@ -1,6 +1,7 @@
 module Db2c
   DEFAULT_PROMPT = "db2c => "
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 
+require "db2c/run.rb"
 require "db2c/command.rb"

data/lib/db2c/command.rb

@@ -8,12 +8,7 @@ module Db2c
       if input
         puts "initializing: #{input}" if @@debug
         @input = input.chomp.strip
-        @input.gsub! /^db2 /i, ''
-        @input.gsub! /;$/, ''
-        @input.gsub! /^use /, 'connect to '
-        @input.insert 0, "? sql" if @input =~ /^\-\d+$/
-        @input.insert 0, "? " if @input =~ /^\d+$/
-        @input.insert 0, "values " if @input =~ /^current.+$/i
+        parse
       end
     end
 
@@ -21,12 +16,34 @@ module Db2c
       @input
     end
 
+    def parse
+      @input.gsub! /^db2 /i, ''
+      @input.gsub! /;$/, ''
+      @input.gsub! /^use /, 'connect to '
+      @input.gsub! /^\\d /, 'describe '
+      @input.insert 0, "? sql" if @input =~ /^\-\d+$/
+      @input.insert 0, "? " if @input =~ /^\d+$/
+      @input.insert 0, "values " if @input =~ /^current.+$/i
+
+      if @input =~ /describe [^. ]+\.[^.+ ]+/
+        @input.gsub! /describe /, 'describe table '
+      end
+    end
+
     def quit?
-      @input.nil? || @input =~ /^(exit|quit)$/
+      @input.nil? || @input =~ /^(exit|quit|\\q|\\quit)$/
+    end
+
+    def history?
+      @input =~ /^(history|hist|\\history|\\hist)$/
+    end
+
+    def help?
+      @input =~ /^(help|h|\\help|\\h)$/
     end
 
     def valid?
-      @input && @input.length > 0
+      !quit? && !history? && !help?
     end
 
     def execute
@@ -44,6 +61,10 @@ module Db2c
       @@debug = value
     end
 
+    def self.debug?
+      @@debug
+    end
+
     def self.prompt
       "db2c".tap do |pr|
         pr << "(#{@@cdb})" if @@cdb.length > 0

data/lib/db2c/run.rb

@@ -0,0 +1,44 @@
+module Db2c
+  class Run
+    attr_reader :gdir
+
+    def initialize *args
+      @args = args
+      puts "args: #{@args}" if debug?
+      @gdir = File.expand_path('../../../', __FILE__)
+      puts "cdir: #{@gdir}" if debug?
+      Db2c::Command.debug = debug?
+
+      die "version #{Db2c::VERSION}" if version?
+      die "The db2 command was not found!" unless system("which db2 > /dev/null 2> /dev/null")
+      die "This program depends on rlwrap, please install rlwrap" if wrap? && !system("which rlwrap > /dev/null 2> /dev/null")
+    end
+
+    def help?
+      !(@args & %w{-h help -help --help --man}).empty?
+    end
+    def version?
+      !(@args & %w{-v version -version --version}).empty?
+    end
+    def debug?
+      !(@args & %w{-d debug -debug --debug}).empty?
+    end
+    def wrap?
+      (@args & %w{--no-rlwrap --now}).empty?
+    end
+
+    def autocomplete
+      "#{@gdir}/lib/autocomplete"
+    end
+
+    def args
+      @args.join(' ')
+    end
+
+    def die message
+      puts "DB2C: #{message}"
+      puts "DB2C: #{self.inspect}" if debug?
+      exit
+    end
+  end
+end

data/man/db2c.1

@@ -4,7 +4,7 @@
 .TH "DB2C" "1" "November 2011" "" ""
 .
 .SH "NAME"
-\fBdb2c\fR \- a db2 console with with history and autocomplete support
+\fBdb2c\fR \- A DB2 console with with history and autocomplete support, and few other goodies
 .
 .SH "SYNOPSIS"
 \fBdb2c\fR \fI\fIoptions\fR\fR
@@ -12,8 +12,8 @@
 .SH "DESCRIPTION && EXAMPLES"
 DB2 console mode does not support readline and autocomplete, this is a wrapper for the db2 command with support for both\.
 .
-.TP
-\fBHistory\fR
+.IP "\(bu" 4
+\fBHistory\fR:
 .
 .IP "" 4
 .
@@ -24,14 +24,16 @@ db2 => connect to testdb (or: db2 => use testdb)
 db2(testdb) => current date
 db2(testdb) => \-107
 (Use the arrows for history, you can also use \fICTRL\fR\-r to search the history)
+db2(testdb) => history
+(To see a list of all saved history lines)
 .
 .fi
 .
 .IP "" 0
 
 .
-.TP
-\fBAutocomplete\fR
+.IP "\(bu" 4
+\fBAutocomplete\fR:
 .
 .IP "" 4
 .
@@ -48,8 +50,8 @@ db2(testdb) => select * from xyz\.tab[double\-tab]
 .IP "" 0
 
 .
-.TP
-\fBYou can pipe\fR
+.IP "\(bu" 4
+\fBYou can pipe\fR:
 .
 .IP "" 4
 .
@@ -64,8 +66,8 @@ db2(testdb) => select * from large\.table | less
 .IP "" 0
 
 .
-.TP
-If a command outputs long lines, you can use \fBless \-S\fR
+.IP "\(bu" 4
+For example, if a command outputs long lines, \fBless \-S\fR is your friend:
 .
 .IP "" 4
 .
@@ -79,6 +81,27 @@ db2(testdb) => select * from table\.with\.many\.columns | less \-S
 .
 .IP "" 0
 
+.
+.IP "\(bu" 4
+You can use \fIsome psql\-like\fR commands
+.
+.IP "" 4
+.
+.nf
+
+
+db2(testdb) => \fB\ed schema\.table\fR
+  == describe table schema\.table
+db2(testdb) => \fB\eh\fR
+  == To see this help from within the console
+db2(testdb) => \fB\eq\fR
+.
+.fi
+.
+.IP "" 0
+
+.
+.IP "" 0
 .
 .SH "OPTIONS"
 .
@@ -90,6 +113,10 @@ Displays this help page\.
 \fB\-\-debug\fR
 Displays annoying messages\.
 .
+.TP
+\fB\-\-no\-rlrwap\fR
+Don\'t use rlwrap
+.
 .SH "BUGS"
 \fIhttp://github\.com/on\-site/db2c/issues\fR
 .

data/man/db2c.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
   <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>db2c(1) - a db2 console with with history and autocomplete support</title>
+  <title>db2c(1) - A DB2 console with with history and autocomplete support, and few other goodies</title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -70,7 +70,7 @@
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>db2c</code> - <span class="man-whatis">a db2 console with with history and autocomplete support</span>
+  <code>db2c</code> - <span class="man-whatis">A DB2 console with with history and autocomplete support, and few other goodies</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
@@ -81,28 +81,42 @@
 
 <p>DB2 console mode does not support readline and autocomplete, this is a wrapper for the db2 command with support for both.</p>
 
-<dl>
-<dt class="flush"><strong>History</strong></dt><dd><p></p><pre>
+<ul>
+<li><p><strong>History</strong>:
+</p><pre>
 db2 => connect to testdb (or: db2 => use testdb)
 db2(testdb) => current date
 db2(testdb) => -107
 (Use the arrows for history, you can also use <var>CTRL</var>-r to search the history)
-</pre></dd>
-<dt><strong>Autocomplete</strong></dt><dd><p></p><pre>
+db2(testdb) => history
+(To see a list of all saved history lines)
+</pre></li>
+<li><p><strong>Autocomplete</strong>:
+</p><pre>
 db2(testdb) => sel[double-tab]
 it remembers..
 db2(testdb) => list tables for schema xyz
 db2(testdb) => select * from xyz.tab[double-tab]
-</pre></dd>
-<dt><strong>You can pipe</strong></dt><dd><p></p><pre>
+</pre></li>
+<li><p><strong>You can pipe</strong>:
+</p><pre>
 db2(testdb) => select * from large.table | grep -v something
 db2(testdb) => select * from large.table | less
-</pre></dd>
-<dt>If a command outputs long lines, you can use <strong>less -S</strong></dt><dd><p></p><pre>
+</pre></li>
+<li><p>For example, if a command outputs long lines, <strong>less -S</strong> is your friend:
+</p><pre>
 db2(testdb) => select * from table.with.many.columns | less -S
 (you can scorll horizontally with left/right arrows)
-</pre></dd>
-</dl>
+</pre></li>
+<li><p>You can use <em>some psql-like</em> commands
+</p><pre>
+db2(testdb) => <strong>\d schema.table</strong>
+  == describe table schema.table
+db2(testdb) => <strong>\h</strong>
+  == To see this help from within the console
+db2(testdb) => <strong>\q</strong>
+</pre></li>
+</ul>
 
 
 <h2 id="OPTIONS">OPTIONS</h2>
@@ -110,6 +124,7 @@ db2(testdb) => select * from table.with.many.columns | less -S
 <dl>
 <dt><code>-h</code>, <code>--help</code>, <code>--man</code></dt><dd><p>Displays this help page.</p></dd>
 <dt class="flush"><code>--debug</code></dt><dd><p>Displays annoying messages.</p></dd>
+<dt><code>--no-rlrwap</code></dt><dd><p>Don't use rlwrap</p></dd>
 </dl>
 
 
@@ -119,7 +134,7 @@ db2(testdb) => select * from table.with.many.columns | less -S
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Samer Abukhait <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x73;&#x61;&#109;&#101;&#114;&#64;&#x6f;&#110;&#x2d;&#115;&#105;&#x74;&#101;&#x4e;&#79;&#83;&#x50;&#x41;&#77;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#115;&#97;&#x6d;&#x65;&#114;&#64;&#111;&#110;&#45;&#x73;&#105;&#116;&#101;&#x4e;&#x4f;&#83;&#80;&#x41;&#77;&#x2e;&#x63;&#x6f;&#109;</a>, @s4mer</p>
+<p>Samer Abukhait <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#115;&#97;&#109;&#101;&#x72;&#x40;&#111;&#110;&#45;&#x73;&#x69;&#x74;&#x65;&#x4e;&#79;&#x53;&#80;&#65;&#x4d;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x73;&#x61;&#109;&#101;&#114;&#x40;&#x6f;&#110;&#x2d;&#x73;&#105;&#x74;&#101;&#x4e;&#79;&#83;&#x50;&#x41;&#x4d;&#46;&#99;&#111;&#x6d;</a>, @s4mer</p>
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 

data/man/db2c.1.ronn

@@ -1,4 +1,4 @@
-db2c(1) - a db2 console with with history and autocomplete support
+db2c(1) - A DB2 console with with history and autocomplete support, and few other goodies
 ===================================
 
 ## SYNOPSIS
@@ -15,6 +15,8 @@ DB2 console mode does not support readline and autocomplete, this is a wrapper f
     db2(testdb) => current date
     db2(testdb) => -107
     (Use the arrows for history, you can also use <CTRL>-r to search the history)
+    db2(testdb) => history
+    (To see a list of all saved history lines)
     </pre>
 
   * **Autocomplete**:
@@ -31,12 +33,21 @@ DB2 console mode does not support readline and autocomplete, this is a wrapper f
     db2(testdb) => select * from large.table | less
     </pre>
 
-  * If a command outputs long lines, you can use **less -S**:
+  * For example, if a command outputs long lines, **less -S** is your friend:
     <pre>
     db2(testdb) => select * from table.with.many.columns | less -S
     (you can scorll horizontally with left/right arrows)
     </pre>
 
+  * You can use _some psql-like_ commands
+    <pre>
+    db2(testdb) => **\d schema.table**
+      == describe table schema.table
+    db2(testdb) => **\h**
+      == To see this help from within the console
+    db2(testdb) => **\q**
+    </pre>
+
 ## OPTIONS
 
   * `-h`, `--help`, `--man`:
@@ -45,6 +56,9 @@ DB2 console mode does not support readline and autocomplete, this is a wrapper f
   * `--debug`:
     Displays annoying messages.
 
+  * `--no-rlrwap`:
+    Don't use rlwrap
+
 ## BUGS
 
 <http://github.com/on-site/db2c/issues>

data/spec/db2c/command_spec.rb

@@ -0,0 +1,30 @@
+require 'db2c'
+
+describe Db2c::Command do
+  it 'strips db2 if any' do
+    Db2c::Command.new('db2 do something').to_s.should == 'do something'
+    Db2c::Command.new('db2 do something').should be_valid
+  end
+  it 'supports use *' do
+    Db2c::Command.new('use somedb').to_s.should == 'connect to somedb'
+  end
+  it 'supports describe tablei_name' do
+    Db2c::Command.new('describe schema.table').to_s.should == 'describe table schema.table'
+  end
+  it 'supports \d tale_name' do
+    Db2c::Command.new('\d schema.table').to_s.should == 'describe table schema.table'
+  end
+  it 'supports \q' do
+    Db2c::Command.new('\q').should be_quit
+    Db2c::Command.new('\quit').should be_quit
+  end
+  it 'supports history commands' do
+    Db2c::Command.new('history').should be_history
+    Db2c::Command.new('\hist').should be_history
+  end
+  it 'supports help command' do
+    Db2c::Command.new('help').should be_help
+    Db2c::Command.new('\help').should be_help
+    Db2c::Command.new('\h').should be_help
+  end
+end

data/spec/db2c/run_spec.rb

@@ -0,0 +1,34 @@
+require "db2c"
+
+describe Db2c::Run do
+  it "works with empty arguments" do
+    Db2c::Run.new("").should be
+  end
+  it "defines helper boolean methods" do
+    Db2c::Run.any_instance.stub(:die)
+    Db2c::Run.new("").should_not be_version
+    Db2c::Run.new("").should_not be_debug
+    Db2c::Run.new("").should_not be_help
+    Db2c::Run.new("").should be_wrap
+
+    Db2c::Run.new("-v").should be_version
+    Db2c::Run.new("-d").should be_debug
+    Db2c::Run.new("-h").should be_help
+    Db2c::Run.new("--now").should_not be_wrap
+
+    Db2c::Run.new("version").should be_version
+    Db2c::Run.new("debug").should be_debug
+    Db2c::Run.new("help").should be_help
+    Db2c::Run.new("--no-rlwrap").should_not be_wrap
+
+  end
+  it "sets command debug flag" do
+    Db2c::Command.should_not be_debug
+    Db2c::Run.new("debug")
+    Db2c::Command.should be_debug
+  end
+  it "outputs version" do
+    Db2c::Run.any_instance.should_receive(:die).with("version #{Db2c::VERSION}")
+    Db2c::Run.new("--version")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db2c
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
-dependencies: []
-description: This program wraps db2 command mode with a repl, and wraps that repl
-  with rlwrap
+date: 2011-11-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &9232020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *9232020
+description: a db2 console with with history and autocomplete support, and few other
+  goodies
 email: samer@on-siteNOSPAM.com
 executables:
 - db2c
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/ac
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - bin/db2c
-- lib/db2c/command.rb
+- db2c.gemspec
+- lib/autocomplete
 - lib/db2c.rb
-- man/db2c.1.html
+- lib/db2c/command.rb
+- lib/db2c/run.rb
 - man/db2c.1
+- man/db2c.1.html
 - man/db2c.1.ronn
-- LICENSE
-- README.md
-- Rakefile
+- spec/db2c/command_spec.rb
+- spec/db2c/run_spec.rb
 homepage: http://github.com/on-site/db2c
 licenses: []
 post_install_message: 
@@ -52,5 +69,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: a db2 console with with history and autocomplete support
+summary: a smarter db2 console
 test_files: []