slacker 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -21,7 +21,6 @@ GEM
     ruby-odbc (0.99994)
 
 PLATFORMS
-  ruby
   x86-mingw32
 
 DEPENDENCIES

data/LICENSE

@@ -1,3 +1,3 @@
 == slacker
 
-Put appropriate LICENSE for your project here.
+Put appropriate LICENSE for your project here.

data/bin/slacker

@@ -1,29 +1,29 @@
-#!/usr/bin/env ruby
-require 'bundler/setup'
-require 'slacker'
-require 'yaml'
-require 'slacker/command_line_formatter'
-
-def db_config_from_file(file_path)
-  dbconfig = nil
-  File.open(file_path) do |dbconfig_file|
-    dbconfig = YAML::load(dbconfig_file)
-  end
-  dbconfig
-end
-
-# Preset the application to run on the console
-Slacker.configure do |config|
-  config.console_enabled = true
-  config.formatter = Slacker::CommandLineFormatter.new($stdout)
-
-  # Setup the target connection based on the contents in database.yml
-  db_config = db_config_from_file(config.expand_path('database.yml'))
-
-  config.db_server = db_config["server"]
-  config.db_name = db_config["database"]
-  config.db_user = db_config["user"]
-  config.db_password = db_config["password"]
-end
-
-Slacker.application.run
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'slacker'
+require 'yaml'
+require 'slacker/command_line_formatter'
+
+def db_config_from_file(file_path)
+  dbconfig = nil
+  File.open(file_path) do |dbconfig_file|
+    dbconfig = YAML::load(dbconfig_file)
+  end
+  dbconfig
+end
+
+# Preset the application to run on the console
+Slacker.configure do |config|
+  config.console_enabled = true
+  config.formatter = Slacker::CommandLineFormatter.new($stdout)
+
+  # Setup the target connection based on the contents in database.yml
+  db_config = db_config_from_file(config.expand_path('database.yml'))
+
+  config.db_server = db_config["server"]
+  config.db_name = db_config["database"]
+  config.db_user = db_config["user"]
+  config.db_password = db_config["password"]
+end
+
+Slacker.application.run

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
 module Slacker
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/slacker.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.executables = ['slacker']
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9.2'
+ 
   s.add_dependency 'bundler', '~>1.0.15'
   s.add_dependency 'ruby-odbc', '=0.99994'
   s.add_dependency 'rspec', '=2.5.0'

data/spec/rspec_ext_spec.rb

