sequenceserver 0.8.1 → 0.8.2

data/bin/sequenceserver

@@ -47,6 +47,11 @@ BANNER
     opts.on('-c', '--config CONFIG_FILE', 'Use the given configuration file') do |config_file|
       SequenceServer::App.config_file = File.expand_path(config_file)
     end
+
+    opts.on('-v', '--version', 'Print version number of SequenceServer that will be loaded.' ) do |config_file|
+      puts SequenceServer.version
+      exit
+    end
   end.order!
 
   # of the remaining items in ARGV, the first one must be a subcommand

data/lib/sequenceserver.rb

@@ -9,6 +9,7 @@ require 'sequenceserver/blast'
 require 'sequenceserver/sequencehelpers'
 require 'sequenceserver/sinatralikeloggerformatter'
 require 'sequenceserver/customisation'
+require 'sequenceserver/version'
 
 # Helper module - initialize the blast server.
 module SequenceServer

data/lib/sequenceserver/version.rb

@@ -0,0 +1,9 @@
+module SequenceServer
+
+  # Return version number of SequenceServer from the gemspec.  Version number
+  # is read from gemspec, which might fail on older versions of Bundler or
+  # RubyGems.  Return `nil` if version number couldn't be determined.
+  def self.version
+    Bundler.rubygems.loaded_specs('sequenceserver').version rescue nil
+  end
+end

data/public/js/sequenceserver.js

@@ -219,6 +219,9 @@ $(document).ready(function(){
         var url    = action.slice(0, index);
         var hash   = action.slice(index, action.length);
 
+        // reset hash so we can always _jump_ back to result
+        location.hash = '';
+
         // display a modal window and attach an activity spinner to it
         $('#spinner').modal();
         $('#spinner > div').activity({

data/sequenceserver.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   # meta
   s.name        = 'sequenceserver'
-  s.version     = '0.8.1'
+  s.version     = '0.8.2'
   s.authors     = ['Anurag Priyam', 'Ben J Woodcroft', 'Yannick Wurm']
   s.email       = 'anurag08priyam@gmail.com'
   s.homepage    = 'http://sequenceserver.com'
@@ -13,8 +13,8 @@ SequenceServer lets you rapidly set up a BLAST+ server with an intuitive user in
 DESC
 
   # dependencies
-  s.add_dependency('bundler')
-  s.add_dependency('sinatra', '>= 1.2.0')
+  s.add_dependency('bundler', '~> 1.2.0')
+  s.add_dependency('sinatra', '~> 1.3.0')
   s.add_dependency('ptools')
 
   s.add_development_dependency('minitest')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequenceserver
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,33 +11,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12914680 !ruby/object:Gem::Requirement
+  requirement: &20416580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12914680
+  version_requirements: *20416580
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &12914000 !ruby/object:Gem::Requirement
+  requirement: &20398120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *12914000
+  version_requirements: *20398120
 - !ruby/object:Gem::Dependency
   name: ptools
-  requirement: &12913520 !ruby/object:Gem::Requirement
+  requirement: &20396840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12913520
+  version_requirements: *20396840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12912540 !ruby/object:Gem::Requirement
+  requirement: &20383420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12912540
+  version_requirements: *20383420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12911100 !ruby/object:Gem::Requirement
+  requirement: &20376580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12911100
+  version_requirements: *20376580
 description: ! 'SequenceServer lets you rapidly set up a BLAST+ server with an intuitive
   user interface for use locally or over the web.
 
@@ -87,6 +87,7 @@ files:
 - lib/sequenceserver/blast.rb
 - lib/sequenceserver/web_blast/public/favicon.ico
 - lib/sequenceserver/web_blast/public/js/sequenceserver.sequence-viewer.js
+- lib/sequenceserver/version.rb
 - lib/sequenceserver/database.rb
 - views/search.erb
 - views/500.erb