ready to release

.gitignore

@@ -3,3 +3,5 @@
 coverage.data
 .idea
 .gem
+pkg/*
+logs/*

Gemfile

 source "http://rubygems.org"
-gem "sinatra", "= 1.1.2"
-gem "sinatra-namespace", "= 0.6.1"
-gem "ohm", "= 0.1.3"
-gem "ohm-contrib", "= 0.1.0"
-gem "haml", "= 3.0.25"
-gem "rake", "= 0.8.7"
-gem "vegas", "= 0.1.8"
-group :development do
-  gem "jeweler", "= 1.5.2"
-  gem "sinatra-reloader", "= 0.5.0"
-  gem "rspec", "= 2.4.0"
-  gem "rcov", "= 0.9.9"
-  gem "rack-test", "= 0.5.7", :require => "rack/test"
-  gem "ZenTest", "= 4.4.2"
-  gem "autotest", "= 4.4.6"
-  gem "autotest-growl", "= 0.2.9", :require => "autotest/growl"
-end
-platforms :mri do
-  gem "yajl-ruby", "= 0.7.9", :require => "yajl"
-end
-platforms :jruby do
-  gem "json-jruby", "= 1.4.6", :require => "json"
-  gem "warbler", "= 1.2.1"
-  gem "jruby-openssl", "= 0.7.3"
-  gem "rack-jetty", "= 0.2.0"
-end
+
+gemspec

Gemfile.lock

+PATH
+  remote: .
+  specs:
+    noah (0.0.5)
+      haml (= 3.0.25)
+      ohm (= 0.1.3)
+      ohm-contrib (= 0.1.0)
+      rake (= 0.8.7)
+      sinatra (= 1.1.2)
+      sinatra-namespace (= 0.6.1)
+      thin (= 1.2.7)
+      vegas (= 0.1.8)
+      yajl-ruby (= 0.7.9)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -6,21 +20,10 @@ GEM
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     backports (1.18.2)
-    bouncy-castle-java (1.5.0145.2)
+    daemons (1.1.0)
     diff-lcs (1.1.2)
-    git (1.2.5)
+    eventmachine (0.12.10)
     haml (3.0.25)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    jruby-jars (1.5.6)
-    jruby-openssl (0.7.3)
-      bouncy-castle-java
-    jruby-rack (1.0.5)
-    json (1.4.6-java)
-    json-jruby (1.4.6-java)
-      json (= 1.4.6)
     monkey-lib (0.5.4)
       backports
     nest (1.1.0)
@@ -30,13 +33,10 @@ GEM
     ohm-contrib (0.1.0)
       ohm
     rack (1.2.1)
-    rack-jetty (0.2.0)
-      rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rcov (0.9.9-java)
     redis (2.1.1)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -46,7 +46,6 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    rubyzip (0.9.4)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
@@ -62,14 +61,13 @@ GEM
     sinatra-sugar (0.5.0)
       monkey-lib (~> 0.5.0)
       sinatra (~> 1.0)
+    thin (1.2.7)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     tilt (1.2.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
-    warbler (1.2.1)
-      jruby-jars (>= 1.4.0)
-      jruby-rack (>= 1.0.0)
-      rake (>= 0.8.7)
-      rubyzip (>= 0.9.4)
     yajl-ruby (0.7.9)
 
 PLATFORMS
@@ -80,20 +78,8 @@ DEPENDENCIES
   ZenTest (= 4.4.2)
   autotest (= 4.4.6)
   autotest-growl (= 0.2.9)
-  haml (= 3.0.25)
-  jeweler (= 1.5.2)
-  jruby-openssl (= 0.7.3)
-  json-jruby (= 1.4.6)
-  ohm (= 0.1.3)
-  ohm-contrib (= 0.1.0)
-  rack-jetty (= 0.2.0)
+  noah!
   rack-test (= 0.5.7)
-  rake (= 0.8.7)
   rcov (= 0.9.9)
   rspec (= 2.4.0)
-  sinatra (= 1.1.2)
-  sinatra-namespace (= 0.6.1)
   sinatra-reloader (= 0.5.0)
-  vegas (= 0.1.8)
-  warbler (= 1.2.1)
-  yajl-ruby (= 0.7.9)

README.md

@@ -41,6 +41,10 @@ The binary script in bin was created using [Vegas](https://github.com/quirkey/ve
 
 If you leave off `-F`, all information will be logged to `$HOME/.vegas/noah`. Run `bin/noah -h` for more options.
 
+Please note on JRuby that the port setting does not work for some f'cking reason. Bug claims to have been fixed. Until then, when on Jruby run like so:
+
+  noah -F -d -r redis://localhost:6379/0
+
 ## Example links
 [Noah Start Page](http://localhost:9292/)
 

lib/noah/app.rb

@@ -22,10 +22,14 @@ module Noah
     end
 
     configure(:development) do
-      require 'sinatra/reloader'
-      register Sinatra::Reloader
-      also_reload File.join(File.dirname(__FILE__), 'models.rb')
-      also_reload File.join(File.dirname(__FILE__), 'helpers.rb')
+      begin
+        require 'sinatra/reloader'
+        register Sinatra::Reloader
+        also_reload File.join(File.dirname(__FILE__), 'models.rb')
+        also_reload File.join(File.dirname(__FILE__), 'helpers.rb')
+      rescue LoadError
+        puts "sinatra-reloader gem missing. reloading disabled"
+      end
     end
 
     before do

lib/noah/version.rb

 module Noah
-  VERSION = "0.0.1"
+  VERSION = "0.0.5"
 end

noah.gemspec

@@ -5,7 +5,7 @@ require "noah/version"
 Gem::Specification.new do |s|
   s.name        = "noah"
   s.version     = Noah::VERSION
-  s.platform    = Gem::Platform::RUBY
+  s.platform    = RUBY_ENGINE
   s.authors     = ["lusis"]
   s.email       = ["lusis.org+rubygems.org@gmail.com"]
   s.homepage    = "https://github.com/lusis/noah"
@@ -18,4 +18,27 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_dependency("rake", ["= 0.8.7"])
+  s.add_dependency("sinatra", ["= 1.1.2"])
+  s.add_dependency("sinatra-namespace", ["0.6.1"])
+  s.add_dependency("ohm", ["= 0.1.3"])
+  s.add_dependency("ohm-contrib", ["= 0.1.0"])
+  s.add_dependency("haml", ["= 3.0.25"])
+  s.add_dependency("vegas", ["= 0.1.8"])
+  s.add_dependency("yajl-ruby", ["= 0.7.9"]) if s.platform.to_s == 'ruby'
+  s.add_dependency("jruby-json", ["= 1.5.0"]) if s.platform.to_s == 'jruby'
+  s.add_dependency("thin", ["= 1.2.7"]) if s.platform.to_s == 'ruby'
+  s.add_dependency("json-jruby", ["= 1.4.6"]) if s.platform.to_s == 'jruby'
+  s.add_dependency("jruby-openssl", ["= 0.7.3"]) if s.platform.to_s == 'jruby'
+
+  s.add_development_dependency("sinatra-reloader", ["= 0.5.0"])
+  s.add_development_dependency("rspec", ["= 2.4.0"])
+  s.add_development_dependency("rcov", ["= 0.9.9"]) if s.platform.to_s == 'ruby'
+  s.add_development_dependency("rack-test", ["= 0.5.7"])
+  s.add_development_dependency("ZenTest", ["= 4.4.2"])
+  s.add_development_dependency("autotest", ["= 4.4.6"])
+  s.add_development_dependency("autotest-growl", ["= 0.2.9"])
+  s.add_development_dependency("warbler", ["= 1.2.1"]) if s.platform.to_s == 'java'
+
 end