dnif 0.0.1.beta.5 → 0.0.1.beta.6

data/Gemfile

@@ -5,12 +5,10 @@ gem "activerecord", ">= 3.0.0", :require => "active_record"
 gem "activesupport", ">= 3.0.0", :require => "active_support"
 gem "riddle", ">= 1.1.0"
 gem "builder", ">= 2.1.2"
-gem "awesome_print", :require => "ap"
 
 group :development do
   gem "jeweler", ">= 1.5.0.pre2"
   gem "rspec", ">= 2.0.0.beta.20"
   gem "database_cleaner"
-  gem "awesome_print", :require => "ap"
   gem "sqlite3-ruby", :require => "sqlite3"
 end

data/Gemfile.lock

@@ -13,7 +13,6 @@ GEM
     activesupport (3.0.0)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    awesome_print (0.2.1)
     builder (2.1.2)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
@@ -42,7 +41,6 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 3.0.0)
   activesupport (>= 3.0.0)
-  awesome_print
   builder (>= 2.1.2)
   database_cleaner
   jeweler (>= 1.5.0.pre2)

data/dnif.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnif}
-  s.version = "0.0.1.beta.5"
+  s.version = "0.0.1.beta.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Souza"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2010-09-08}
   s.description = %q{dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields}
   s.email = %q{me@rafaelss.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/dnif/index.rb",
     "lib/dnif/indexer.rb",
     "lib/dnif/multi_attribute.rb",
+    "lib/dnif/railtie.rb",
     "lib/dnif/schema.rb",
     "lib/dnif/search.rb",
     "lib/dnif/tasks.rb",
@@ -84,11 +85,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<riddle>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
@@ -96,11 +95,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<riddle>, [">= 1.1.0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
       s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
@@ -109,11 +106,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<riddle>, [">= 1.1.0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
     s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end

data/lib/dnif/railtie.rb

@@ -0,0 +1,17 @@
+require "dnif"
+require "rails"
+
+module Dnif
+  class Railtie < Rails::Railtie
+
+    config.to_prepare do
+      Dnif.root_path = Rails.root
+      Dnif.environment = Rails.env
+      Dnif.models_path = File.join(Rails.root, "app", "models")
+    end
+
+    rake_tasks do
+      load "dnif/tasks.rb"
+    end
+  end
+end

data/lib/dnif/tasks.rb

@@ -1,27 +1,30 @@
-require "riddle"
 require "fileutils"
 
-if defined?(Rails)
-  Dnif.root_path = Rails.root
-  Dnif.environment = Rails.env
-  Dnif.models_path = File.join(Rails.root, "app", "models")
-end
-
 def controller
   require 'riddle'
 
-  root_path = Dnif.root_path || "."
-
   configuration = Riddle::Configuration.new
-  configuration.searchd.pid_file   = "#{root_path}/log/searchd.#{Dnif.environment}.pid"
-  configuration.searchd.log        = "#{root_path}/log/searchd.log"
-  configuration.searchd.query_log  = "#{root_path}/log/searchd.query.log"
+  configuration.searchd.pid_file   = "#{Dnif.root_path}/log/searchd.#{Dnif.environment}.pid"
+  configuration.searchd.log        = "#{Dnif.root_path}/log/searchd.log"
+  configuration.searchd.query_log  = "#{Dnif.root_path}/log/searchd.query.log"
 
-  Riddle::Controller.new(configuration, "#{root_path}/config/sphinx/#{Dnif.environment}.conf")
+  Riddle::Controller.new(configuration, "#{Dnif.root_path}/config/sphinx/#{Dnif.environment}.conf")
 end
 
 namespace :dnif do
 
+  if !Rake::Task.task_defined?(:environment)
+    desc "Set default values for Dnif"
+    task :environment do
+      Dnif.root_path ||= Dir.pwd
+      Dnif.environment ||= "development"
+
+      if !Dnif.models_path.nil?
+        Dnif.load_models
+      end
+    end
+  end
+
   desc "Generates the configuration file needed for sphinx"
   task :configure => :environment do
     if Dnif.models_path.nil?
@@ -29,22 +32,19 @@ namespace :dnif do
       exit
     end
 
-    Dnif.root_path ||= File.expand_path(File.dirname("."))
-    Dnif.environment ||= "development"
-
     config_path = File.join(Dnif.root_path, "config/sphinx")
-    if not File.exist?(config_path)
+    if !File.exist?(config_path)
       FileUtils.mkdir_p(config_path)
     end
 
     base_path = File.join(config_path, Dnif.environment + ".erb")
-    if not File.exist?(base_path)
+    if !File.exist?(base_path)
       FileUtils.cp(File.dirname(__FILE__) + "/../../templates/config.erb", base_path) # TODO change this path. find out how this kind of stuff is handle in others gems
     end
 
     Dnif.load_models
     path = Dnif::Configuration.generate(base_path)
-    ap "\n> config generated: #{path}"
+    puts "\n>> config generated: #{path}"
   end
 
   desc "Generates the XML used by sphinx to create indexes"
@@ -59,21 +59,24 @@ namespace :dnif do
   desc "Index data for sphinx"
   task :index => :environment do
     controller.index(:verbose => true)
-    ap "\n> data indexed"
+    puts "\n>> data indexed" # TODO show this only whether daemon is really indexed
   end
 
   desc "Stop sphinx daemon"
   task :stop => :environment do
     controller.stop
-    ap "\n> daemon stopped"
+    puts "\n>> daemon stopped" # TODO show this only whether daemon is really stopped
   end
 
   desc "Start sphinx daemon"
   task :start => :environment do
     controller.start
-    ap "\n> daemon started"
+    puts "\n>> daemon started" # TODO show this only whether daemon is really started
   end
 
+  desc "Restart sphinx daemon"
+  task :restart => [ :stop, :start ]
+
   desc "Rebuild sphinx index"
-  task :rebuild => [:index, :stop, :start]
+  task :rebuild => [ :index, :restart ]
 end

data/lib/dnif/version.rb

@@ -3,7 +3,7 @@ module Dnif
     MAJOR = 0
     MINOR = 0
     PATCH = 1
-    BUILD = "beta.5"
+    BUILD = "beta.6"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - beta
-  - 5
-  version: 0.0.1.beta.5
+  - 6
+  version: 0.0.1.beta.6
 platform: ruby
 authors: 
 - Rafael Souza
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -03:00
+date: 2010-09-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,22 +92,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,10 +107,10 @@ dependencies:
         version: 1.5.0.pre2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,23 +124,10 @@ dependencies:
         version: 2.0.0.beta.20
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,10 +137,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,7 +150,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id009
 description: dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields
 email: me@rafaelss.com
 executables: []
@@ -199,6 +173,7 @@ files:
 - lib/dnif/index.rb
 - lib/dnif/indexer.rb
 - lib/dnif/multi_attribute.rb
+- lib/dnif/railtie.rb
 - lib/dnif/schema.rb
 - lib/dnif/search.rb
 - lib/dnif/tasks.rb
@@ -237,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3469001460397063451
+      hash: -3817415889434215376
       segments: 
       - 0
       version: "0"