summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock14
-rwxr-xr-xbin/oxidized3
-rw-r--r--oxidized.gemspec3
3 files changed, 16 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ce4c8cf..38cb78e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,20 @@
PATH
remote: .
specs:
- oxidized (0.0.25)
+ oxidized (0.0.26)
grit
haml
net-ssh
puma
sequel
sinatra
+ sinatra-contrib
sqlite3
GEM
remote: https://rubygems.org/
specs:
+ backports (3.6.0)
diff-lcs (1.2.5)
grit (2.5.0)
diff-lcs (~> 1.1)
@@ -21,6 +23,7 @@ GEM
haml (4.0.5)
tilt
mime-types (1.25)
+ multi_json (1.8.4)
net-ssh (2.8.0)
posix-spawn (0.3.8)
puma (2.7.1)
@@ -28,11 +31,20 @@ GEM
rack (1.5.2)
rack-protection (1.5.2)
rack
+ rack-test (0.6.2)
+ rack (>= 1.0)
sequel (4.7.0)
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
+ sinatra-contrib (1.4.2)
+ backports (>= 2.0)
+ multi_json
+ rack-protection
+ rack-test
+ sinatra (~> 1.4.0)
+ tilt (~> 1.3)
sqlite3 (1.3.8)
tilt (1.4.1)
diff --git a/bin/oxidized b/bin/oxidized
index 72db61a..36ab250 100755
--- a/bin/oxidized
+++ b/bin/oxidized
@@ -1,10 +1,9 @@
#!/usr/bin/env ruby
-require 'oxidized'
-
trap("INT") { exit } # sinatra will otherwise steak this from us
begin
+ require 'oxidized'
Process.daemon unless $DEBUG
Oxidized.new
rescue => e
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 2824969..23a44b0 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'oxidized'
- s.version = '0.0.25'
+ s.version = '0.0.26'
s.platform = Gem::Platform::RUBY
s.authors = [ 'Saku Ytti' ]
s.email = %w( saku@ytti.fi )
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
s.add_dependency 'net-ssh'
s.add_dependency 'grit'
s.add_dependency 'sinatra'
+ s.add_dependency 'sinatra-contrib'
s.add_dependency 'haml'
s.add_dependency 'puma'