boned 0.2.0 → 0.2.1

data/CHANGES.txt

@@ -1,5 +1,13 @@
 BONED, CHANGES
 
+#### 0.2.1 (2010-01-08) ###############################
+
+* FIXED: Missing config.ru error
+* FIXED: Redis available check
+* CHANGE: Use BONED_REDIS variable instead of redis.yml file
+* CHANGE: Start redis server if not running
+
+
 #### 0.1.0 (2009-12-13) ###############################
 
 Initial release

data/README.md

@@ -1,32 +1,35 @@
-## Bone - 0.2 ##
+## Boned - 0.2 ##
 
 **Bones it!**
 
 
-== Running
+## Running
     
     $ redis-server config/redis-server.conf
+    $ export BONED_REDIS=redis://localhost:4111/1
     $ boned start
     
     
-== Installation
+## Installation
 
     $ sudo gem install boned
-    
 
-== More Information
+You also need to install [redis](http://code.google.com/p/redis/). 
+
+
+## More Information
 
 
-== Credits
+## Credits
 
 * Delano Mandelbaum (http://solutious.com)
 
 
-== Thanks 
+## Thanks 
 
 * Kalin Harvey for the early feedback. 
 
 
-== License
+## License
 
 See LICENSE.txt

data/boned.gemspec

@@ -1,8 +1,8 @@
 @spec = Gem::Specification.new do |s|
   s.name = "boned"
   s.rubyforge_project = 'boned'
-  s.version = "0.2.0"
-  s.summary = "Get Bones"
+  s.version = "0.2.1"
+  s.summary = "The bone daemon"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
   s.email = "delano@solutious.com"
@@ -10,7 +10,7 @@
   
   s.extra_rdoc_files = %w[README.md LICENSE.txt CHANGES.txt]
   s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.md"]
   s.require_paths = %w[lib]
   
   s.executables = %w[boned]
@@ -18,15 +18,15 @@
   # = MANIFEST =
   # git ls-files
   s.files = %w(
+  CHANGES.txt
   LICENSE.txt
   README.md
   Rakefile
+  api/api-set.rb
+  api/api.rb
   bin/boned
   boned.gemspec
-  config/redis-default.yml
-  config/redis-server-default.conf
-  config/stella/api-set.rb
-  config/stella/api.rb
+  config.ru
   lib/boned.rb
   lib/boned/api.rb
   lib/boned/api/debug.rb

data/config.ru

@@ -0,0 +1,31 @@
+# Rackup - GetBones.com
+# 2009-12-11
+
+ENV['RACK_ENV'] ||= 'production'
+ENV['APP_ROOT'] = ::File.expand_path(::File.join(::File.dirname(__FILE__)))
+$:.unshift(::File.join(ENV['APP_ROOT'], 'lib'))
+
+require 'sinatra'
+
+require 'boned/api'
+
+disable :run    # disable sinatra's auto-application starting
+
+configure :production do
+  Boned.debug = false
+  
+  map("/#{Boned::APIVERSION}/")       { run Boned::API::Service      }
+  
+end
+
+configure :development do
+  use Rack::ShowExceptions
+  
+  require 'boned/api/debug'
+  require 'boned/api/redis'
+  
+  map("/#{Boned::APIVERSION}/")       { run Boned::API::Service      }
+  map("/debug")                       { run Boned::API::Debug        }  
+  map("/redis")                       { run Boned::API::RedisViewer  }
+
+end

data/lib/boned.rb

@@ -7,17 +7,23 @@ require 'attic'
 require 'gibbler/aliases'
 require 'sysinfo'
 require 'socket'
+require 'uri'
+require 'rye'
 
 unless defined?(BONED_HOME)
   BONED_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..') )
 end
 
-module Boned
-  APIVERSION = 'v1'.freeze unless defined?(APIVERSION)
+module Boned  
+  unless defined?(APIVERSION)
+    APIVERSION = 'v1'.freeze 
+    BONED_REDIS = "redis://127.0.0.1:8045/1".freeze
+  end
+  
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     PATCH = '001'
     def self.inspect; [to_s, PATCH].join('.'); end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
@@ -33,6 +39,7 @@ module Boned
   @debug = false
   @conf  = nil
   @redis = nil
+  @redis_thread = nil
   @sysinfo = nil
   class << self
     attr_accessor :debug
@@ -46,24 +53,30 @@ module Boned
       @sysinfo 
     end
   end
-  
+    
   # Connect to Redis and Mongo. 
-  def self.connect(conf=@conf)
-    @redis = Redis.new conf[:redis]
+  def self.connect
+    update_redis_client_config
+    start_redis unless redis_available?
+    abort "No Redis" unless redis_available?
+    @redis = Redis.new @conf[:redis]
   end
   
-  # Loads the yaml config files from config/
-  # * +base+ path where config dir lives
-  # * +env one of: :development, :production
-  # Returns a Hash: conf[:mongo][:host], ...
-  def self.load_config(base=Dir.pwd, env=:development)
-    @conf = {}                       
-    [:redis].each do |n|
-      Boned.ld "LOADING CONFIG: #{n}"
-      tmp = YAML.load_file(File.join(base, "config", "#{n}.yml"))
-      @conf[n] = tmp[ env.to_sym ]
+  def self.start_redis
+    return Problem, "Redis already running" if redis_available? 
+    conf_path = File.join(BONED_HOME, 'config', 'redis-server.conf')
+    ld "REDIS SERVER CONF: #{conf_path}"
+    @redis_thread = Thread.new do
+      Rye.shell 'redis-server', conf_path
     end
-    @conf
+    sleep 2  # Give redis time to start. 
+  end
+  
+  def self.stop_redis
+    ld "SHUTDOWN REDIS"
+    @redis.shutdown if redis_available? 
+    return if @redis_thread.nil? || !@redis_thread.alive?
+    @redis_thread.join
   end
   
   # <tt>require</tt> a library from the vendor directory.
@@ -102,6 +115,9 @@ module Boned
   # Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error
   #
   def self.service_available?(host, port, wait=3)
+    a = Socket.getaddrinfo @conf[:redis][:host], @conf[:redis][:port]
+    ip_addr = a[0][3]
+    ld "SERVICE: #{host} (#{ip_addr}) #{port}"
     if Boned.sysinfo.vm == :java
       begin
         iadd = Java::InetSocketAddress.new host, port      
@@ -127,6 +143,22 @@ module Boned
     end
   end
   
+  def self.redis_available?
+    service_available? @conf[:redis][:host], @conf[:redis][:port]
+  end
+  
+  def self.update_redis_client_config(uri=nil)
+    uri ||= ENV['BONED_REDIS'] || BONED_REDIS
+    uri = URI.parse(uri)
+    @conf ||= {}
+    @conf[:redis] = {
+      :host => uri.host,
+      :port => uri.port || 8045,
+      :database => uri.path.sub(/\D/, "").to_i || 1,
+      :password => uri.user || nil
+    }
+    ld "REDIS: #{@conf[:redis].inspect}"
+  end
   
   def self.ld(*msg)
     return unless Boned.debug
@@ -134,6 +166,7 @@ module Boned
     puts "#{prefix}" << msg.join("#{$/}#{prefix}")
   end
   
+  update_redis_client_config  # parse ENV['BONED_REDIS']
 end
 
 require 'boned/models'

data/lib/boned/cli.rb

@@ -5,7 +5,6 @@ class Boned::CLI < Drydock::Command
   attr_accessor :exit_code
   
   def init
-    Boned.load_config Dir.pwd, :development
     Boned.connect
   end
   
@@ -17,6 +16,7 @@ class Boned::CLI < Drydock::Command
   end
   
   def stop
+    Boned.stop_redis
     if not Boned.service_available?('127.0.0.1', server_opts[:port])
       raise Boned::Server::ServerNotRunning, server_opts[:port]
     end
@@ -37,7 +37,7 @@ class Boned::CLI < Drydock::Command
   
   def server_opts
     port = @global.port || Boned::Server::DEFAULT_PORT
-    config = @global.rackup || File.join(Dir.pwd, "config.ru")
+    config = @global.rackup || File.join(BONED_HOME, "config.ru")
     @server_opts ||= {
       :chdir                => Dir.pwd,
       :environment          => @global.environment || 'development',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: boned
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -05:00
+date: 2010-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Get Bones
+description: The bone daemon
 email: delano@solutious.com
 executables: 
 - boned
@@ -24,15 +24,15 @@ extra_rdoc_files:
 - LICENSE.txt
 - CHANGES.txt
 files: 
+- CHANGES.txt
 - LICENSE.txt
 - README.md
 - Rakefile
+- api/api-set.rb
+- api/api.rb
 - bin/boned
 - boned.gemspec
-- config/redis-default.yml
-- config/redis-server-default.conf
-- config/stella/api-set.rb
-- config/stella/api.rb
+- config.ru
 - lib/boned.rb
 - lib/boned/api.rb
 - lib/boned/api/debug.rb
@@ -45,7 +45,6 @@ files:
 - public/index.html
 - try/10_bone_model.rb
 - views/redisviewer/keys.erb
-- CHANGES.txt
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -54,9 +53,9 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- Get Bones
+- The bone daemon
 - --main
-- README.rdoc
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -77,6 +76,6 @@ rubyforge_project: boned
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Get Bones
+summary: The bone daemon
 test_files: []
 

data/config/redis-default.yml

@@ -1,14 +0,0 @@
-:development: 
-#  :password: e89da64b29cf622e7c0fa545b537d7
-  :host: localhost
-  :port: "6379"
-  :db: 1
-  :timeout: 5
-  :thread_safe: true
-:production: 
-#  :password: e89da64b29cf622e7c0fa545b537d7
-  :host: localhost
-  :port: "6379"
-  :db: 0
-  :timeout: 5
-  :thread_safe: true

data/config/redis-server-default.conf

@@ -1,171 +0,0 @@
-# Redis configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
-
-# Accept connections on the specified port, default is 6379
-port 6379
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-# bind 127.0.0.1
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 300
-
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-save 900 1
-save 300 10
-save 60 10000
-
-# The filename where to dump the DB
-dbfilename dump.rdb
-
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir ./
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel debug
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile stdout
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-
-# slaveof <masterip> <masterport>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-
-# requirepass foobared
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limts.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-
-# maxclients 128
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys with an
-# EXPIRE set. It will try to start freeing keys that are going to expire
-# in little time and preserve keys with a longer time to live.
-# Redis will also try to remove objects from free lists if possible.
-#
-# If all this fails, Redis will start to reply with errors to commands
-# that will use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to most read-only commands like GET.
-#
-# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
-# 'state' server or cache, not as a real DB. When Redis is used as a real
-# database the memory usage will grow over the weeks, it will be obvious if
-# it is going to use too much memory in the long run, and you'll have the time
-# to upgrade. With maxmemory after the limit is reached you'll start to get
-# errors for write operations, and this may even lead to DB inconsistency.
-
-# maxmemory <bytes>
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. If you can live
-# with the idea that the latest records will be lost if something like a crash
-# happens this is the preferred way to run Redis. If instead you care a lot
-# about your data and don't want to that a single record can get lost you should
-# enable the append only mode: when this mode is enabled Redis will append
-# every write operation received in the file appendonly.log. This file will
-# be read on startup in order to rebuild the full dataset in memory.
-#
-# Note that you can have both the async dumps and the append only file if you
-# like (you have to comment the "save" statements above to disable the dumps).
-# Still if append only mode is enabled Redis will load the data from the
-# log file at startup ignoring the dump.rdb file.
-#
-# The name of the append only file is "appendonly.log"
-
-appendonly no
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead to wait for more data in the output buffer. Some OS will really flush 
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log . Slow, Safest.
-# everysec: fsync only if one second passed since the last fsync. Compromise.
-#
-# The default is "always" that's the safer of the options. It's up to you to
-# understand if you can relax this to "everysec" that will fsync every second
-# or to "no" that will let the operating system flush the output buffer when
-# it want, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting).
-
-appendfsync always
-# appendfsync everysec
-# appendfsync no
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-#
-# When object sharing is enabled (shareobjects yes) you can use
-# shareobjectspoolsize to control the size of the pool used in order to try
-# object sharing. A bigger pool size will lead to better sharing capabilities.
-# In general you want this value to be at least the double of the number of
-# very common strings you have in your dataset.
-#
-# WARNING: object sharing is experimental, don't enable this feature
-# in production before of Redis 1.0-stable. Still please try this feature in
-# your development environment so that we can test it better.
-shareobjects no
-shareobjectspoolsize 1024