each_sql 0.4.0 → 0.4.1

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,14 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'citrus', '~> 2.4.1'
-gem 'erubis', '~> 2.7.0'
-gem 'quote_unquote', '~> 0.1.1'
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.2"
-end
+# Specify your gem's dependencies in each_sql.gemspec
+gemspec

data/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2011 Junegunn Choi
+Copyright (c) 2013 Junegunn Choi
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,45 +1,7 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "each_sql"
-  gem.homepage = "http://github.com/junegunn/each_sql"
-  gem.license = "MIT"
-  gem.summary = %Q{Enumerate each SQL statement in SQL scripts.}
-  gem.description = %Q{Enumerate each SQL statement in SQL scripts.}
-  gem.email = "junegunn.c@gmail.com"
-  gem.authors = ["Junegunn Choi"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
+require "bundler/gem_tasks"
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "each_sql #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/each_sql.gemspec

@@ -1,55 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{each_sql}
-  s.version = "0.2.3"
+Gem::Specification.new do |spec|
+  spec.name          = "each_sql"
+  spec.version       = "0.4.1"
+  spec.authors       = ["Junegunn Choi"]
+  spec.email         = ["junegunn.c@gmail.com"]
+  spec.description   = %q{Enumerate each SQL statement in SQL scripts.}
+  spec.summary       = %q{Enumerate each SQL statement in SQL scripts.}
+  spec.homepage      = "https://github.com/junegunn/each_sql"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Junegunn Choi"]
-  s.date = %q{2011-07-08}
-  s.description = %q{Enumerate each SQL statement in SQL scripts.}
-  s.email = %q{junegunn.c@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.rdoc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/each_sql.rb",
-    "lib/each_sql/each_sql.rb",
-    "test/helper.rb",
-    "test/postgres.sql",
-    "test/test_each_sql.rb"
-  ]
-  s.homepage = %q{http://github.com/junegunn/each_sql}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Enumerate each SQL statement in SQL scripts.}
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  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_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-  end
+  spec.add_runtime_dependency 'citrus', '~> 2.4.1'
+  spec.add_runtime_dependency 'erubis', '~> 2.7.0'
+  spec.add_runtime_dependency 'quote_unquote', '~> 0.1.1'
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end
-

data/lib/each_sql/parser/sql.citrus.erb

@@ -13,7 +13,7 @@ grammar EachSQL::Parser::Default<%= suffix %>
 
   rule begin_end_block
     begin_block
-      (begin_end_block | sql_statement | empty)+ 
+      (begin_end_block | sql_statement | empty)+
     end_block
     delimiters
   end
@@ -36,12 +36,12 @@ grammar EachSQL::Parser::Default<%= suffix %>
 
     !(begin_block | end_block) chunk
 
-    (chunk | empty)* 
+    (chunk | empty)*
     delimiters
   end
 
   rule delimiters
-    empty* delimiter 
+    empty* delimiter
     (empty | delimiter)*
   end
 
@@ -70,7 +70,11 @@ grammar EachSQL::Parser::Default<%= suffix %>
   end
 
   rule c_comment
-    '/*' (!'*/' .)* '*/'
+    '/*' (hint | !'*/' .)* '*/'
+  end
+
+  rule hint
+    '/*+' (!'*/' .)* '*/'
   end
 
   rule l_comment
@@ -112,7 +116,7 @@ grammar EachSQL::Parser::MySQL<%= suffix %>
 
   rule begin_end_block
     begin_block
-      (begin_end_block | sql_statement | empty)+ 
+      (begin_end_block | sql_statement | empty)+
     end_block
     delimiters
   end
@@ -127,7 +131,7 @@ grammar EachSQL::Parser::MySQL<%= suffix %>
 
     !(begin_block | end_block) chunk
 
-    (chunk | empty)* 
+    (chunk | empty)*
     delimiters
   end
 
@@ -156,7 +160,7 @@ grammar EachSQL::Parser::PostgreSQL<%= suffix %>
 
   rule begin_end_block
     begin_block
-      (begin_end_block | sql_statement | empty)+ 
+      (begin_end_block | sql_statement | empty)+
     end_block
     delimiters
   end
@@ -171,7 +175,7 @@ grammar EachSQL::Parser::PostgreSQL<%= suffix %>
 
     !(begin_block | end_block) chunk
 
-    (chunk | empty)* 
+    (chunk | empty)*
     delimiters
   end
 
@@ -201,7 +205,7 @@ grammar EachSQL::Parser::Oracle<%= suffix %>
 
   rule execution_block
     (
-      creation | 
+      creation |
       declare_begin_end_block |
       begin_end_block |
       sql_statement
@@ -209,7 +213,7 @@ grammar EachSQL::Parser::Oracle<%= suffix %>
   end
 
   rule declare_begin_end_block
-    declare 
+    declare
       sql_statement+
     begin_end_block
   end
@@ -219,7 +223,7 @@ grammar EachSQL::Parser::Oracle<%= suffix %>
 
     !('/' | create | declare | begin_block | end_block) chunk
 
-    (chunk | empty)* 
+    (chunk | empty)*
     delimiters
   end
 

data/test/helper.rb

@@ -1,17 +1,6 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'each_sql'
-
-class Test::Unit::TestCase
-end

data/test/test_each_sql.rb

@@ -27,17 +27,17 @@ class TestEachSql < Test::Unit::TestCase
   # Acceptance tests
   # ================
   def test_empty
-		[nil, "", " \n" * 10].each do |input|
-			EachSQL(input).each do |sql|
-				assert false, 'Should not enumerate'
-			end
+    [nil, "", " \n" * 10].each do |input|
+      EachSQL(input).each do |sql|
+        assert false, 'Should not enumerate'
+      end
 
       # Directly pass block
-			EachSQL(input) do |sql|
-				assert false, 'Should not enumerate'
-			end
-			assert true, 'No error expected'
-		end
+      EachSQL(input) do |sql|
+        assert false, 'Should not enumerate'
+      end
+      assert true, 'No error expected'
+    end
   end
 
   def test_parser_cache
@@ -55,16 +55,10 @@ class TestEachSql < Test::Unit::TestCase
 
   end
 
-	def test_sql
-    common = YAML.load(
-                     File.read(
-                       File.join(
-                         File.dirname(__FILE__), "yml/common.yml")))
+  def test_sql
+    common = YAML.load_file(File.expand_path("../yml/common.yml", __FILE__))
     [:default, :mysql, :oracle, :postgres].each do |typ|
-      data = YAML.load(
-               File.read(
-                 File.join(
-                   File.dirname(__FILE__), "yml/#{typ}.yml")))
+      data = YAML.load_file(File.expand_path("../yml/#{typ}.yml", __FILE__))
 
       script = nil
       [common, data].each do |d|
@@ -91,5 +85,5 @@ class TestEachSql < Test::Unit::TestCase
       assert_equal EachSQL(script, typ).to_a,
         EachSQL(script, typ).each.each.take_while { true }.map { |e| e }
     end
-	end
+  end
 end

data/test/yml/default.yml

@@ -2,9 +2,12 @@
 all: |
   select * from dual;
   DECLARE UDF1CUR CURSOR FOR SELECT UDF2();
-  select 
+  select
     begin , begin.* from begin;
   select b `begin` from dual;
+  /*
+    select /*+ hint */ 1 from dual;
+  */
   commit;
   rollback;
   select b "begin" from dual
@@ -13,9 +16,13 @@ each:
 - select * from dual
 - DECLARE UDF1CUR CURSOR FOR SELECT UDF2()
 - |
-  select 
+  select
     begin , begin.* from begin
 - select b `begin` from dual
-- commit
+- |
+  /*
+    select /*+ hint */ 1 from dual;
+  */
+  commit
 - rollback
 - select b "begin" from dual

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: each_sql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,39 +74,36 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 description: Enumerate each SQL statement in SQL scripts.
-email: junegunn.c@gmail.com
+email:
+- junegunn.c@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.markdown
+extra_rdoc_files: []
 files:
-- .document
+- .gitignore
 - CHANGELOG.markdown
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - each_sql.gemspec
 - lib/each_sql.rb
 - lib/each_sql/each_sql.rb
@@ -120,7 +117,7 @@ files:
 - test/yml/mysql.yml
 - test/yml/oracle.yml
 - test/yml/postgres.yml
-homepage: http://github.com/junegunn/each_sql
+homepage: https://github.com/junegunn/each_sql
 licenses:
 - MIT
 post_install_message: 
@@ -135,17 +132,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3224767987852485011
+      hash: 3688803514110298241
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3688803514110298241
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Enumerate each SQL statement in SQL scripts.
-test_files: []
+test_files:
+- test/helper.rb
+- test/postgres.sql
+- test/test_each_sql.rb
+- test/yml/common.yml
+- test/yml/default.yml
+- test/yml/mysql.yml
+- test/yml/oracle.yml
+- test/yml/postgres.yml

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/Gemfile.lock

@@ -1,23 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    citrus (2.4.1)
-    erubis (2.7.0)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    quote_unquote (0.1.1)
-    rake (0.9.2.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  citrus (~> 2.4.1)
-  erubis (~> 2.7.0)
-  jeweler (~> 1.6.2)
-  quote_unquote (~> 0.1.1)

data/VERSION

@@ -1 +0,0 @@
-0.4.0