oculus 0.9.0 → 0.9.1

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+branches:
+  except:
+    - demo
 before_script:
 - "export DISPLAY=:99.0"
 - "sh -e /etc/init.d/xvfb start"

data/README.md

@@ -15,11 +15,15 @@ readonly MySQL account.**
 ## Installation
 
     $ gem install oculus
+    $ gem install mysql2 # to enable MySQL support
+    $ gem install pg     # to enable Postgres support
 
 ## Usage
 
 Oculus is a Sinatra app. Run it from the command line, or mount `Oculus::Server`
-as middleware in your Rack application.
+as middleware in your Rack application (recommended). For more information on
+mounting Oculus as middleware, see the wiki:
+[Running with Rack](https://github.com/paulrosania/oculus/wiki/Running-with-Rack).
 
 For details on command line options, run:
 

data/TODO.md

@@ -2,11 +2,16 @@
 
 ## Upcoming (pre-1.0)
 
-* Setup instructions
 * New user experience
+* Useful error message for bad MySQL credentials
 
 ## Eventually (1.1 or later)
 
+* Don't load results unless necessary
+* Paginate large result sets? (probably no)
 * Restartable queries
 * Reports/query groups
 * Processlist monitor
+* Email notifications
+* True multiuser
+* Comments

data/lib/oculus/connection.rb

@@ -1,6 +1,3 @@
-require 'oculus/connection/mysql2'
-require 'oculus/connection/postgres'
-
 module Oculus
   module Connection
     class Error < StandardError; end
@@ -9,8 +6,10 @@ module Oculus
     def self.connect(options)
       case options[:adapter]
       when 'mysql'
+        require 'oculus/connection/mysql2'
         Mysql2
       when 'postgres', 'pg'
+        require 'oculus/connection/postgres'
         Postgres
       else
         raise AdapterNotFound, "#{options[:adapter]} is not currently implemented. You should write it!"

data/lib/oculus/storage/file_store.rb

@@ -70,7 +70,7 @@ module Oculus
 
       class File < ::File
         def self.parse(path)
-          file = File.open(path)
+          file = File.open(path, 'r:UTF-8')
 
           file.flock(File::LOCK_EX)
           attributes = file.attributes
@@ -88,7 +88,7 @@ module Oculus
         end
 
         def write_results(results)
-          csv_data = CSV.generate do |csv|
+          csv_data = CSV.generate(:encoding => 'UTF-8') do |csv|
             csv << results.first
             results[1..-1].each do |result|
               csv << result

data/lib/oculus/version.rb

@@ -1,3 +1,3 @@
 module Oculus
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/oculus.rb

@@ -27,7 +27,7 @@ module Oculus
   end
 
   def connection_string
-    user = "#{connection_options[:user]}@" if connection_options[:user]
+    user = "#{connection_options[:username]}@" if connection_options[:username]
     port = ":#{connection_options[:port]}" if connection_options[:port]
     "#{connection_options[:adapter]}://#{user}#{connection_options[:host]}#{port}/#{connection_options[:database]}"
   end

data/oculus.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["paul.rosania@gmail.com"]
   gem.description   = %q{Oculus is a web-based logging SQL client.  It keeps a history of your queries and the results they returned, so your research is always at hand, easy to share and easy to repeat or reproduce in the future.}
   gem.summary       = %q{Oculus is a web-based logging SQL client.}
-  gem.homepage      = "https://github.com/paulrosania/oculus"
+  gem.homepage      = "http://oculusapp.com"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/spec/connection/mysql2_spec.rb

@@ -1,4 +1,5 @@
 require 'oculus'
+require 'oculus/connection/mysql2'
 
 describe Oculus::Connection::Mysql2 do
   subject { Oculus::Connection::Mysql2.new(:host => 'localhost', :database => 'oculus_test', :username => 'root') }

data/spec/connection/postgres_spec.rb

@@ -1,4 +1,5 @@
 require 'oculus'
+require 'oculus/connection/postgres'
 
 describe Oculus::Connection::Postgres do
   subject { Oculus::Connection::Postgres.new(:host => 'localhost', :database => 'oculus_test') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oculus
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70346142610300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70346142610300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70346142609780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70346142609780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346142609320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346142609320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70346142608500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70346142608500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346142607820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70346142607820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70346142607300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70346142607300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70346142606800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 0.3.11
   type: :development
   prerelease: false
-  version_requirements: *70346142606800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70346142606280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: 0.13.2
   type: :development
   prerelease: false
-  version_requirements: *70346142606280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.2
 description: Oculus is a web-based logging SQL client.  It keeps a history of your
   queries and the results they returned, so your research is always at hand, easy
   to share and easy to repeat or reproduce in the future.
@@ -154,7 +194,7 @@ files:
 - spec/file_store_spec.rb
 - spec/query_presenter_spec.rb
 - spec/query_spec.rb
-homepage: https://github.com/paulrosania/oculus
+homepage: http://oculusapp.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -174,17 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Oculus is a web-based logging SQL client.
-test_files:
-- features/query.feature
-- features/step_definitions/query_steps.rb
-- features/support/env.rb
-- spec/connection/mysql2_spec.rb
-- spec/connection/postgres_spec.rb
-- spec/connection_spec.rb
-- spec/file_store_spec.rb
-- spec/query_presenter_spec.rb
-- spec/query_spec.rb
+test_files: []