gaptool-server 0.6.0.beta1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f07c5a5a5853295749abfb9e33430dd54ad1678b
-  data.tar.gz: 1b6082b74ddbe7bcd38efaa24a73b75ecc58f2e5
+  metadata.gz: e207c02d589d8bfb58e728c7b9b62aa529a4dafa
+  data.tar.gz: a260e393c04319f65e9d805c5b2efd67834dc264
 SHA512:
-  metadata.gz: 9e86ef3243630f8e5633721d7c69c29471b887285c3156bc6984118f843aa9aff5ebd13bc9d92fedd2c0896500ca9944fff58a3849ab369fd04dd0e15b9c9051
-  data.tar.gz: 44d38d87ccfc61820177391152663335f6a2f2c30ba8d268852ca7d7b2810001e248f5090069482e2c158d031bb07beffb4543858c4eedca4f986450ac39904a
+  metadata.gz: 029ec75667629cab21f13458344987e3c76430e9d7aba798b92d088bccdf0e0b339bb8f374ea1db7db30839b83ec5de7bb4f1621855db260b57f0ac7e0fab924
+  data.tar.gz: e80e3092bfd5d8fa3ae1fe44c09ed21a09a97794c1ee968b8fd395c7304554b8cceea10634abcd904a8375c6511cee49222f50be72e6f4f9dfa171b8580447f1

data/Rakefile

@@ -5,6 +5,7 @@ require 'shellwords'
 require 'rspec/core/rake_task'
 require_relative 'lib/helpers/redis'
 require_relative 'lib/helpers/init'
+require_relative 'lib/helpers/rehash'
 
 DH = Gaptool::Data
 $stdout.sync = true
@@ -20,15 +21,17 @@ end
 
 Dir.glob('tasks/*.rb').each { |r| load r}
 
-desc "Start the shell"
-task :shell do
-  exec "racksh #{Shellwords.join(ARGV[1..-1])}"
-end
-task :sh => :shell
+unless File.exists?('/.dockerenv')
+  desc "Start the shell"
+  task :shell do
+    exec "racksh #{Shellwords.join(ARGV[1..-1])}"
+  end
+  task :sh => :shell
 
-desc "Start the HTTP server"
-task :server do
-  exec "unicorn #{Shellwords.join(ARGV[1..-1])}"
+  desc "Start the HTTP server"
+  task :server do
+    exec "unicorn #{Shellwords.join(ARGV[1..-1])}"
+  end
 end
 
 task :help do

data/VERSION

@@ -1 +1 @@
-0.6.0.beta1
+0.6.0

data/bin/gaptool_server_migrate_0.5-0.6

@@ -13,15 +13,15 @@ puts "Removing cruft"
 # First, remove cruft. Like all servers created but never registered, etc
 ['instance:*', '_*', 'apikey:*', 'service:*', 'running', 'ec2*',
  'failover', 'capacity', 'sg:*'].each do |pattern|
-  $redis.keys(pattern).each do |key|
-    $redis.del key
+  $redis.redis.keys(pattern).each do |key|
+    $redis.redis.del key
   end
 end
 
 puts "Migrating roles..."
-$redis.keys('role:*').each do |key|
+$redis.redis.keys('role:*').each do |key|
   puts " - #{key}"
-  data = $redis.hgetall(key)
+  data = $redis.redis.hgetall(key)
   role = key.sub('role:', '')
   unless data['ami'].nil?
     # We didn't have per-regin ami in roles, so
@@ -33,37 +33,40 @@ $redis.keys('role:*').each do |key|
 end
 
 puts "Migrating ami info to role..."
-$redis.keys('amis:*').each do |key|
+$redis.redis.keys('amis:*').each do |key|
   role = key.sub("amis:", '')
   puts " - #{key}"
-  amis = $redis.hgetall(key)
+  amis = $redis.redis.hgetall(key)
   roledata = DH.get_role_data(role)
   roledata['amis'] = amis.merge(roledata['amis'] || {})
   DH.save_role_data(role, roledata)
-  $redis.del(key)
+  $redis.redis.del(key)
 end
 
 puts "Migrating apps..."
-$redis.keys('app:*').each do |key|
+$redis.redis.keys('app:*').each do |key|
   puts " - #{key}"
   appname = key.sub('app:', '')
-  role = $redis.hget(key, "role")
+  role = $redis.redis.hget(key, "role")
   if role.nil? || appname.nil?
     puts "Missing info for app: #{appname} role: #{role}"
   end
