little fixes

This commit is contained in:
Anton Chuchkalov 2014-11-20 13:42:36 +04:00
parent c47b10c952
commit 803685df8e
4 changed files with 39 additions and 2 deletions

View File

@ -15,3 +15,10 @@ gem "bson_ext"
gem "multi_json", "1.7.8"
gem "rufus-scheduler", "2.0.24"
gem "sidekiq", "3.2.6"
group :test do
gem 'cucumber'
gem 'test-unit'
gem 'httpclient'
end

View File

@ -8,6 +8,8 @@ GEM
bson_ext (1.9.2)
bson (~> 1.9.2)
builder (3.2.2)
celluloid (0.15.2)
timers (~> 1.1.0)
chef (11.10.4)
chef-zero (~> 1.7, >= 1.7.2)
diff-lcs (~> 1.2, >= 1.2.4)
@ -34,6 +36,13 @@ GEM
moneta (< 0.7.0)
rack
coderay (1.1.0)
connection_pool (2.1.0)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
daemons (1.1.9)
diff-lcs (1.2.5)
em-websocket (0.3.8)
@ -52,8 +61,11 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (>= 1.5.11)
formatador (0.2.4)
gherkin (2.12.2)
multi_json (~> 1.3)
hashie (2.0.5)
highline (1.6.20)
httpclient (2.4.0)
ipaddress (0.8.0)
json (1.8.1)
method_source (0.8.2)
@ -69,6 +81,7 @@ GEM
mongo (1.9.2)
bson (~> 1.9.2)
multi_json (1.8.4)
multi_test (0.1.1)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
@ -87,6 +100,7 @@ GEM
mixlib-shellout
systemu (~> 2.5.2)
yajl-ruby
power_assert (0.2.1)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
@ -98,10 +112,19 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
redis (3.1.0)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rufus-scheduler (2.0.24)
tzinfo (>= 0.3.22)
sidekiq (3.2.6)
celluloid (= 0.15.2)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
@ -119,6 +142,8 @@ GEM
thin (>= 1.3.1)
slop (3.4.7)
systemu (2.5.2)
test-unit (3.0.7)
power_assert
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@ -126,6 +151,7 @@ GEM
thread_safe (0.1.3)
atomic
tilt (1.4.1)
timers (1.1.0)
tzinfo (1.1.0)
thread_safe (~> 0.1)
yajl-ruby (1.2.0)
@ -136,13 +162,17 @@ PLATFORMS
DEPENDENCIES
bson_ext
chef (>= 11)
cucumber
fog (~> 1.20)
httpclient
mime-types (~> 1.25.1)
mixlib-shellout
mongo
multi_json
rufus-scheduler (= 2.0.24)
sidekiq
sinatra (= 1.4.3)
sinatra-contrib (= 1.4.1)
sinatra-websocket (~> 0.3.0)
test-unit
thin (~> 1.5.1)

View File

@ -34,7 +34,7 @@ config[:report_dir_v2] = File.expand_path(File.join(config[:devops_home], "repor
run Rack::URLMap.new({
"#{config[:url_prefix]}/v2.0" => DevopsService.new(config),
"#{config[:url_prefix]}/client" => Client.new(config),
"#{config[:url_prefix]}/v2.0/report" => Report.new(config, "v2"),
"#{config[:url_prefix]}/v2.0/report" => ReportServer.new(config, "v2"),
"#{config[:url_prefix]}/sidekiq" => Sidekiq::Web,
"#{config[:url_prefix]}/version" => DevopsVersion.new
})

View File

@ -1,6 +1,6 @@
require 'sinatra/base'
class Report< Sinatra::Base
class ReportServer < Sinatra::Base
def initialize config, version
super()