@@ -1,127 +1,127 @@
-require 'slacker'
-require 'spec_helper'
-require 'ostruct'
-
-class RSpecSlackerHost
-  include Slacker::RSpecExt
-end
-
-describe Slacker::RSpecExt do
-  before(:each) do
-    Slacker::configure do |config|
-      config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
-    end
-
-    example = OpenStruct.new
-    example.metadata = {:sql => '', :example_group => {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_xyz.rb')}}
-
-    @instance = RSpecSlackerHost.new
-    @instance.stub(:example).and_return(example)
-  end
-
-  it 'responds to query' do
-    @instance.should respond_to(:query)
-  end
-
-  it 'responds to match' do
-    @instance.should respond_to(:match)
-  end
-
-  it 'responds to csv' do
-    @instance.should respond_to(:csv)
-  end
-
-  it 'responds to load_csv' do
-    @instance.should respond_to(:load_csv)
-  end
-
-  it 'responds to result' do
-    @instance.should respond_to(:result)
-  end
-
-  it 'responds to sql' do
-    @instance.should respond_to(:sql)
-  end
-
-  context 'responds to ghost methods' do
-    before(:each) do
-      Slacker.application.stub(:query_script) {|sql| sql}
-    end
-
-    specify 'described as SQL files found in the sql/helpers folder' do
-      @instance.sql.respond_to?(:helpers).should be_true
-      @instance.sql.helpers.respond_to?(:helper_1).should be_true
-      @instance.sql.helpers.helper_1.should == 'helpers/helper_1.sql called'
-    end
-
-    specify 'described as SQL.ERB files found in the sql/helpers folder' do
-      @instance.sql.helpers.respond_to?(:helper_2).should be_true
-      @instance.sql.helpers.helper_2.should == 'helpers/helper_2.sql.erb called'
-    end
-
-    specify 'with SQL files taking priority over SQL.ERB files' do
-      @instance.sql.helpers.respond_to?(:helper_3).should be_true
-      @instance.sql.helpers.helper_3.should == 'helpers/helper_3.sql called'
-    end
-
-    specify 'but ignores non-existing methods' do
-      @instance.sql.helpers.respond_to?(:some_bogus_method).should be_false
-    end
-
-    specify 'but ignores files which are not with SQL or SQL.ERB extension' do
-      @instance.sql.helpers.respond_to?(:text_file_1).should be_false
-    end
-
-    specify 'and is case insensitive' do
-      @instance.sql.helpers.respond_to?(:helper_4).should be_true
-      @instance.sql.helpers.respond_to?(:hElpEr_4).should be_true
-      @instance.sql.helpers.helper_4.should == 'helpers/HELPER_4.SQL called'
-      @instance.sql.helpers.heLpEr_4.should == 'helpers/HELPER_4.SQL called'
-    end
-
-    specify 'from folders other than helpers' do
-      @instance.sql.respond_to?(:example_1).should be_true
-      @instance.sql.example_1.respond_to?(:helper_1).should be_true
-      @instance.sql.example_1.helper_1.should == 'example_1/helper_1.sql called'
-    end
-
-    specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
-      @instance.sql.respond_to?(:nest).should be_true
-      @instance.sql.nest.respond_to?(:example_1).should be_true
-      @instance.sql.nest.example_1.respond_to?(:helper_1).should be_true
-      @instance.sql.nest.example_1.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
-    end
-
-#    context do
-#      before(:each) do
-#        # Fake the current example in the RSpec ext
-#        @example = OpenStruct.new :metadata => {:sql => ''}
-#        @instance.stub(:example).and_return(@example)
-#      end
-#
-#      specify "with files from the current example's file folder taking priority over the helpers folder" do
-#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
-#        @instance.sql.respond_to?(:helper_1).should be_true
-#        @instance.sql.helper_1.should == 'example_1/helper_1.sql called'
-#      end
-#
-#      specify "in example group giving priority to SQL files over SQL.ERB files" do
-#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
-#        @instance.sql.respond_to?(:helper_2).should be_true
-#        @instance.sql.helper_2.should == 'example_1/helper_2.sql called'
-#      end
-#
-#      specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
-#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/nest/example_1.rb')}
-#        @instance.sql.respond_to?(:helper_1).should be_true
-#        @instance.sql.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
-#      end
-#
-#      specify "falls back to the global helper when there is no matching file in the example folder" do
-#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
-#        @instance.sql.respond_to?(:helper_3).should be_true
-#        @instance.sql.helper_3.should == 'helpers/helper_3.sql called'
-#      end
-#    end
-  end
+require 'slacker'
+require 'spec_helper'
+require 'ostruct'
+
+class RSpecSlackerHost
+  include Slacker::RSpecExt
+end
+
+describe Slacker::RSpecExt do
+  before(:each) do
+    Slacker::configure do |config|
+      config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
+    end
+
+    example = OpenStruct.new
+    example.metadata = {:sql => '', :example_group => {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_xyz.rb')}}
+
+    @instance = RSpecSlackerHost.new
+    @instance.stub(:example).and_return(example)
+  end
+
+  it 'responds to query' do
+    @instance.should respond_to(:query)
+  end
+
+  it 'responds to match' do
+    @instance.should respond_to(:match)
+  end
+
+  it 'responds to csv' do
+    @instance.should respond_to(:csv)
+  end
+
+  it 'responds to load_csv' do
+    @instance.should respond_to(:load_csv)
+  end
+
+  it 'responds to result' do
+    @instance.should respond_to(:result)
+  end
+
+  it 'responds to sql' do
+    @instance.should respond_to(:sql)
+  end
+
+  context 'responds to ghost methods' do
+    before(:each) do
+      Slacker.application.stub(:query_script) {|sql| sql}
+    end
+
+    specify 'described as SQL files found in the sql/helpers folder' do
+      @instance.sql.respond_to?(:helpers).should be_true
+      @instance.sql.helpers.respond_to?(:helper_1).should be_true
+      @instance.sql.helpers.helper_1.should == 'helpers/helper_1.sql called'
+    end
+
+    specify 'described as SQL.ERB files found in the sql/helpers folder' do
+      @instance.sql.helpers.respond_to?(:helper_2).should be_true
+      @instance.sql.helpers.helper_2.should == 'helpers/helper_2.sql.erb called'
+    end
+
+    specify 'with SQL files taking priority over SQL.ERB files' do
+      @instance.sql.helpers.respond_to?(:helper_3).should be_true
+      @instance.sql.helpers.helper_3.should == 'helpers/helper_3.sql called'
+    end
+
+    specify 'but ignores non-existing methods' do
+      @instance.sql.helpers.respond_to?(:some_bogus_method).should be_false
+    end
+
+    specify 'but ignores files which are not with SQL or SQL.ERB extension' do
+      @instance.sql.helpers.respond_to?(:text_file_1).should be_false
+    end
+
+    specify 'and is case insensitive' do
+      @instance.sql.helpers.respond_to?(:helper_4).should be_true
+      @instance.sql.helpers.respond_to?(:hElpEr_4).should be_true
+      @instance.sql.helpers.helper_4.should == 'helpers/HELPER_4.SQL called'
+      @instance.sql.helpers.heLpEr_4.should == 'helpers/HELPER_4.SQL called'
+    end
+
+    specify 'from folders other than helpers' do
+      @instance.sql.respond_to?(:example_1).should be_true
+      @instance.sql.example_1.respond_to?(:helper_1).should be_true
+      @instance.sql.example_1.helper_1.should == 'example_1/helper_1.sql called'
+    end
+
+    specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
+      @instance.sql.respond_to?(:nest).should be_true
+      @instance.sql.nest.respond_to?(:example_1).should be_true
+      @instance.sql.nest.example_1.respond_to?(:helper_1).should be_true
+      @instance.sql.nest.example_1.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
+    end
+
+#    context do
+#      before(:each) do
+#        # Fake the current example in the RSpec ext
+#        @example = OpenStruct.new :metadata => {:sql => ''}
+#        @instance.stub(:example).and_return(@example)
+#      end
+#
+#      specify "with files from the current example's file folder taking priority over the helpers folder" do
+#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
+#        @instance.sql.respond_to?(:helper_1).should be_true
+#        @instance.sql.helper_1.should == 'example_1/helper_1.sql called'
+#      end
+#
+#      specify "in example group giving priority to SQL files over SQL.ERB files" do
+#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
+#        @instance.sql.respond_to?(:helper_2).should be_true
+#        @instance.sql.helper_2.should == 'example_1/helper_2.sql called'
+#      end
+#
+#      specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
+#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/nest/example_1.rb')}
+#        @instance.sql.respond_to?(:helper_1).should be_true
+#        @instance.sql.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
+#      end
+#
+#      specify "falls back to the global helper when there is no matching file in the example folder" do
+#        @example.metadata[:example_group] = {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_1.rb')}
+#        @instance.sql.respond_to?(:helper_3).should be_true
+#        @instance.sql.helper_3.should == 'helpers/helper_3.sql called'
+#      end
+#    end
+  end
 end

data/spec/test_files/matcher/test_1.csv

@@ -1,3 +1,3 @@
-"Field 1","Field_2","b"
-12,,""
-"test string",01/01/2011,8.9
+"Field 1","Field_2","b"
+12,,""
+"test string",01/01/2011,8.9

data/spec/test_files/test_slacker_project/data/test_1.csv

@@ -1,3 +1,3 @@
-"Field 1","Field_2","b"
-12,10,11
-"test string",01/01/2011,8.9
+"Field 1","Field_2","b"
+12,10,11
+"test string",01/01/2011,8.9

data/spec/test_files/test_slacker_project/sql/no_params.sql.erb

@@ -1,3 +1,3 @@
-<%2.times do |i|%>
-select <%=i+1%>;
+<%2.times do |i|%>
+select <%=i+1%>;
 <%end%>

metadata

@@ -2,7 +2,7 @@
 name: slacker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Vassil Kovatchev
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: