gaptool-server 0.4.6 → 0.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk4ZTM4OWQ1NGNiNTczNTJkNDE0ZGIyZTliOWEyYjEwNmIyOWJmOA==
+    MDNhNzMzYjhjNTUzMTg5NTM1Y2Y5ZGQ3MGM3YzNiNTUxMDcwNDIyMg==
   data.tar.gz: !binary |-
-    ZmMzMGMyN2E3Yjg0NDQ5YTMzMjBkODNiYmJmZWFjOGNkMmZkMWJiNQ==
+    NDk5NWJjMjgzMzFmZDBjYTc5ZTVlMTRhZWFjZDNhNjE4YTQ4ZmNmNA==
 SHA512:
   metadata.gz: !binary |-
-    NjRjODk4MTYyZWMzZWI3MWIwMDkyYzY5Yzg5YjY4MDliNjIzMjliMGMxOWJj
-    ZTQ3OWQ4ODYzYmExYWMyN2Q5NzI0MWM0YzA1MjgxNDEzNDkzMWY3ZjMxMzg1
-    ZDc2MzAzNDMyMTIyNzQ0ZjM1NTNkOGUwMDE2YmU5YTY5OGE4MTM=
+    ZmM5MmMxODZlNDIyMWI1YmY3N2NkYTlhMzQ2ZmQ0M2UzYTZmMmQwYTZmZjJl
+    N2RlODZlZWMxZWY4MWE5ZmU3Yjg4ZTQ1ZWNiNDUwOGVhYThmN2M5MTBmNGFm
+    MzY2NzNhMGQzZDFiN2IzNTg3ZWM0NzgyYWUyYzQxMmJlYWY3MmM=
   data.tar.gz: !binary |-
-    YTU0MmFjYTJjNzA3MmEzNTcwOWQ0MmNhZjg2NDdjNzRmMWEyZjYwM2ZlZTAz
-    MzI5YmI3MTk0N2M0OGM0ZjE5NmUwZmNhM2QyYTE5OTcxMjRiNzZiZDZhZjQ1
-    OTNmNTBiYWU1MjU2ZjlkMTQ4YTBlMGJhMmU0OWY0OTc5ZDQ5ZWI=
+    Nzg4ZTUzMmE4MDZlZjRjYTZjOTAxZGJiMmNlZThkZDM1ZjA4Y2VmZWE2MjA3
+    NWVmOWVhNGNmMzQ5ZjNlZTYzYmNjY2Q0MWE4MzAyN2JkZjMyOGQyNTc1ZTQ1
+    ZDRmYjUzYzZhMDk0ZjQxZmQwZDA5Y2Q3ZDU1NjY1YzU2ZjA4OGE=

data/gaptool-server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-server"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey", "Francesco Laurita"]

data/lib/routes/main.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 class GaptoolServer < Sinatra::Application
 
+  error do
+    {error: "Sorry there was a nasty error - #{env['sinatra.error']}" }.to_json
+  end
+
   get '/' do
     "You must be lost. Read the instructions."
   end
@@ -90,8 +94,8 @@ class GaptoolServer < Sinatra::Application
     @ec2 = AWS::EC2.new
     @instance = @ec2.instances[$redis.get("instance:#{data['role']}:#{data['environment']}:#{data['secret']}")]
     hostname = @instance.dns_name
-    delete = $redis.del("instance:#{data['role']}:#{data['environment']}:#{data['secret']}")
-    @apps = Array.new
+    $redis.del("instance:#{data['role']}:#{data['environment']}:#{data['secret']}")
+    @apps = []
     $redis.keys("app:*").each do |app|
       if $redis.hget(app, 'role') == data['role']
         @apps << app.gsub('app:', '')
@@ -119,7 +123,7 @@ class GaptoolServer < Sinatra::Application
   end
 
   get '/hosts' do
-    out = Array.new
+    out = []
     $redis.keys("host:*").each do |host|
       out << $redis.hgetall(host)
     end
@@ -127,7 +131,7 @@ class GaptoolServer < Sinatra::Application
   end
 
   get '/apps' do
-    out = Hash.new
+    out = {}
     $redis.keys("app:*").each do |app|
       out.merge!(app => $redis.hgetall(app))
     end
@@ -135,7 +139,7 @@ class GaptoolServer < Sinatra::Application
   end
 
   get '/hosts/:role' do
-    out = Array.new
+    out = []
     $redis.keys("host:#{params[:role]}:*").each do |host|
       out << $redis.hgetall(host)
     end
@@ -143,12 +147,11 @@ class GaptoolServer < Sinatra::Application
   end
 
   get '/instance/:id' do
-    out = Array.new
     $redis.hgetall($redis.keys("host:*:*:#{params[:id]}").first).to_json
   end
 
   get '/hosts/:role/:environment' do
-    out = Array.new
+    out = []
     unless params[:role] == "ALL"
       $redis.keys("host:#{params[:role]}:#{params[:environment]}*").each do |host|
         out << $redis.hgetall(host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Matt Bailey