-  $redis.del(key)
+  $redis.redis.del(key)
   DH.add_app(appname, role) unless role.nil?
 end
 
 puts "Migrating instances..."
-$redis.keys('host:*').each do |key|
+$redis.redis.keys('host:*').each do |key|
   puts " - #{key}"
   pfx, role, env, iid = key.split(':')
-  data = $redis.hgetall(key)
+  data = $redis.redis.hgetall(key)
   data['role'] = role
   data['environment'] = env
+  unless data['chef_runlist'].nil?
+    data['chef_runlist'] = JSON.parse data['chef_runlist']
+  end
   DH.addserver(iid, data, nil)
-  $redis.del(key)
+  $redis.redis.del(key)
   # remove stale keys from hsh
   $redis.hdel "instance:#{iid}", ["capacity", "mirror", "secret", 'instance']
 end
@@ -84,6 +87,7 @@ $redis.smembers('instances').each do |inst|
 end
 
 puts "Rename old config keys"
+$redis.redis.rename('config', 'gt:config')
 $redis.hset('config', 'chef_repo', $redis.hget('config', 'chefrepo'))
 $redis.hset('config', 'chef_branch', $redis.hget('config', 'chefbranch'))
 
@@ -93,4 +97,17 @@ puts "Removing old config keys"
   $redis.hdel 'config', key
 end
 
+unless ARGV[0].nil?
+  puts "Updating GT_URL to #{ARGV[0]}"
+  $redis.hset('config', 'url', ARGV[0])
+end
+
+puts "Namespace remaining keys"
+['users', 'amis'].each { |k| $redis.redis.rename(k, "gt:#{k}")}
+
+puts "Removing out-of-namespace keys"
+$redis.redis.keys('*').select { |k| !k.start_with? ('gt:')}.each do |k|
+  $redis.redis.del(k)
+end
+
 $redis.save

data/lib/app.rb

@@ -54,6 +54,15 @@ class GaptoolServer < Sinatra::Application
       raise Unauthenticated unless user[:key] == env['HTTP_X_GAPTOOL_KEY']
     end
   end
+
+  after do
+    # Fix for old versions of gaptool-api
+    if request.preferred_type.to_str == "application/json"
+      content_type "application/json"
+    else
+      content_type 'text/html'
+    end
+  end
 end
 
 require_relative 'helpers/init'

data/lib/helpers/data.rb

@@ -44,6 +44,11 @@ module Gaptool
       end
     end
 
+    def self.set_server_data_attr(instance, attr, value)
+      return if value.nil? || (value.is_a?(String) && value.empty?) || !!value == value
+      $redis.hset("instance:#{instance}", attr, value)
+    end
+
     def self.save_server_data(instance, data)
 
       unless data['chef_runlist'].nil?
@@ -97,8 +102,23 @@ module Gaptool
       $redis.hget('config', key)
     end
 
+    def self.ensure_config(key, default)
+      cur = get_config(key)
+      cur = set_config(key, default) if cur.nil? || cur.empty?
+      cur
+    end
+
     def self.set_config(key, value)
       $redis.hset('config', key, value)
+      value
+    end
+
+    def self.del_config(key)
+      $redis.hdel('config', key)
+    end
+
+    def self.get_all_configs
+      $redis.hgetall('config')
     end
 
     def self.get_server_data(instance, opts={})
@@ -235,6 +255,13 @@ module Gaptool
       $redis.smembers("role:#{role}:apps")
     end
 
+    def self.stringify_apps(rs)
+      unless rs['apps'].nil?
+        rs['apps'] = rs['apps'].to_json
+      end
+      rs
+    end
+
     def self.useradd(user, key=nil)
       key = SecureRandom.hex(64) unless key
       $redis.hset('users', user, key)

data/lib/helpers/ec2.rb

@@ -1,3 +1,4 @@
+require 'aws-sdk'
 require 'securerandom'
 
 # encoding: utf-8
@@ -45,14 +46,25 @@ module Gaptool
     end
 
     def self.create_ec2_instance(ec2opts, data)
-      return "i-test#{SecureRandom.hex(2)}" if ENV['DRYRUN']
-      configure_ec2 data['zone'].chop
+      if ENV['DRYRUN']
+        id = "i-test#{SecureRandom.hex(2)}"
+        return {id: id,
+                hostname: "test-#{id}.#{data[:zone].chop}.compute.amazonaws.com",
+                launch_time: Time.now.to_s}
+      end
+      configure_ec2 data[:zone].chop
       ec2 = AWS::EC2.new
 
