gaptool-server 0.7.4 → 0.8.0

data/test/data_test.rb

@@ -1,23 +1,23 @@
 require_relative 'test_helper'
 require 'json'
 
-describe "data helpers" do
+redis = Gaptool.redis
 
+describe 'data helpers' do
   before(:each) do
-    $redis.flushall
+    redis.flushall
     DH.set_config('chef_repo', 'myrepo')
     DH.set_config('chef_branch', 'master')
   end
 
   after(:all) do
-    keys = $redis.redis.keys('*').select{|k| !k.start_with?('gt:')}
-    expect(keys).to eq([])
+    redis.flushall
   end
 
   def data
     {
-      'role' => "role",
-      'environment' => "env"
+      'role' => 'role',
+      'environment' => 'env'
     }
   end
 
@@ -25,52 +25,46 @@ describe "data helpers" do
     'i-1234567'
   end
 
-  it "should add a server" do
-    expect { DH.addserver("i-1234567", {}, "secret") }.to raise_error(ArgumentError)
-    expect { DH.addserver('', data, "secret") }.to raise_error(ArgumentError)
+  it 'should add a server' do
+    expect { DH.addserver('i-1234567', {}, 'secret') }.to raise_error(ArgumentError)
+    expect { DH.addserver('', data, 'secret') }.to raise_error(ArgumentError)
 
-    DH.addserver(instid, data, "secret")
+    DH.addserver(instid, data, 'secret')
     server = DH.get_server_data(instid)
-    expect(server).to eq(data.merge({
-      'instance' => instid,
-      'chef_repo' => 'myrepo',
-      'chef_branch' => 'master',
-      'registered' => 'false',
-      'secret' => 'secret',
-      'apps' => []
-    }))
+    expect(server).to eq(data.merge('instance' => instid,
+                                    'chef_repo' => 'myrepo',
+                                    'chef_branch' => 'master',
+                                    'registered' => 'false',
+                                    'secret' => 'secret',
+                                    'apps' => []))
   end
 
-  it "should add a registered server" do
+  it 'should add a registered server' do
     DH.addserver(instid, data, nil)
     server = DH.get_server_data(instid)
-    expect(server).to eq(data.merge({
-      'instance' => instid,
-      'chef_repo' => 'myrepo',
-      'chef_branch' => 'master',
-      'apps' => []
-    }))
+    expect(server).to eq(data.merge('instance' => instid,
+                                    'chef_repo' => 'myrepo',
+                                    'chef_branch' => 'master',
+                                    'apps' => []))
   end
 
-  it "should register a server" do
-    DH.addserver(instid, data, "secret")
+  it 'should register a server' do
+    DH.addserver(instid, data, 'secret')
     res = DH.register_server(data['role'], data['environment'], '')
     expect(res).to be(nil)
 
     res = DH.register_server(data['role'], data['environment'], 'secret')
     expect(res).to eq(instid)
     server = DH.get_server_data(instid)
-    expect(server).to eq(data.merge({
-      'instance' => instid,
-      'chef_repo' => 'myrepo',
-      'chef_branch' => 'master',
-      'apps' => []
-    }))
+    expect(server).to eq(data.merge('instance' => instid,
+                                    'chef_repo' => 'myrepo',
+                                    'chef_branch' => 'master',
+                                    'apps' => []))
   end
 
-  it "should remove a server" do
+  it 'should remove a server' do
     DH.addserver(instid, data, 'secret')
-    res = DH.register_server(data['role'], data['environment'], 'secret')
+    DH.register_server(data['role'], data['environment'], 'secret')
     res = DH.rmserver(instid)
     expect(res).to eq(instid)
     server = DH.get_server_data(instid)
@@ -80,7 +74,7 @@ describe "data helpers" do
     expect(res).to be(nil)
   end
 
-  it "should set a config" do
+  it 'should set a config' do
     c = DH.get_config('fakekey')
     expect(c).to be(nil)
 
@@ -89,51 +83,38 @@ describe "data helpers" do
     expect(c).to eq('value')
   end
 
