oci8_simple 0.6.1 → 0.7.0

data/Gemfile

@@ -1,10 +1,10 @@
 source :rubygems
 
-gem "ruby-oci8", "~>2.0.4"
+gem "ruby-oci8"
 
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "jeweler"
   gem "mocha", ">= 0"
+  gem "pry"
 end

data/Gemfile.lock

@@ -1,22 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.0.6)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mocha (0.9.12)
-    rake (0.8.7)
-    ruby-oci8 (2.0.4)
-    shoulda (2.10.1)
+      rdoc
+    json (1.6.6)
+    metaclass (0.0.1)
+    method_source (0.7.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    ruby-oci8 (2.1.0)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    slop (2.4.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  jeweler
   mocha
-  ruby-oci8 (~> 2.0.4)
+  pry
+  ruby-oci8
   shoulda

data/README.rdoc

@@ -81,7 +81,8 @@ functions, packages, procedures, sequences, synonyms, tables, types, and views.
     require 'oci8_simple'
     client = Oci8Simple::Client.new
 * Run a simple select query against development schema
-    client.run('select id, name from foos') => [[2, "lol"], [3, "hey"], ...]
+    client.run('select id, name from foos')                => [[2, "lol"], [3, "hey"], ...]
+    client.run('select id, name from foos', :hash => true) => [{:id => 2, :name => "lol"}, {:id => 3, :name=>"hey"}, ...])
 * Update something
     client.run <<-SQL
       UPDATE foos SET bar='baz' WHERE id=1233

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/oci8_simple/cli.rb

@@ -14,12 +14,16 @@ module Oci8Simple
       self.env = env
     end
     
-    def run(sql)
-      format(client.run(sql))
+    def run(sql, options={})
+      format(client.run(sql, options), options)
     end
     
-    def format(arr)
-      arr.map{|row| row.join(", ")}.join("\n")
+    def format(arr, options)
+      if(options[:hash])
+        arr.map{|row| row.map{|k,v| "#{k}: #{v}"}.join("\n")}.join("\n\n")
+      else
+        arr.map{|row| row.join(", ")}.join("\n")
+      end
     end
     
     def client
@@ -35,7 +39,7 @@ module Oci8Simple
       if(ARGV[0].nil?)
         puts o
       else
-        puts self.new(ARGV[1]).run(ARGV[0])
+        puts self.new(ARGV[1]).run(ARGV[0], @options)
       end
     end
     

data/lib/oci8_simple/client.rb

@@ -52,25 +52,49 @@ module Oci8Simple
       raise LogError.new("Cannot write to #{LOG_FILE}... be sure you have write permissions to #{USER_DIR}")
     end
   
-    def run(sql)
+    # sql - a query
+    # options: 
+    #   :hash => true|false - default is false - return an array of hashes (with column names) 
+    #            instead of an array or arrays
+    def run(sql, options={})
       log(sql)
       result = []
-      conn.exec(sql) do |r|
-        row = []
-        r.map do |col|
-          if col.class == BigDecimal
-            row << col.to_f
-          elsif col.class == OCI8::CLOB
-            row << col.read
-          else
-            row << col.to_s
-          end
+      if(options[:hash])
+        fetch_hashes(sql) do |r|
+          result << r
+        end
+      else
+        fetch_arrays(sql) do |r|
+          result << r
         end
-        result << row
       end
       result
     end
   
+    def fetch_hashes(sql, &block)
+      cursor = conn.exec(sql)
+      col_names = cursor.get_col_names.map{|s| s.downcase.to_sym }
+      while(r = cursor.fetch) do
+        yield Hash[*col_names.zip(r.map {|col| record_to_string(col)}).flatten]
+      end
+    end
+
+    def fetch_arrays(sql, &block)
+      conn.exec(sql) do |r|
+        yield r.map{|col| record_to_string(col)}
+      end
+    end
+
+    def record_to_string(record)
+      if record.class == BigDecimal
+        record.to_f
+      elsif record.class == OCI8::CLOB
+        record.read
+      else
+        record.to_s
+      end
+    end
+
     def config
       @config ||= YAML.load_file(CONFIG_FILE)[env]
     rescue Errno::ENOENT => e

data/lib/oci8_simple/command.rb

@@ -8,8 +8,12 @@ module Oci8Simple
       
       # Returns an OptionParser object. 
       def parse_options(banner)
+        @options= {}
         o = OptionParser.new do |opt|
           opt.banner = banner
+          opt.on("-c", "--show_column_names", "Show column names for each result") do
+            @options[:hash] = true
+          end
           opt.on("-v", "--version", "Show version") do
             puts "#{self.to_s} #{Oci8Simple::VERSION}"
             exit

data/oci8_simple.gemspec

@@ -4,17 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{oci8_simple}
-  s.version = "0.6.1"
+  s.name = "oci8_simple"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Billy Reisinger"]
-  s.date = %q{2011-07-22}
-  s.description = %q{Command-line tools for interacting with an Oracle database. This client is intended to be used 
-  to aid development and automation.  This is *not* meant to replace an ORM such as ActiveRecord + OracleEnhancedAdapter.
-  The only prerequisite to running this code is that you have installed the ruby-oci8 gem on your machine.}
-  s.email = %q{billy.reisinger@gmail.com}
-  s.executables = ["show", "oci8_simple", "describe"]
+  s.date = "2012-04-17"
+  s.description = "Command-line tools for interacting with an Oracle database. This client is intended to be used \n  to aid development and automation.  This is *not* meant to replace an ORM such as ActiveRecord + OracleEnhancedAdapter.\n  The only prerequisite to running this code is that you have installed the ruby-oci8 gem on your machine."
+  s.email = "billy.reisinger@gmail.com"
+  s.executables = ["oci8_simple", "describe", "show"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -42,43 +40,36 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/show_test.rb"
   ]
-  s.homepage = %q{http://github.com/unclebilly/oci8_simple}
+  s.homepage = "http://github.com/unclebilly/oci8_simple"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Command-line tools for interacting with an Oracle database.}
-  s.test_files = [
-    "test/cli_test.rb",
-    "test/client_test.rb",
-    "test/describe_test.rb",
-    "test/helper.rb",
-    "test/show_test.rb"
-  ]
+  s.rubygems_version = "1.8.19"
+  s.summary = "Command-line tools for interacting with an Oracle database."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
+      s.add_runtime_dependency(%q<ruby-oci8>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
     else
-      s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
+      s.add_dependency(%q<ruby-oci8>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
     end
   else
-    s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
+    s.add_dependency(%q<ruby-oci8>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
   end
 end

data/test/cli_test.rb

@@ -23,6 +23,9 @@ class CliTest < Test::Unit::TestCase
       should "format results for the command line" do
         assert_equal("1, Johnny, OMG\n2, Jenny, OMG", @cli.run("select * from oci8_simple_test"))
       end
+      should "format results for the command line using column names" do
+        assert_equal("name: Johnny\n\nname: Jenny", @cli.run("select name from oci8_simple_test", :hash => true))
+      end
     end
     context "without an env" do
       setup do

data/test/client_test.rb

@@ -55,6 +55,9 @@ class ClientTest < Test::Unit::TestCase
       should "be able to run a simple query with multiple results and multiple columns" do
         assert_equal [["1", "Johnny", "OMG"], ["2", "Jenny", "OMG"]], @client.run("select * from OCI8_SIMPLE_TEST")
       end
+      should "be able to run a simple query with a single result and return a hash" do
+        assert_equal [{:count => 2}], @client.run("select count(*) as count from OCI8_SIMPLE_TEST", :hash => true)
+      end
     
       should "have logged something" do
         File.unlink(Oci8Simple::Client::LOG_FILE)

data/test/describe_test.rb

@@ -20,16 +20,14 @@ class DescribeTest < Test::Unit::TestCase
       end
       should "format results for the command line" do
         expected=<<-STR
-Required  Name        Type      Size  Char?  Char_size  Precision  Scale  Default   
-------------------------------------------------------------------------------------
-       *  id          number    22                      38         0      7         
-       *  long_thing  varchar2  4000  *      2000                         a a a a a ...
-       *  name        varchar2  1600  *      400                          FOO       
-          texts       clob                                                          
+Required  Name        Type      Size    Char?  Char_size  Precision  Scale  Default   
+--------------------------------------------------------------------------------------
+       *  id          number    22.0                      38.0       0.0    7         
+       *  long_thing  varchar2  4000.0  *      2000.0                       a a a a a ...
+       *  name        varchar2  1600.0  *      400.0                        FOO       
+          texts       clob                                                            
 STR
-        # puts
-        # puts expected.chop
-        # puts @describe.run("oci8_simple_test")
+
         assert_equal(expected.chop, @describe.run("oci8_simple_test"))
       end
     end

data/test/helper.rb

@@ -10,6 +10,7 @@ end
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
+require 'pry'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oci8_simple
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Billy Reisinger
@@ -15,28 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 -05:00
-default_executable: 
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-oci8
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: "0"
+  version_requirements: *id001
+  name: ruby-oci8
   prerelease: false
-  type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,44 +42,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id002
+  name: shoulda
   prerelease: false
-  type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
+  version_requirements: *id003
+  name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: mocha
   prerelease: false
-  type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id005
+  name: pry
   prerelease: false
-  type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-oci8
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,18 +100,18 @@ dependencies:
         - 0
         - 4
         version: 2.0.4
+  version_requirements: *id006
+  name: ruby-oci8
   prerelease: false
-  type: :runtime
-  requirement: *id006
 description: |-
   Command-line tools for interacting with an Oracle database. This client is intended to be used 
     to aid development and automation.  This is *not* meant to replace an ORM such as ActiveRecord + OracleEnhancedAdapter.
     The only prerequisite to running this code is that you have installed the ruby-oci8 gem on your machine.
 email: billy.reisinger@gmail.com
 executables: 
-- show
 - oci8_simple
 - describe
+- show
 extensions: []
 
 extra_rdoc_files: 
@@ -146,7 +139,6 @@ files:
 - test/describe_test.rb
 - test/helper.rb
 - test/show_test.rb
-has_rdoc: true
 homepage: http://github.com/unclebilly/oci8_simple
 licenses: 
 - MIT
@@ -176,13 +168,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Command-line tools for interacting with an Oracle database.
-test_files: 
-- test/cli_test.rb
-- test/client_test.rb
-- test/describe_test.rb
-- test/helper.rb
-- test/show_test.rb
+test_files: []
+