-      instance = ec2.instances.create(opts)
+      instance = ec2.instances.create(ec2opts)
       instance.add_tag('Name', value: "#{data[:role]}-#{data[:env]}-#{instance.id}")
       instance.add_tag('gaptool', :value => "yes")
-      instance.id
+      launch_time = instance.launch_time.to_s
+      launch_time = launch_time.empty? ? Time.now.to_s : launch_time
+      {
+        id: instance.id,
+        hostname: instance.public_dns_name,
+        launch_time: launch_time
+      }
     end
 
     def self.terminate_ec2_instance(zone, id)
@@ -73,7 +85,7 @@ module Gaptool
       ec2 = AWS::EC2.new
       instance = ec2.instances[id]
       return {
-        dns_name: instance.dns_name
+        hostname: instance.dns_name
       }
     end
   end

data/lib/helpers/redis.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'redis-namespace'
 
 # docker links support
 unless ENV['REDIS_PORT_6379_TCP_ADDR'].nil?
@@ -12,8 +13,11 @@ ENV['REDIS_PORT'] = '6379' unless ENV['REDIS_PORT']
 ENV['REDIS_PASS'] = nil unless ENV['REDIS_PASS']
 ENV['REDIS_DB'] = '0' unless ENV['REDIS_DB']
 
-$redis = Redis.new(:host => ENV['REDIS_HOST'],
-                   :port => ENV['REDIS_PORT'].to_i,
-                   :password => ENV['REDIS_PASS'],
-                   :db => ENV['REDIS_DB'].to_i)
+prefix = ENV.fetch('REDIS_PREFIX', 'gt')
 
+conn = Redis.new(:host => ENV['REDIS_HOST'],
+                 :port => ENV['REDIS_PORT'].to_i,
+                 :password => ENV['REDIS_PASS'],
+                 :db => ENV['REDIS_DB'].to_i)
+
+$redis = Redis::Namespace.new(prefix, redis: conn)

data/lib/helpers/rehash.rb

@@ -1,15 +1,16 @@
+require_relative "ec2"
+require_relative "data"
+
 module Gaptool
   module EC2
     def self.rehash()
-      servers.each do |inst|
-        rmserver inst
+      Gaptool::Data::servers.each do |inst|
+        Gaptool::Data::rmserver inst
       end
-      layout = roles()
-      puts layout
-      zones.each do |zone|
-        @ec2 = AWS::EC2.new(:access_key_id => $redis.hget('config', 'aws_id'),
-                            :secret_access_key => $redis.hget('config', 'aws_secret'),
-                            :ec2_endpoint => "ec2.#{zone}.amazonaws.com")
+      roles = Gaptool::Data::roles
+      Gaptool::Data::zones.each do |zone|
+        Gaptool::EC2::configure_ec2 zone
+        @ec2 = AWS::EC2.new
         ilist = []
         @ec2.instances.each do |instance|
           if instance.tags['gaptool'] == 'yes' && instance.status == :running
@@ -18,18 +19,17 @@ module Gaptool
         end
         ilist.each do |instance|
           puts " - #{instance.tags['Name']}"
-          role, environment, iid = instance.tags['Name'].split('-')
+          role, environment, iid = instance.tags['Name'].split('-', 3)
           data = {
             "zone"=> instance.availability_zone,
-            "itype"=> instance.instance_type,
             "role"=> role,
             "environment"=> environment,
-            "hostname"=> instance.public_dns_name,
-            "apps" => layout[role].to_s,
+            "hostname" => instance.public_dns_name,
+            "launch_time" => instance.launch_time.to_s,
+            "apps" => roles[role].to_s,
             "instance"=> instance.instance_id
           }
-          puts data
-          addserver(data['instance'], data, nil)
+          Gaptool::Data::addserver(iid, data, nil)
         end
       end
       return {"action" => "complete"}

data/lib/routes.rb

@@ -31,15 +31,16 @@ class GaptoolServer < Sinatra::Application
     sgid = Gaptool::EC2::get_or_create_securitygroup(data['role'], data['environment'], data['zone'], security_group)
     image_id = data['ami'] || Gaptool::Data::get_ami_for_role(data['role'], data['zone'].chop)
     data['terminable'] = data['terminable'].nil? ? true : !!data['terminable']