-  it "should return the initkey" do
-    DH.set_config('initkey', 'FAKEKEY')
-    DH.addserver(instid, data, nil)
-    server = DH.get_server_data(instid, initkey: true)
-    expect(server).to eq(data.merge({
-      'instance' => instid,
-      'chef_repo' => 'myrepo',
-      'chef_branch' => 'master',
-      'initkey' => 'FAKEKEY',
-      'apps' => []
-    }))
-  end
-
-  it "should get the runlist for a node from the role" do
-    DH.save_role_data("role", chef_runlist: ["recipe[myrecipe]"].to_json)
+  it 'should get the runlist for a node from the role' do
+    DH.save_role_data('role', chef_runlist: ['recipe[myrecipe]'].to_json)
     DH.addserver(instid, data, nil)
-    role = DH.get_role_data("role", "testenv")
-    expect(role).to eq({"chef_runlist"=> ["recipe[myrecipe]"],
-                        "apps" => [],
-                        "amis" => {},
-                        "sg" => {}})
+    role = DH.get_role_data('role', 'testenv')
+    expect(role).to eq('chef_runlist' => ['recipe[myrecipe]'],
+                       'apps' => [],
+                       'amis' => {},
+                       'sg' => {})
     server = DH.get_server_data(instid)
-    expect(server).to eq(data.merge("instance" => instid,
-                                    "chef_runlist" => ["recipe[myrecipe]"],
-                                    "chef_repo" => "myrepo",
-                                    "chef_branch" => "master",
-                                    "apps" => [] ))
+    expect(server).to eq(data.merge('instance' => instid,
+                                    'chef_runlist' => ['recipe[myrecipe]'],
+                                    'chef_repo' => 'myrepo',
+                                    'chef_branch' => 'master',
+                                    'apps' => []))
   end
 
-  it "shoud get the ami for a node from the role" do
-    DH.save_role_data("role", ami: 'ami-1234567')
+  it 'shoud get the ami for a node from the role' do
+    DH.save_role_data('role', ami: 'ami-1234567')
     DH.addserver(instid, data, nil)
-    role = DH.get_role_data("role", "testenv")
-    expect(role).to eq({'ami' => 'ami-1234567',
-                        "apps" => [],
-                        "amis" => {},
-                        "sg" => {}})
+    role = DH.get_role_data('role', 'testenv')
+    expect(role).to eq('ami' => 'ami-1234567',
+                       'apps' => [],
+                       'amis' => {},
+                       'sg' => {})
   end
 
-  it "shoud get the sg for a node from the role" do
-    DH.save_role_data("role", ami: 'ami-1234567', "sg" => {"test" => "my_role"})
-    role = DH.get_role_data("role", "testenv")
-    expect(role).to eq({'ami' => 'ami-1234567',
-                        "apps" => [],
-                        "amis" => {},
-                        "sg" => {"test" => "my_role"}})
+  it 'shoud get the sg for a node from the role' do
+    DH.save_role_data('role', ami: 'ami-1234567', 'sg' => { 'test' => 'my_role' })
+    role = DH.get_role_data('role', 'testenv')
+    expect(role).to eq('ami' => 'ami-1234567',
+                       'apps' => [],
+                       'amis' => {},
+                       'sg' => { 'test' => 'my_role' })
   end
 end

data/test/test_helper.rb

@@ -3,12 +3,17 @@ if ENV['COVERAGE']
   require 'simplecov'
   require 'simplecov-rcov'
 
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-       SimpleCov::Formatter::HTMLFormatter.new.format(result)
-       SimpleCov::Formatter::RcovFormatter.new.format(result)
+  module SimpleCov
+    module Formatter
+      class MergedFormatter
+        def format(result)
+          SimpleCov::Formatter::HTMLFormatter.new.format(result)
+          SimpleCov::Formatter::RcovFormatter.new.format(result)
+        end
+      end
     end
   end
+
   SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
   SimpleCov.start do
     add_filter '/test/'
@@ -17,7 +22,7 @@ if ENV['COVERAGE']
 end
 # Clear airbrake env if set
 ENV['AIRBRAKE_API_KEY'] = nil
-libpath = File.realpath(File.join(File.dirname(__FILE__), "..", "lib"))
+libpath = File.realpath(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rspec'
 require 'rack/test'
 require 'fakeredis/rspec'
@@ -27,11 +32,8 @@ require "#{libpath}/app.rb"
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
   def app
-    GaptoolServer
+    Gaptool::Server
   end
 end
 
 DH = Gaptool::Data
-
-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.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: gaptool-server for managing cloud resources