sras 2.1.2 → 2.1.3

data/CHANGELOG

@@ -0,0 +1,19 @@
+2.1.3
+    - add --foreground, --socket, and --environment options
+    - daemonize by default
+    - code cleanup
+
+2.1.2
+    - gemify
+    - update gem dependency versions to silence deprecation warnings
+      from dm-* gems
+
+2.1.1
+    - remove requirement to cd into bin dir before running sras
+
+2.1
+    - don't return disabled assets
+    - support different options for different environments
+
+2.0
+    - complete rewrite of 1.x

data/README.rst

@@ -16,8 +16,7 @@ The packages of Ruby shipping with Ubuntu don't include built-in zlib
 support.  I prefer using RVM [ http://rvm.beginrescueend.com/ ]
 anyway.
 
-Built & testing with Ruby v1.9.2.  Tested with Thin, but should also
-work with Passenger.
+Built & testing with Ruby v1.9.2.
 
 Install via: ::
 

data/bin/sras

@@ -4,27 +4,32 @@ require 'optparse'
 require 'yaml'
 require 'thin'
 
-options = {}
 ROOT = ::File.dirname(::File.realdirpath(__FILE__))
+require "#{ROOT}/../lib/sras/helpers/init.rb"
+
+@dbms = ENV['DBMS'] || 'mysql'
+
+options = {}
 
 # defaults...
-options[:environment] = (ENV['RACK_ENV']  || 'production')
-options[:config_file] = '/etc/sras/sras.conf'
-
-# look for more appropriate SRAS config file...
-if File.exists?("#{ROOT}/config/config.yml")
-    options[:config_file] = "#{ROOT}/config/config.yml"
-elsif File.exists?(File.expand_path('~/.srasrc'))
-    options[:config_file] = File.expand_path('~/.srasrc')
-end
+options[:environment] = ENV['RACK_ENV'] || 'production'
+options[:config_file] = config_file
 
 OptionParser.new do |opts|
-    opts.banner = 'Usage: sras [options] <start|stop>'
+    opts.banner = 'Usage: sras [options] start'
 
     opts.on('-c', '--config <file>', 'SRAS config file') do |c|
         options[:config_file] = c
     end
 
+    opts.on('-e', '--environment <production|development|testing>', 'Set Rack environment') do |e|
+        options[:environment] = e
+    end
+
+    opts.on('-f', '--foreground', 'Run in foreground') do |f|
+        options[:foreground] = true
+    end
+
     opts.on('-h', '--host <hostname|ip_addy>', 'Address to which to bind') do |h|
         options[:host] = h
     end
@@ -41,6 +46,10 @@ OptionParser.new do |opts|
         options[:pid_file] = p
     end
 
+    opts.on('-S', '--socket <file>', 'Socket file') do |s|
+        options[:socket] = s
+    end
+
     opts.on_tail('-h', '--help', 'Show this message') do
         puts opts
         exit
@@ -48,7 +57,7 @@ OptionParser.new do |opts|
 
     if ARGV.last
         command = ARGV.last.chomp
-        if command == 'start' || command == 'stop'
+        if command == 'start'
             options[:command] = command
         else
             puts opts
@@ -60,6 +69,8 @@ OptionParser.new do |opts|
     end 
 end.parse!
 
+RACK_ENV = options[:environment]
+
 # load SRAS config file...
 if File.exists?(options[:config_file])
     @config = YAML.load_file(options[:config_file])
@@ -69,40 +80,50 @@ else
 end
 
 if ! options[:host]
-    if @config['sras'][options[:environment]]['host']
-        options[:host] = @config['sras'][options[:environment]]['host']    
+    if @config['sras'][RACK_ENV]['host']
+        options[:host] = @config['sras'][RACK_ENV]['host']    
     else
         options[:host] = '0.0.0.0'
     end
 end
 
 if ! options[:port]
-    if @config['sras'][options[:environment]]['port']
-        options[:port] = @config['sras'][options[:environment]]['port']
+    if @config['sras'][RACK_ENV]['port']
+        options[:port] = @config['sras'][RACK_ENV]['port']
     else
         options[:port] = '8003'
     end
 end
 
 if ! options[:log_file]
-    if @config['sras'][options[:environment]]['log_file']
-        options[:log_file] = @config['sras'][options[:environment]]['log_file']
+    if @config['sras'][RACK_ENV]['log_file']
+        options[:log_file] = @config['sras'][RACK_ENV]['log_file']
     else
-        options[:log_file] = "log/sras_#{options[:environment]}.log"
+        options[:log_file] = "log/sras_#{RACK_ENV}.log"
     end
 end
 
 if ! options[:pid_file]
-    if @config['sras'][options[:environment]]['pid_file']
-        options[:pid_file] = @config['sras'][options[:environment]]['pid_file']
+    if @config['sras'][RACK_ENV]['pid_file']
+        options[:pid_file] = @config['sras'][RACK_ENV]['pid_file']
     else
-        options[:pid_file] = "/tmp/sras_#{options[:environment]}.pid"
+        options[:pid_file] = "/tmp/sras_#{RACK_ENV}.pid"
     end
 end
 
 require "#{ROOT}/../lib/sras.rb"
-server = Thin::Server.new(options[:host], options[:port], SRAS.new)
-server.log_file = options[:log_file]
-server.pid_file = options[:pid_file]
-server.tag = 'sras'
-server.start
+
+if options[:command] == 'start'
+    if options[:socket]
+        server = Thin::Server.new(options[:socket], SRAS.new)
+    else
+        server = Thin::Server.new(options[:host], options[:port], SRAS.new)
+    end
+    server.log_file = options[:log_file]
+    server.pid_file = options[:pid_file]
+    server.tag = 'sras'
+    unless options[:foreground]
+        server.daemonize
+    end
+    server.start
+end

data/lib/sras/helpers/config.rb

@@ -0,0 +1,9 @@
+def config_file()
+    if File.exists?("#{ROOT}/config/config.yml")
+        return "#{ROOT}/config/config.yml"
+    elsif File.exists?(File.expand_path('~/.srasrc'))
+        return File.expand_path('~/.srasrc')
+    else
+        return '/etc/sras/sras.conf'
+    end
+end

data/lib/sras/helpers/init.rb

@@ -1,4 +1,4 @@
 require 'zlib'
 
-require ::File.dirname(__FILE__) + '/setup'
+require ::File.dirname(__FILE__) + '/config'
 require ::File.dirname(__FILE__) + '/asset'

data/lib/sras/models/init.rb

@@ -3,6 +3,8 @@ require 'dm-core'
 require 'dm-types'
 require 'dm-timestamps'
 
+set :environment, RACK_ENV.to_sym
+
 configure :development do
     DataMapper::Logger.new(STDOUT, :debug)
 end

data/lib/sras.rb

@@ -1,6 +1,3 @@
-#require 'bundler'
-#Bundler.setup
-
 require 'bundler/setup'
 
 require 'sinatra'

data/sql/sras_schema.sql

@@ -0,0 +1,16 @@
+CREATE TABLE `assets` (
+  `id` char(36) NOT NULL,
+  `asset_type` tinyint(4) NOT NULL,
+  `sha256` char(64) NOT NULL,
+  `name` varchar(64) DEFAULT NULL,
+  `description` varchar(64) DEFAULT NULL,
+  `local` tinyint(1) DEFAULT NULL,
+  `temporary` tinyint(1) DEFAULT NULL,
+  `base_dir` varchar(64) NOT NULL,
+  `created_at` int(11) DEFAULT NULL,
+  `updated_at` int(11) DEFAULT NULL,
+  `enabled` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `assets_id_sha256` (`id`,`sha256`),
+  KEY `assets_sha256` (`sha256`)
+) ENGINE=MyISAM DEFAULT CHARSET=ascii;

data/sras.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name          = 'sras'
-    s.version       = '2.1.2'
+    s.version       = '2.1.3'
     s.summary       = 'Simple Ruby Asset Server'
     s.description   = 'Asset server for use with OpenSimulator'
     s.authors       = 'Dave Coyle'
@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
     s.homepage      = 'http://coyled.com/sras'
     s.license       = 'MIT'
 
+    s.required_ruby_version = '>= 1.9.2'
     s.files         = `git ls-files`.split("\n")
     s.test_files    = `git ls-files -- test/*`.split("\n")
     s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sras
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &84493470 !ruby/object:Gem::Requirement
+  requirement: &72036830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84493470
+  version_requirements: *72036830
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
-  requirement: &84493210 !ruby/object:Gem::Requirement
+  requirement: &72036600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84493210
+  version_requirements: *72036600
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &84492980 !ruby/object:Gem::Requirement
+  requirement: &72036370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84492980
+  version_requirements: *72036370
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &84492740 !ruby/object:Gem::Requirement
+  requirement: &72036130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *84492740
+  version_requirements: *72036130
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &84492500 !ruby/object:Gem::Requirement
+  requirement: &72035890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *84492500
+  version_requirements: *72035890
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &84492260 !ruby/object:Gem::Requirement
+  requirement: &72035660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *84492260
+  version_requirements: *72035660
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &84492030 !ruby/object:Gem::Requirement
+  requirement: &72035420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *84492030
+  version_requirements: *72035420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84491800 !ruby/object:Gem::Requirement
+  requirement: &72035170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *84491800
+  version_requirements: *72035170
 description: Asset server for use with OpenSimulator
 email: hello@coyled.com
 executables:
@@ -108,18 +108,17 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.rst
-- Rakefile
 - bin/sras
-- config.ru
 - config/config.yml.example
 - lib/sras.rb
 - lib/sras/helpers/asset.rb
+- lib/sras/helpers/config.rb
 - lib/sras/helpers/init.rb
-- lib/sras/helpers/setup.rb
 - lib/sras/models/asset.rb
 - lib/sras/models/init.rb
 - lib/sras/views/create.erb
@@ -127,6 +126,7 @@ files:
 - lib/sras/views/index.erb
 - lib/sras/views/metadata.erb
 - lib/sras/views/show.erb
+- sql/sras_schema.sql
 - sras.gemspec
 - test/test.asset
 homepage: http://coyled.com/sras
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Rakefile

@@ -1,19 +0,0 @@
-require 'rake/testtask'
-require 'yaml'
-require 'dm-core'
-require 'dm-migrations'
-
-#Rake::TestTask.new(:test) do |t|
-#    t.test_files = FileList['test/test_*.rb']
-#    t.verbose = true
-#end
-
-require ::File.dirname(__FILE__) + '/lib/sras/helpers/init'
-
-namespace 'db' do
-    require ::File.dirname(__FILE__) + '/lib/sras/models/init'
-
-    task :create do
-        DataMapper.auto_upgrade!
-    end
-end

data/config.ru

@@ -1,3 +0,0 @@
-ROOT = ::File.dirname(::File.realdirpath(__FILE__))
-require "#{ROOT}/lib/sras.rb"
-run SRAS.new

data/lib/sras/helpers/setup.rb

@@ -1,14 +0,0 @@
-RACK_ENV = ENV['RACK_ENV'] || 'production'
-set :environment, (ENV['RACK_ENV'] || 'production')
-
-@dbms = ENV['DBMS'] || 'mysql'
-
-if File.exists?("#{ROOT}/config/config.yml")
-    config_file = "#{ROOT}/config/config.yml"
-elsif File.exists?(File.expand_path('~/.srasrc'))
-    config_file = File.expand_path('~/.srasrc')
-else
-    config_file = '/etc/sras/sras.conf'
-end
-
-@config = YAML.load_file(config_file)