+    data['secret'] = secret
 
-    id = Gaptool::EC2::create_ec2_instance(
+    instance = Gaptool::EC2::create_ec2_instance(
     {
       :image_id => image_id,
       :availability_zone => data['zone'],
       :instance_type => data['itype'],
       :key_name => "gaptool",
       :security_group_ids => sgid,
-      :user_data => "#!/bin/bash\ncurl --silent -H 'X-GAPTOOL-USER: #{env['HTTP_X_GAPTOOL_USER']}' -H 'X-GAPTOOL-KEY: #{env['HTTP_X_GAPTOOL_KEY']}' #{$redis.hget('config', 'url')}/register -X PUT --data '#{data.to_json}' | bash"
+      :user_data => "#!/bin/bash\ncurl --silent -H 'X-GAPTOOL-USER: #{env['HTTP_X_GAPTOOL_USER']}' -H 'X-GAPTOOL-KEY: #{env['HTTP_X_GAPTOOL_KEY']}' #{Gaptool::Data.get_config('url')}/register -X PUT --data '#{data.to_json}' | bash"
      }, {
        role: data['role'],
        env: data['environment'],
@@ -47,10 +48,13 @@ class GaptoolServer < Sinatra::Application
      }
     )
     # Add host tag
-    Gaptool::Data::addserver(id, data, secret)
-    json({instance: id,
+    data.merge(instance.reject { |k, v| k == :id })
+    Gaptool::Data::addserver(instance[:id], data, secret)
+    json({instance: instance[:id],
           ami: image_id,
           role: data['role'],
+          hostname: instance[:hostname],
+          launch_time: instance[:launch_time],
           environment: data['environment'],
           secret: secret,
           terminable: data['terminable'],
@@ -77,13 +81,15 @@ class GaptoolServer < Sinatra::Application
     raise Forbidden, "Can't register instance: wrong secret or missing role/environment" unless instance_id
 
     hostname = Gaptool::EC2::get_ec2_instance_data(data['zone'].chop, instance_id)[:hostname]
+    Gaptool::Data.set_server_data_attr(instance_id, "hostname", hostname)
     host_data = Gaptool::Data::get_server_data instance_id, initkey: true, force_runlist: true
 
     chef_repo = host_data['chef_repo']
     chef_branch = host_data['chef_branch']
+    chef_environment = host_data['environment']
     # FIXME: remove init key from redis
-    initkey = host_data['init_key']
-    run_list = host_data['chef_runlist'].to_json
+    initkey = Gaptool::Data::get_config("initkey")
+    run_list = host_data['chef_runlist']
 
     jdata = {
       'hostname' => hostname,
@@ -104,6 +110,8 @@ class GaptoolServer < Sinatra::Application
       initkey: initkey,
       chef_branch: chef_branch,
       chef_repo: chef_repo,
+      chef_environment: chef_environment,
+      chef_version: Gaptool::Data::ensure_config("chef_version", "11.16.4"),
       json: jdata
     }
   end
@@ -111,14 +119,14 @@ class GaptoolServer < Sinatra::Application
   get '/hosts' do
     servers = Gaptool::Data::servers.map do |inst|
       Gaptool::Data::get_server_data inst
-    end
+    end.select{ |s| !s['registered']}
     json servers
   end
 
   get '/apps' do
     out = {}
     Gaptool::Data.apps.each do |app|
-      out[app] = Gaptool::Data::get_app_data(app)
+      out["app:#{app}"] = Gaptool::Data::get_app_data(app)
     end
     json out
   end
@@ -126,12 +134,12 @@ class GaptoolServer < Sinatra::Application
   get '/hosts/:role' do
     servers =  Gaptool::Data::servers_in_role(params[:role]).map do |inst|
       Gaptool::Data::get_server_data inst
-    end
+    end.select{ |s| !s['registered'] }
     json servers
   end
 
   get '/instance/:id' do
-    json Gaptool::Data::get_server_data(params[:id])
+    json Gaptool::Data::stringify_apps(Gaptool::Data::get_server_data(params[:id]))
   end
 
   get '/hosts/:role/:environment' do
@@ -141,14 +149,14 @@ class GaptoolServer < Sinatra::Application
       list = Gaptool::Data::servers_in_role_env params[:role], params[:environment]
     end
     servers = list.map do |inst|
-      Gaptool::Data::get_server_data inst
+      Gaptool::Data::stringify_apps(Gaptool::Data::get_server_data(inst))
     end
 
     json servers
   end
 
   get '/host/:role/:environment/:instance' do
-    json Gaptool::Data::get_server_data params[:instance]
+    json Gaptool::Data::stringify_apps(Gaptool::Data::get_server_data(params[:instance]))
   end
 
   get '/ssh/:role/:environment/:instance' do
@@ -166,7 +174,7 @@ class GaptoolServer < Sinatra::Application
   end
 
   post '/rehash' do
-    json Gaptool::Rehash::rehash()
+    json Gaptool::EC2::rehash()
   end
 
 end

data/lib/views/init.erb

@@ -1,12 +1,18 @@
+#!/bin/bash
+set -e
+cd /root
 apt-get update
 apt-get install -ymq zsh git libssl-dev ruby1.9.1-full build-essential
-gem install --bindir /usr/local/bin --no-ri --no-rdoc chef
+curl -LO https://www.getchef.com/chef/install.sh
+bash install.sh -v <%= chef_version %>
+
 cat << 'EOFKEY' > /root/.ssh/id_rsa
 <%= initkey %>
 EOFKEY
 chmod 600 /root/.ssh/id_rsa
 echo 'StrictHostKeyChecking no' > /root/.ssh/config
+
 git clone -b <%= chef_branch %> <%= chef_repo %> /root/ops
 echo '<%= json %>' > /root/init.json
-chef-solo -c /root/ops/cookbooks/init.rb -j /root/init.json && \
+chef-solo -c /root/ops/cookbooks/init.rb -j /root/init.json -E <%= chef_environment %> && \
     (rm /root/.ssh/id_rsa; userdel -r ubuntu; rm -rf /root/.ssh; rm -rf /root/ops)

data/tasks/config.rb

@@ -0,0 +1,24 @@
+namespace :config do
+  desc "Add or update a new config key"
+  task :set, [:key,:value] do |t, args|
+    DH.set_config(args[:key], args[:value])
+  end
+
+  desc "Delete a key if set"
+  task :del, [:key] do |t, args|
+    DH.del_config(args[:key])
+  end
+
+  desc "Get a config"
+  task :get, [:key] do |t,args|
+    DH.get_config(args[:key])
+  end
+end
+
+desc "List config"
+task :config do
+  puts 'Config:'
+  DH.get_all_configs().keys.each do |k|
+    puts " - #{k}"
+  end
+end

data/tasks/docker.rb

@@ -43,6 +43,11 @@ unless File.exists?('/.dockerenv')
       sys(%w(fig run --rm gaptool rake test))
     end
 
+    desc "Rehash instances"
+    task :rehash => :build do
+      sys(%w(fig run --rm gaptool rake rehash))
+    end
+
     desc "Stop docker containers"
     task :stop do
       sys(%w(fig stop))

data/tasks/gem.rb

@@ -1,27 +1,30 @@
-namespace :gem do
+unless File.exists?('/.dockerenv')
+  namespace :gem do
 
-  desc "Build the gem"
-  task :build => :clean do
-    sys(%w(gem build gaptool-server.gemspec))
-  end
+    desc "Build the gem"
+    task :build => :clean do
+      sys(%w(gem build gaptool-server.gemspec))
+    end
 
-  desc "Clean built file"
-  task :clean do
-    sys(%w(rm -vf *.gem))
-  end
+    desc "Clean built file"
+    task :clean do
+      sys(%w(rm -vf *.gem))
+    end
 
-  desc "Bump the version"
-  task :bump do
-    version = File.read('VERSION').strip
-    nver = version.next
-    f = File.open('VERSION', 'w')
-    f.write(nver)
-    f.close
-    puts "Bumped #{version} => #{nver}"
-  end
+    desc "Bump the version"
+    task :bump do
+      version = File.read('VERSION').strip
+      nver = version.next
+      f = File.open('VERSION', 'w')
+      f.write(nver)
+      f.close
+      puts "Bumped #{version} => #{nver}"
+    end
 
-  desc "Push"
-  task :push => :build do
-    sys(%w(gem push gaptool-server*.gem))
+    desc "Push"
+    task :push => :build do
+      version = File.read('VERSION').strip
+      sys(%W(gem push gaptool-server-#{version}.gem))
+    end
   end
 end

data/test/api_test.rb

@@ -44,7 +44,8 @@ describe "Test API" do
       'chef_runlist' => ['recipe[myrecipe]'],
       'terminable' => true,
       'zone' => 'my-zone-1a',
-      'itype' => 'm1.type'
+      'itype' => 'm1.type',
+      "hostname" => 'fake.hostname.gild.com'
     }
   end
 
@@ -55,13 +56,18 @@ describe "Test API" do
   it "should return 200" do
     get '/'
     expect(last_response.status).to eq(200)
+    expect(last_response.content_type).to include('text/html')
+
+    header 'Accept', 'application/json'
+    get '/'
+    expect(last_response.status).to eq(200)
+    expect(last_response.content_type).to include('application/json')
   end
 
   it "should create a instance" do
     post '/init', host_data.to_json
     expect(last_response.status).to eq(200)
-    expect(last_response.content_type).to eq('application/json')
-    expect(JSON.parse(last_response.body).keys).to eq(["instance", "ami", "role", "environment", "secret", "terminable", "security_group"])
+    expect(JSON.parse(last_response.body).keys).to eq(["instance", "ami", "role", "hostname", "launch_time", "environment", "secret", "terminable", "security_group"])
   end
 
   it "should get the runlist from the role" do
@@ -162,6 +168,20 @@ describe "Test API" do
 
   it "should register the server" do
     add_and_register_server
+    expect(last_response.body).to include("-E #{host_data['environment']}")
+  end
+
+  it "should not find any hosts" do
+    post '/init', host_data.to_json
+    expect(last_response.status).to eq(200)
+
+    get '/hosts'
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body)).to eq([])
+
+    get "/hosts/#{host_data['role']}"
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body)).to eq([])
   end
 
   it "should find an host" do
@@ -190,7 +210,7 @@ describe "Test API" do
   it "should find an host by role" do
     other = host_data.merge({'role' => 'otherrole'})
     id1 = add_and_register_server(other)['instance']
-    id2 = add_and_register_server()['instance']
+    add_and_register_server()['instance']
 
     get '/hosts/otherrole'
     expect(last_response.status).to eq(200)
@@ -214,7 +234,7 @@ describe "Test API" do
   it "should find all hosts by environment and role" do
     id1 = add_and_register_server()['instance']
     id2 = add_and_register_server()['instance']
-    id3 = add_and_register_server(host_data.merge({'environment' => 'otherenv'}))['instance']
+    add_and_register_server(host_data.merge({'environment' => 'otherenv'}))['instance']
     id4 = add_and_register_server(host_data.merge({'role' => 'otherrole'}))['instance']
     get '/hosts/testrole/testenv'
     expect(last_response.status).to eq(200)
@@ -247,8 +267,8 @@ describe "Test API" do
   it "should return the list of apps" do
     DH.add_app("firstapp", "testrole")
     DH.add_app("secondapp", "testrole")
-    apps_list = {"firstapp" => {"role" => "testrole"},
-                 "secondapp" =>{"role" => "testrole"}}
+    apps_list = {"app:firstapp" => {"role" => "testrole"},
+                 "app:secondapp" =>{"role" => "testrole"}}
     get "/apps"
     expect(last_response.status).to eq(200)
     expect(JSON.parse(last_response.body)).to eq(apps_list)

data/test/data_test.rb

@@ -9,6 +9,11 @@ describe "data helpers" do
     DH.set_config('chef_branch', 'master')
   end
 
+  after(:all) do
+    keys = $redis.redis.keys('*').select{|k| !k.start_with?('gt:')}
+    expect(keys).to eq([])
+  end
+
   def data
     {
       'role' => "role",

data/test/test_helper.rb

@@ -11,6 +11,7 @@ libpath = File.realpath(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'rspec'
 require 'rack/test'
 require 'fakeredis/rspec'
+require 'redis-namespace'
 require "#{libpath}/app.rb"
 
 RSpec.configure do |conf|
@@ -22,4 +23,5 @@ end
 
 DH = Gaptool::Data
 
-$redis = Redis.new
+conn = Redis.new
+$redis = Redis::Namespace.new(:gt, redis:conn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta1
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -152,6 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +253,7 @@ files:
 - lib/routes.rb
 - lib/views/init.erb
 - tasks/app.rb
+- tasks/config.rb
 - tasks/docker.rb
 - tasks/gem.rb
 - tasks/user.rb
@@ -266,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: gaptool-server for managing cloud resources