boned 0.2.6 → 0.3.0

data/.gitignore

@@ -0,0 +1,4 @@
+redis.yml
+dump.rdb
+log
+tmp

data/README.md

@@ -1,12 +1,12 @@
-## Boned - 0.2 ##
+## Boned - 0.3 ##
 
-**Bones it!**
+**Remote environment variables**
 
 
 ## Running
     
     $ redis-server config/redis-server.conf
-    $ export BONED_REDIS=redis://localhost:8045/1
+    $ export BONED_SOURCE=redis://localhost:8045/
     $ boned start
     
     
@@ -19,10 +19,12 @@ You also need to install [redis](http://code.google.com/p/redis/).
 
 ## More Information
 
+See [bone](https://github.com/solutious/bone). 
+
 
 ## Credits
 
-* Delano Mandelbaum (http://solutious.com)
+* [Delano Mandelbaum](http://solutious.com)
 
 
 ## Thanks 

data/Rakefile

@@ -1,59 +1,66 @@
-
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/testtask'
-require 'rake/runtest'
-require 'fileutils'
-include FileUtils
+require "rubygems"
+require "rake"
+require "rake/clean"
+require 'yaml'
 
 begin
   require 'hanna/rdoctask'
 rescue LoadError
   require 'rake/rdoctask'
 end
-
-task :default => :test
-
-
-# PACKAGE =============================================================
-
+ 
+config = YAML.load_file("VERSION.yml")
+task :default => ["build"]
+CLEAN.include [ 'pkg', 'doc' ]
 name = "boned"
-load "#{name}.gemspec"
-
-version = @spec.version
 
-Rake::GemPackageTask.new(@spec) do |p|
-  p.need_tar = true if RUBY_PLATFORM !~ /mswin/
+begin
+  require "jeweler"
+  Jeweler::Tasks.new do |gem|
+    gem.version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
+    gem.name = name
+    gem.rubyforge_project = gem.name
+    gem.summary = "HTTP server companion for Bone (remote environment variables)"
+    gem.description = gem.summary
+    gem.email = "delano@solutious.com"
+    gem.homepage = "https://github.com/solutious/boned"
+    gem.authors = ["Delano Mandelbaum"]
+    gem.add_dependency("bone",            ">= 0.3.0")
+    gem.add_dependency("sinatra",         ">= 1.0.0")
+    gem.add_dependency("thin")
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-task :test do
-  puts "Success!"
-end
 
-task :install => [ :rdoc, :package ] do
-	sh %{sudo gem install pkg/#{name}-#{version}.gem}
+Rake::RDocTask.new do |rdoc|
+  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}.#{config[:BUILD]}"
+  rdoc.rdoc_dir = "doc"
+  rdoc.title = "#{name} #{version}"
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("LICENSE.txt")
+  rdoc.rdoc_files.include("bin/*.rb")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-task :uninstall => [ :clean ] do
-	sh %{sudo gem uninstall #{name}}
-end
 
+# Rubyforge Release / Publish Tasks ==================================
 
+#about 'Publish website to rubyforge'
+task 'publish:rdoc' => 'doc/index.html' do
+  #sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/"
+end
 
-Rake::RDocTask.new do |t|
-	t.rdoc_dir = 'doc'
-	t.title    = @spec.summary
-	t.options << '--line-numbers' <<  '-A cattr_accessor=object'
-	t.options << '--charset' << 'utf-8'
-	t.rdoc_files.include('LICENSE.txt')
-	t.rdoc_files.include('README.md')
-	t.rdoc_files.include('CHANGES.txt')
-	#t.rdoc_files.include('Rudyfile')  # why is the formatting f'd?
-	t.rdoc_files.include('bin/*')
-	t.rdoc_files.include('lib/**/*.rb')
+#about 'Public release to rubyforge'
+task 'publish:gem' => [:package] do |t|
+  sh <<-end
+    rubyforge add_release -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
+    rubyforge add_file -o Any -a CHANGES.txt -f -n README.md #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
+  end
 end
 
-CLEAN.include [ 'pkg', '*.gem', '.config', 'doc', 'coverage*' ]
 
 
 

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:MAJOR: 0
+:MINOR: 3
+:PATCH: 0

data/api/api-set.rb

@@ -1,32 +1,33 @@
 
 
-usecase "Set" do
-  set :key    => :simple
-  set :token    => '1901484c41b8752d61863e323c743abe2c6e90f8841bbdfa789e1d70bc6f4899'
-  
-  get "/v1/set/:key" do
-    set :value => (rand*100000).to_i
-    param :token    => resource(:token)
-    param :value  => resource(:value)
-  end
-  
-  get "/v1/get/:key" do
-    param :token    => resource(:token)
-    response 200 do
-      p [resource(:value), body.to_i]
-    end
-  end
-  
-  get "/v1/set/:key" do
-    param :key => rand(1000).to_i
-    set :value => (rand*100000).to_i
-    param :token    => resource(:token)
-    param :value  => resource(:value)
-  end
-  
-  xpost "/v1/set/:key" do
-    param :key    => :file
-    body file('/tmp/file')
-  end
-  
-end
+
+#usecase "Set" do
+#  set :key    => :simple
+#  set :token    => '1901484c41b8752d61863e323c743abe2c6e90f8841bbdfa789e1d70bc6f4899'
+#  
+#  get "/v1/set/:key" do
+#    set :value => (rand*100000).to_i
+#    param :token    => resource(:token)
+#    param :value  => resource(:value)
+#  end
+#  
+#  get "/v1/get/:key" do
+#    param :token    => resource(:token)
+#    response 200 do
+#      p [resource(:value), body.to_i]
+#    end
+#  end
+#  
+#  get "/v1/set/:key" do
+#    param :key => rand(1000).to_i
+#    set :value => (rand*100000).to_i
+#    param :token    => resource(:token)
+#    param :value  => resource(:value)
+#  end
+#  
+#  xpost "/v1/set/:key" do
+#    param :key    => :file
+#    body file('/tmp/file')
+#  end
+#  
+#end

data/api/api.rb

@@ -1,51 +1,51 @@
 
 
-usecase do
-  set :token    => '1901484c41b8752d61863e323c743abe2c6e90f8841bbdfa789e1d70bc6f4899'
-  set :key    => :simple
-  
-  post "/v1/set/:key" do
-    set :value => (rand*100000).to_i
-    param :token    => resource(:token)
-    param :value  => resource(:value)
-  end
-  
-  get "/v1/get/:key" do
-    param :token    => resource(:token)
-    response 200 do
-      p [resource(:value), body.to_i]
-    end
-  end
-  
-  post "/v1/set/:key" do
-    param :key => 'rand(1000).to_i'
-    set :value => (rand*100000).to_i
-    param :token    => resource(:token)
-    param :value  => resource(:value)
-  end
-  
-  xpost "/v1/set/:key" do
-    param :key    => :file
-    body file('/tmp/file')
-  end
-  
-  get "/v1/keys/:key" do
-    param :token => resource(:token)
-  end
-  
-  get "/v1/keys" do
-    param :token => resource(:token)
-  end
-  
-  delete "/v1/del/:key" do
-    header :'X-BONE-TOKEN' => resource(:token)
-  end
-  
-  get "/v1/get/:key" do
-    param :token => resource(:token)
-    response 404 do
-      # This is the correct response so don't fail
-    end
-  end
-  
-end
+# usecase do
+#   set :token    => '1901484c41b8752d61863e323c743abe2c6e90f8841bbdfa789e1d70bc6f4899'
+#   set :key    => :simple
+#   
+#   post "/v1/set/:key" do
+#     set :value => (rand*100000).to_i
+#     param :token    => resource(:token)
+#     param :value  => resource(:value)
+#   end
+#   
+#   get "/v1/get/:key" do
+#     param :token    => resource(:token)
+#     response 200 do
+#       p [resource(:value), body.to_i]
+#     end
+#   end
+#   
+#   post "/v1/set/:key" do
+#     param :key => 'rand(1000).to_i'
+#     set :value => (rand*100000).to_i
+#     param :token    => resource(:token)
+#     param :value  => resource(:value)
+#   end
+#   
+#   xpost "/v1/set/:key" do
+#     param :key    => :file
+#     body file('/tmp/file')
+#   end
+#   
+#   get "/v1/keys/:key" do
+#     param :token => resource(:token)
+#   end
+#   
+#   get "/v1/keys" do
+#     param :token => resource(:token)
+#   end
+#   
+#   delete "/v1/del/:key" do
+#     header :'X-BONE-TOKEN' => resource(:token)
+#   end
+#   
+#   get "/v1/get/:key" do
+#     param :token => resource(:token)
+#     response 404 do
+#       # This is the correct response so don't fail
+#     end
+#   end
+#   
+# end

data/app.ru

@@ -0,0 +1,36 @@
+# Rackup - Boned
+# 2009-12-11
+
+# bin/boned -e dev start
+
+ENV['RACK_ENV'] ||= 'production'
+ENV['APP_ROOT'] = ::File.expand_path(::File.join(::File.dirname(__FILE__)))
+$:.unshift(::File.join(ENV['APP_ROOT'], 'app'))
+$:.unshift(::File.join(ENV['APP_ROOT'], 'lib'))
+
+require 'sinatra'
+
+require 'boned/api'
+
+disable :run    # disable sinatra's auto-application starting
+
+configure :prod, :proto, :status do
+  Bone.info "arrested #{ENV['RACK_ENV']}"
+  Bone.debug = false
+  set :show_exceptions, false
+  set :dump_errors, false
+  set :reload_templates, false
+  map("/#{Bone::APIVERSION}")         { run Boned::API       }
+end
+
+configure :dev do
+  Bone.info "arrested #{ENV['RACK_ENV']}"    
+  Bone.debug = true
+  set :show_exceptions, true
+  set :dump_errors, true
+  set :reload_templates, true
+  map("/#{Bone::APIVERSION}")         { run Boned::API       }
+end
+
+
+

data/bin/boned

@@ -1,74 +1,9 @@
-#!/usr/bin/ruby
+#!/bin/sh
 
-# = Boned
-# 
-#
 # Usage:
-# 
-#     $ boned -h
-#     $ boned [-d] start-master
 #
-#--
-
-# Put our local lib in first place
-BASE_PATH = File.expand_path File.join(File.dirname(__FILE__), '..')
-lib_dir = File.join(BASE_PATH, 'lib')
-$:.unshift lib_dir  
-#$:.unshift '/Users/delano/Projects/opensource/drydock/lib'
-
-require 'rubygems'
-require 'drydock'
-require 'boned'
-require 'boned/cli'
-
-# Command-line interface for bin/stella
-class Boned::CLI::Definition
-  extend Drydock
-
-  debug :off
-  
-  default :info
-  
-  global :V, :version, "Display version" do
-    puts "Boned: #{Boned::VERSION} (api: #{Boned::APIVERSION})"
-    exit
-  end
-  
-  global :R, :rackup, String, "Specify a rackup file"
-  global :e, :environment, String, "Rack environment"
-  global :v, :verbose, "Increase output" do; 1 end
-  global :d, :daemon, "Run as a daemon"
-  global :p, :port, Integer, "Port to run on"
-  global :D, :debug do
-    Drydock.debug true
-    Boned.enable_debug
-  end
-  
-  command :start => Boned::CLI
-  command :stop => Boned::CLI
-  command :stop_redis => Boned::CLI
-  command :info => Boned::CLI
-  
-end
-
-  
-begin
-  Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
-rescue Boned::Problem => ex
-  STDERR.puts ex.message
-  STDERR.puts ex.backtrace if Drydock.debug?
-  exit 1
-rescue Drydock::ArgError, Drydock::OptError => ex
-  STDERR.puts ex.message
-  STDERR.puts ex.usage
-rescue Drydock::InvalidArgument => ex
-  STDERR.puts ex.message
-rescue Drydock::UnknownCommand => ex
-  STDERR.puts "Unknown command: %s" % ex.name
-rescue Interrupt
-  puts $/, "Exiting... "
-  exit 1
-rescue => ex
-  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
-  STDERR.puts ex.backtrace if Drydock.debug?
-end
+#    bin/boned -e dev start
+#    bin/boned -e prod -d start
+#    bin/boned -e prod stop
+#
+thin -p 3073 -P /tmp/boned.pid --rackup app.ru -l /tmp/boned.log $*

data/boned.gemspec

@@ -1,48 +1,70 @@
-@spec = Gem::Specification.new do |s|
-  s.name = "boned"
-  s.rubyforge_project = 'boned'
-  s.version = "0.2.6"
-  s.summary = "The bone daemon"
-  s.description = s.summary
-  s.author = "Delano Mandelbaum"
-  s.email = "delano@solutious.com"
-  s.homepage = "http://github.com/solutious/boned"
-  
-  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.md"]
-  s.require_paths = %w[lib]
-  
-  s.add_dependency 'bone',    '= 0.2.6'
-  
-  s.executables = %w[boned]
-  
-  # = 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.ru
-  config/redis-server.conf
-  lib/boned.rb
-  lib/boned/api.rb
-  lib/boned/api/debug.rb
-  lib/boned/api/redis.rb
-  lib/boned/api/service.rb
-  lib/boned/cli.rb
-  lib/boned/models.rb
-  lib/boned/models/bone.rb
-  lib/boned/server.rb
-  public/index.html
-  try/10_bone_model.rb
-  views/redisviewer/keys.erb
-  )
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
 
-  
+Gem::Specification.new do |s|
+  s.name = %q{boned}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Delano Mandelbaum"]
+  s.date = %q{2010-12-17}
+  s.default_executable = %q{boned}
+  s.description = %q{HTTP server companion for Bone (remote environment variables)}
+  s.email = %q{delano@solutious.com}
+  s.executables = ["boned"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGES.txt",
+     "LICENSE.txt",
+     "README.md",
+     "Rakefile",
+     "VERSION.yml",
+     "api/api-set.rb",
+     "api/api.rb",
+     "app.ru",
+     "bin/boned",
+     "boned.gemspec",
+     "config/redis-server.conf",
+     "lib/boned.rb",
+     "lib/boned/api.rb",
+     "lib/boned/api/base.rb",
+     "lib/boned/app.rb",
+     "public/index.html",
+     "try/10_basics_try.rb",
+     "try/11_signature_try.rb",
+     "try/20_keys_try.rb",
+     "views/redisviewer/keys.erb"
+  ]
+  s.homepage = %q{https://github.com/solutious/boned}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{boned}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{HTTP server companion for Bone (remote environment variables)}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<bone>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<thin>, [">= 0"])
+    else
+      s.add_dependency(%q<bone>, [">= 0.3.0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_dependency(%q<thin>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<bone>, [">= 0.3.0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+    s.add_dependency(%q<thin>, [">= 0"])
+  end
 end
+