picky 4.7.0 → 4.8.0

data/lib/picky/constants.rb

@@ -5,6 +5,5 @@
 #
 ENV['PICKY_ENV'] ||= ENV['RUBY_ENV'] || ENV['RACK_ENV']
 PICKY_ENVIRONMENT = ENV['PICKY_ENV'] || 'development' unless defined? PICKY_ENVIRONMENT
-PICKY_ROOT        = Dir.pwd unless defined? PICKY_ROOT
 
 EMPTY_STRING = ''.freeze unless defined? EMPTY_STRING

data/lib/picky/index.rb

@@ -181,8 +181,10 @@ module Picky
     
     # The directory used by this index.
     #
+    # Note: Used @directory ||=, but needs to be dynamic.
+    #
     def directory
-      @directory ||= ::File.join(PICKY_ROOT, 'index', PICKY_ENVIRONMENT, name.to_s)
+      ::File.join(Picky.root, 'index', PICKY_ENVIRONMENT, name.to_s)
     end
 
     # Make this category range searchable with a fixed range. If you need other

data/lib/picky/loader.rb

@@ -10,7 +10,7 @@ module Picky
       # First itself, then the app.
       #
       def reload app_file = 'app'
-        Dir.chdir PICKY_ROOT
+        Dir.chdir Picky.root
         exclaim 'Reloading loader.'
         load_self
         exclaim 'Reloading framework.'
@@ -37,7 +37,7 @@ module Picky
       # Load a user file.
       #
       def load_user filename
-        Kernel.load File.join(PICKY_ROOT, "#{filename}.rb")
+        Kernel.load File.join(Picky.root, "#{filename}.rb")
       end
 
       # Load the user's application.
@@ -45,7 +45,7 @@ module Picky
       def load_application file = 'app'
         load_user file
       rescue LoadError => e
-        exclaim "\nBy default, Picky needs/loads the PICKY_ROOT/app.rb file as the app.\n\n"
+        exclaim "\nBy default, Picky needs/loads the <Picky.root>/app.rb file as the app.\n\n"
         raise e
       end
       

data/lib/picky/loggers/verbose.rb

@@ -11,11 +11,11 @@ module Picky
       end
       
       def tokenize index_or_category, prepared_file
-        timed_exclaim %Q{  "#{index_or_category.identifier}": Tokenized -> #{prepared_file.path.gsub("#{PICKY_ROOT}/", '')}.}
+        timed_exclaim %Q{  "#{index_or_category.identifier}": Tokenized -> #{prepared_file.path.gsub("#{Picky.root}/", '')}.}
       end
       
       def dump category
-        timed_exclaim %Q{  "#{category.identifier}": Dumped -> #{category.index_directory.gsub("#{PICKY_ROOT}/", '')}/#{category.name}_*.}
+        timed_exclaim %Q{  "#{category.identifier}": Dumped -> #{category.index_directory.gsub("#{Picky.root}/", '')}/#{category.name}_*.}
       end
       
       def load category

data/lib/picky.rb

@@ -1,5 +1,13 @@
 module Picky
   
+  # Picky class methods.
+  #  * logger: Picky specific logger.
+  #  * root: Root used for Picky (eg. index directories).
+  #
+  class << self
+    attr_accessor :logger, :root
+  end
+  
   # Set default encoding.
   # (Note: Rails does this already as well)
   #
@@ -38,6 +46,11 @@ module Picky
   # Require the constants.
   #
   require_relative 'picky/constants'
+  
+  # Set the root path of Picky.
+  # (necessary for the index directory etc.)
+  #
+  Picky.root = Dir.pwd
 
   # Loader which handles framework and app loading.
   #
@@ -50,13 +63,14 @@ module Picky
   # Check if delegators need to be installed.
   #
   require_relative 'picky/sinatra'
-
-  # This is only used in the classic project style.
-  #
-  class << self
-    attr_accessor :logger
-  end
   
+  # Set the default logger.
+  #
+  # Options include:
+  #  * Loggers::Silent
+  #  * Loggers::Concise (default)
+  #  * Loggers::Verbose
+  #  
   self.logger = Loggers::Default
 
 end

data/lib/tasks/server.rake

@@ -35,12 +35,12 @@ namespace :server do
   end
 
   def chdir_to_root
-    Dir.chdir PICKY_ROOT
+    Dir.chdir Picky.root
   end
 
   def current_pid
     pidfile = 'tmp/pids/unicorn.pid'
-    pid = `cat #{File.join(PICKY_ROOT, pidfile)}`
+    pid = `cat #{File.join(Picky.root, pidfile)}`
     if pid.blank?
       puts
       puts "No server running (no #{pidfile} found)."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement