sras 2.1.5 → 2.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sras (2.1.4)
+    sras (2.1.2)
       dm-migrations (= 1.2.0)
       dm-mysql-adapter (= 1.2.0)
       dm-timestamps (= 1.2.0)
@@ -14,10 +14,10 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.2.6)
     bcrypt-ruby (3.0.1)
-    daemons (1.1.8)
-    data_objects (0.10.8)
+    daemons (1.1.4)
+    data_objects (0.10.6)
       addressable (~> 2.1)
     dm-core (1.2.0)
       addressable (~> 2.2.6)
@@ -39,14 +39,14 @@ GEM
       multi_json (~> 1.0.3)
       stringex (~> 1.3.0)
       uuidtools (~> 2.1.2)
-    do_mysql (0.10.8)
-      data_objects (= 0.10.8)
+    do_mysql (0.10.6)
+      data_objects (= 0.10.6)
     eventmachine (0.12.10)
     fastercsv (1.5.4)
     hpricot (0.8.4)
     json (1.6.5)
     multi_json (1.0.4)
-    rack (1.4.1)
+    rack (1.3.3)
     rake (0.9.2.2)
     sinatra (1.2.6)
       rack (~> 1.1)

data/README.rst

@@ -16,7 +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.
+Built & tested with Ruby v1.9.2.
 
 Install via: ::
 
@@ -78,11 +78,11 @@ 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):
+low-volume mailing list.  You can join the list by submitting the form
+at https://lists.sourceforge.net/lists/listinfo/sras-list
 
-    subscribe sras-l
+Mailing list members can email the list via
+sras-list@lists.sourceforge.net
 
-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/
+List archives can be found at
+http://sourceforge.net/mailarchive/forum.php?forum_name=sras-list

data/bin/sras

@@ -46,6 +46,11 @@ OptionParser.new do |opts|
         options[:socket] = s
     end
 
+    opts.on_tail('--version', 'Print version') do |v|
+        puts Version
+        exit
+    end
+
     opts.on_tail('-h', '--help', 'Show this message') do
         puts opts
         exit
@@ -55,9 +60,6 @@ OptionParser.new do |opts|
         command = ARGV.last.chomp
         if command == 'start'
             options[:command] = command
-        else
-            puts opts
-            exit
         end
     else
         puts opts

data/lib/sras/helpers/init.rb

@@ -2,3 +2,4 @@ require 'zlib'
 
 require ::File.dirname(__FILE__) + '/config'
 require ::File.dirname(__FILE__) + '/asset'
+require ::File.dirname(__FILE__) + '/version'

data/lib/sras/helpers/version.rb

@@ -0,0 +1,11 @@
+class Version
+    MAJOR = '2'
+    MINOR = '1'
+    PATCH = '6'
+
+    class << self
+        def to_s
+           [MAJOR, MINOR, PATCH].compact.join('.')
+        end
+    end
+end

data/sql/sras_schema.sql

@@ -2,8 +2,8 @@ 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,
+  `name` varchar(256) DEFAULT NULL,
+  `description` varchar(256) DEFAULT NULL,
   `local` tinyint(1) DEFAULT NULL,
   `temporary` tinyint(1) DEFAULT NULL,
   `base_dir` varchar(64) NOT NULL,
@@ -13,4 +13,4 @@ CREATE TABLE `assets` (
   PRIMARY KEY (`id`),
   KEY `assets_id_sha256` (`id`,`sha256`),
   KEY `assets_sha256` (`sha256`)
-) ENGINE=MyISAM DEFAULT CHARSET=ascii;
+) DEFAULT CHARSET=utf8;

data/sras.gemspec

@@ -1,6 +1,8 @@
+require ::File.dirname(__FILE__) + '/lib/sras/helpers/version.rb'
+
 Gem::Specification.new do |s|
     s.name          = 'sras'
-    s.version       = '2.1.5'
+    s.version       = Version
     s.summary       = 'Simple Ruby Asset Server'
     s.description   = 'Asset server for use with OpenSimulator'
     s.authors       = 'Dave Coyle'
@@ -18,7 +20,7 @@ Gem::Specification.new do |s|
     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    'sinatra', '1.4.3'
     s.add_runtime_dependency    'thin', '1.2.11'
     s.add_runtime_dependency    'rake', '0.9.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sras
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,96 +9,136 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &73863030 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73863030
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
-  requirement: &73862800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73862800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &73862570 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *73862570
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &73900110 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *73900110
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &73899880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *73899880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &73899650 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *73899650
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &73899420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *73899420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.11
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &73899190 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *73899190
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: Asset server for use with OpenSimulator
 email: hello@coyled.com
 executables:
@@ -119,6 +159,7 @@ files:
 - lib/sras/helpers/asset.rb
 - lib/sras/helpers/config.rb
 - lib/sras/helpers/init.rb
+- lib/sras/helpers/version.rb
 - lib/sras/models/asset.rb
 - lib/sras/models/init.rb
 - lib/sras/views/create.erb
@@ -150,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple Ruby Asset Server