sras 2.1.1.pre.10 → 2.1.2

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    sras (2.1.1.pre.9)
-      dm-migrations (= 1.1.0)
-      dm-mysql-adapter (= 1.1.0)
-      dm-timestamps (= 1.1.0)
-      dm-types (= 1.1.0)
+    sras (2.1.2)
+      dm-migrations (= 1.2.0)
+      dm-mysql-adapter (= 1.2.0)
+      dm-timestamps (= 1.2.0)
+      dm-types (= 1.2.1)
       hpricot (= 0.8.4)
       rake (= 0.9.2.2)
       sinatra (= 1.2.6)
@@ -15,41 +15,43 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.1)
     daemons (1.1.4)
     data_objects (0.10.6)
       addressable (~> 2.1)
-    dm-core (1.1.0)
-      addressable (~> 2.2.4)
-    dm-do-adapter (1.1.0)
-      data_objects (~> 0.10.2)
-      dm-core (~> 1.1.0)
-    dm-migrations (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-mysql-adapter (1.1.0)
-      dm-do-adapter (~> 1.1.0)
-      do_mysql (~> 0.10.2)
-    dm-timestamps (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-types (1.1.0)
-      bcrypt-ruby (~> 2.1.4)
-      dm-core (~> 1.1.0)
+    dm-core (1.2.0)
+      addressable (~> 2.2.6)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-mysql-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_mysql (~> 0.10.6)
+    dm-timestamps (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-types (1.2.1)
+      bcrypt-ruby (~> 3.0.0)
+      dm-core (~> 1.2.0)
       fastercsv (~> 1.5.4)
-      json (~> 1.4.6)
-      stringex (~> 1.2.0)
+      json (~> 1.6.1)
+      multi_json (~> 1.0.3)
+      stringex (~> 1.3.0)
       uuidtools (~> 2.1.2)
     do_mysql (0.10.6)
       data_objects (= 0.10.6)
     eventmachine (0.12.10)
     fastercsv (1.5.4)
     hpricot (0.8.4)
-    json (1.4.6)
+    json (1.6.5)
+    multi_json (1.0.4)
     rack (1.3.3)
     rake (0.9.2.2)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
-    stringex (1.2.2)
+    stringex (1.3.2)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)

data/README.rst

@@ -57,3 +57,33 @@ To see additional options: ::
 
     $ sras --help
 
+
+Testing
+-------
+
+To test asset creation: ::
+
+    $ curl -d @test/test.asset -X POST -w '%{http_code}\n' \
+        http://yourserver.example.com:8003/assets/
+
+You should get a 200 HTTP response, have an entry in your assets
+table, and have a file contain the asset data on disk.
+
+To test retrieval of that asset: ::
+
+   $ curl -X GET \
+        http://yourserver.example.com:8003/assets/0193663d-44e4-4e6e-9a1c-8dd2febc5fc5/data 
+
+
+Mailing List
+------------
+
+For SRAS-related announcements and discussion feel free to join the
+low-volume mailing list.  To join the list send an email to
+majordomo@sdf.org with the following body (no subject required):
+
+    subscribe sras-l
+
+Mailing list members can email the list via sras-l@sdf.org
+
+List archives can be found at http://lists.coyled.com/sras-l/archives/

data/bin/sras

@@ -8,7 +8,7 @@ options = {}
 ROOT = ::File.dirname(::File.realdirpath(__FILE__))
 
 # defaults...
-options[:environment] = 'production'
+options[:environment] = (ENV['RACK_ENV']  || 'production')
 options[:config_file] = '/etc/sras/sras.conf'
 
 # look for more appropriate SRAS config file...
@@ -25,11 +25,6 @@ OptionParser.new do |opts|
         options[:config_file] = c
     end
 
-    opts.on('-e', '--environment <production|development|test>',
-                'Environment in which to run') do |e|
-        options[:environment] = e
-    end
-
     opts.on('-h', '--host <hostname|ip_addy>', 'Address to which to bind') do |h|
         options[:host] = h
     end
@@ -73,10 +68,6 @@ else
     exit 1
 end
 
-# base thin options...
-#-d -R #{::File.dirname(__FILE__)}/../config.ru"
-#thin_opts << " -e #{options[:environment]}"
-
 if ! options[:host]
     if @config['sras'][options[:environment]]['host']
         options[:host] = @config['sras'][options[:environment]]['host']    

data/lib/sras/helpers/setup.rb

@@ -1,4 +1,6 @@
 RACK_ENV = ENV['RACK_ENV'] || 'production'
+set :environment, (ENV['RACK_ENV'] || 'production')
+
 @dbms = ENV['DBMS'] || 'mysql'
 
 if File.exists?("#{ROOT}/config/config.yml")

data/sras.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name          = 'sras'
-    s.version       = '2.1.1.pre.10'
+    s.version       = '2.1.2'
     s.summary       = 'Simple Ruby Asset Server'
     s.description   = 'Asset server for use with OpenSimulator'
     s.authors       = 'Dave Coyle'
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
     s.test_files    = `git ls-files -- test/*`.split("\n")
     s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-    s.add_runtime_dependency    'dm-migrations', '1.1.0'
-    s.add_runtime_dependency    'dm-mysql-adapter', '1.1.0'
-    s.add_runtime_dependency    'dm-timestamps', '1.1.0'
-    s.add_runtime_dependency    'dm-types', '1.1.0'
+    s.add_runtime_dependency    'dm-migrations', '1.2.0'
+    s.add_runtime_dependency    'dm-mysql-adapter', '1.2.0'
+    s.add_runtime_dependency    'dm-timestamps', '1.2.0'
+    s.add_runtime_dependency    'dm-types', '1.2.1'
     s.add_runtime_dependency    'hpricot', '0.8.4'
     s.add_runtime_dependency    'sinatra', '1.2.6'
     s.add_runtime_dependency    'thin', '1.2.11'

metadata

@@ -1,63 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: sras
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre.10
-  prerelease: 6
+  version: 2.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Dave Coyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &73169400 !ruby/object:Gem::Requirement
+  requirement: &84493470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73169400
+  version_requirements: *84493470
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
-  requirement: &73169150 !ruby/object:Gem::Requirement
+  requirement: &84493210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73169150
+  version_requirements: *84493210
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &73168920 !ruby/object:Gem::Requirement
+  requirement: &84492980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73168920
+  version_requirements: *84492980
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &73168690 !ruby/object:Gem::Requirement
+  requirement: &84492740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *73168690
+  version_requirements: *84492740
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &73168460 !ruby/object:Gem::Requirement
+  requirement: &84492500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *73168460
+  version_requirements: *84492500
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &73168230 !ruby/object:Gem::Requirement
+  requirement: &84492260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *73168230
+  version_requirements: *84492260
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &73168000 !ruby/object:Gem::Requirement
+  requirement: &84492030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *73168000
+  version_requirements: *84492030
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &73167770 !ruby/object:Gem::Requirement
+  requirement: &84491800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *73167770
+  version_requirements: *84491800
 description: Asset server for use with OpenSimulator
 email: hello@coyled.com
 executables:
@@ -145,9 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15