lol_dba 1.4.3 → 1.5.0

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
   - Gemfile
 script: "bundle exec rake"

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activerecord'
 gem 'actionpack'

data/Gemfile.lock

@@ -1,73 +1,73 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    json (1.7.5)
-    multi_json (1.5.0)
-    rack (1.4.1)
+    json (1.7.7)
+    multi_json (1.6.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    tzinfo (0.3.35)
+    sqlite3 (1.3.7)
+    thor (0.17.0)
+    tilt (1.3.5)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/bin/lol_dba

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+if File.exists?(File.join(File.expand_path('../../', __FILE__), '.git'))
+  $:.unshift(File.expand_path('../../lib', __FILE__))
+end
+
+require 'lol_dba'
+require 'lol_dba/cli'
+
+LolDba::CLI.start

data/lib/lol_dba.rb

@@ -74,7 +74,7 @@ EOM
   end
 
   def self.check_for_indexes(migration_format = false)
-    Dir.glob(Rails.root + "app/models/**/*.rb").each {|file| require file }
+    Dir.glob(Rails.root + "app/models/**/*.rb").sort.each {|file| require file }
 
     model_classes = []
     ObjectSpace.each_object(Module) do |obj|

data/lib/lol_dba/cli.rb

@@ -0,0 +1,53 @@
+require 'optparse'
+
+module LolDba
+  class CLI
+
+    class << self
+      def start
+        options = {:format => 'migration'}
+        OptionParser.new do |opts|
+          opts.on("-f", '--format=[FORMAT]', 'Specify the format to be used (migration or sql), defaults to migration.') { |v| options[:format] = v }
+          opts.on('-d', '--debug', 'Show stack traces when an error occurs.') { |v| options[:debug] = v }
+        end.parse!
+        new(Dir.pwd, options).start
+      end
+    end
+
+    def initialize(path, options)
+      @path, @options = path, options
+    end
+
+    def start
+      load_application
+      validate_format!
+      send("generate_#{@options[:format]}")
+    rescue Exception => e
+      $stderr.puts "Failed: #{e.class}: #{e.message}"
+      $stderr.puts e.backtrace.map { |t| "    from #{t}" } if @options[:debug]
+    end
+
+    protected
+
+    def validate_format!
+      unless self.respond_to?("generate_#{@options[:format]}")
+        $stderr.puts "Unknown format: #{@options[:format]}"
+        exit 1
+      end
+    end
+
+    # Tks to https://github.com/voormedia/rails-erd/blob/master/lib/rails_erd/cli.rb
+    def load_application
+      $stderr.puts "Loading application in '#{File.basename(@path)}'..."
+      require "#{@path}/config/environment"
+    end
+
+    def generate_sql
+      LolDba::SqlGenerator.generate
+    end
+
+    def generate_migration
+      LolDba.simple_migration
+    end
+  end
+end

data/lib/lol_dba/version.rb

@@ -1,3 +1,3 @@
 module LolDba
-  VERSION = "1.4.3" unless defined? LolDba::VERSION
+  VERSION = "1.5.0" unless defined? LolDba::VERSION
 end

data/lol_dba.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
   s.description = "lol_dba is a small package of rake tasks that scan your application models and displays a list of columns that probably should be indexed. Also, it can generate .sql migration scripts."
 
   s.files         = `git ls-files`.split("\n")
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib", "lib/lol_dba"]
 
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'actionpack', '>= 3.0'
   s.add_dependency 'railties', '>= 3.0'
-end
+end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ ActiveRecord::Base.establish_connection(
 
 class Rails
   def self.root
-    "spec/fixtures"
+    "spec/fixtures/"
   end
 end
 
@@ -21,8 +21,5 @@ load 'fixtures/schema.rb'
 
 root_dir = File.dirname(__FILE__)
 
-# Load models
-Dir["#{root_dir}/fixtures/app/models/**/*.rb"].each { |f| require f}
-
-# load controllers
-Dir["#{root_dir}/fixtures/app/controllers/**/*.rb"].each { |f| require f}
+#add current dir to the load path
+$:.unshift('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-31 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -71,7 +71,8 @@ email:
 - elad@eizesus.com
 - ''
 - vsharshov@gmail.com
-executables: []
+executables:
+- lol_dba
 extensions: []
 extra_rdoc_files: []
 files:
@@ -81,7 +82,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/lol_dba
 - lib/lol_dba.rb
+- lib/lol_dba/cli.rb
 - lib/lol_dba/migration.rb
 - lib/lol_dba/railtie.rb
 - lib/lol_dba/sql_generator.rb
@@ -128,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A small package of rake tasks to track down missing database indexes and