swiss_admin 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63eff973bde4a3cbdc4db697e985346757472687
-  data.tar.gz: 5daea5b752c885c7539c7289cbb9c9da2bf287c2
+  metadata.gz: 4a629a910831c07e9a07e3bdc9479977dd658aae
+  data.tar.gz: 7e84d4ff6947116fc8a06e4f13d3580356fe4ce8
 SHA512:
-  metadata.gz: 4a469600791cf64ef5d448c4da69a8cdedcb65de6b0afaee0e63e376153451fba0f3be6dda574a77dc4fd021cedc3ad3ac45a1bfed4b2d42ec39dfb70472fc76
-  data.tar.gz: abd5c1846b50ea41da4b414720e98e86f702f49b9f62fd2ca27ad5aa0f3a15a8292f14a6c4ca43e6da8af44c0d52fc207e1352e190a1e9514a71a397466bf3e7
+  metadata.gz: a355e2423ef7eff8298a2c9663e3c917813ad88240e5a2b94ac60ca900f6a134d87a7441cfaf62a265c4003549bcdde928f6122e90e6bc760b3aaee3946a80e5
+  data.tar.gz: 2029af073e0b518cb8823a4f6fd803f2cb1afd7fd5bc652d9b067655f0509c7f84d9b1b4dd869a0fb7b00330f48e38e7b3c567df4819d30205033b9e776a5275

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+sudo: false
+rvm:
+ - "1.9.3"
+ - "2.1.0"
+ - "2.2.0"
+script: bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## CHANGELOG
+
+### 0.7.0
+
+* Fix path issue for web host_info.
+* Fix web host_info tests.
+* Fix layout title.
+* Fix bug where pidfile was not getting set from method_options.

data/README.md

@@ -1,5 +1,9 @@
 # SwissAdmin
 
+[![Gem Version](https://badge.fury.io/rb/swiss_admin.svg)](http://badge.fury.io/rb/swiss_admin)
+
+[![Build Status](https://travis-ci.org/bradleyd/swiss_admin.svg)](https://travis-ci.org/bradleyd/swiss_admin)
+
 A generous, but not too bloated, system/host helpers for any self respecting system administrator ;)
 
 SwissAdmin can either be included in your project or can used from the CLI.
@@ -12,8 +16,9 @@ I find it best to install swissadmin in your global gemset.
 
 1. It offers just the right amount of information about the system/host your are running it on.
 2. Provides a web server for REST calls.
-3. Provides a DRb server to query host for information. (see todo)
-4. Everytime you use it puppies and rainbows shoot into the sky.
+3. Pretty simple to add new commands
+4. Provides a DRb server to query host for information. (see todo)
+5. Everytime you use it puppies and rainbows shoot into the sky.
 
 There a tons of tools that do similar stuff, but I find them to contain way to much information.
 I do not have the brain capacity to remember all those arguments and parsing features. 
@@ -163,15 +168,9 @@ Every CLI command can be accessed via the REST API
 ```ruby
 curl localhost:8080/api/host/loadavg #=> {"load_average":"0.29 0.29 0.28 2/972 27659\n"}
 ```
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
 
 ## Add a new command
+
 ### This is a work in progress and might not be worth a dam
 
 To add a new command you must understand the directory structures of ```lib/``` and ```cli/```
@@ -273,3 +272,13 @@ swissadmin foo answer #=> 42
 * Show all commands available in CLI
 * Show all commands available in Web
 * Write pid, port file path to `~/.swissadmin/.web.conf
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+

data/Rakefile

@@ -4,5 +4,5 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.options = "-v"
   t.libs << "test"
-  t.test_files = FileList["test/*_test.rb", "test/cli/*_test.rb"]
+  t.test_files = FileList["test/*_test.rb", "test/cli/*_test.rb", "test/web/test_*.rb"]
 end

data/lib/swiss_admin/cli/web_cli.rb

@@ -31,7 +31,7 @@ module SwissAdmin
         $stdout.puts "Starting..."
         Rack::Server.start(app: SwissAdmin::HostInfo, 
                            daemonize: true, 
-                           pid: options[:pid_file],
+                           pid: options[:pid_file] || "/tmp/swissadmin.pid",
                            Port: options[:port])
       end
 

data/lib/swiss_admin/version.rb

@@ -1,3 +1,3 @@
 module SwissAdmin
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/swiss_admin/web/app.rb

@@ -24,7 +24,7 @@ module SwissAdmin
       "hello world"
     end
 
-    get "/info" do
+    get "/host_info" do
       @memory       = SwissAdmin::Hardware.memory
       @host_name    = SwissAdmin::Host.name
       @users        = SwissAdmin::User.active

data/lib/swiss_admin/web/views/layout.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Sensu Portal</title>
+    <title>SwissAdmin</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="description" content="SwissAdmin" />
     <link rel="stylesheet" type="text/css" href="/css/base.css" />

data/test/web/test_api.rb

@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class HostInfoAPITest < MiniTest::Unit::TestCase
+class HostWebAPITest < Minitest::Test
   include Rack::Test::Methods
 
   def app

data/test/web/test_host_info.rb

@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class HostInfoTest < MiniTest::Unit::TestCase
+class HostInfoTest < Minitest::Test
   include Rack::Test::Methods
 
   def app
@@ -10,35 +10,30 @@ class HostInfoTest < MiniTest::Unit::TestCase
   def test_it_retruns_hardware_info
     get '/host_info'
     assert last_response.ok?
-    assert_match /Memory Total:/ , last_response.body
+    assert_match /Memory Total/ , last_response.body
   end
 
   def test_it_retruns_host_name
     get '/host_info'
     assert last_response.ok?
-    assert_match /Host Name:/ , last_response.body
+    assert_match /Host Name/ , last_response.body
   end
 
   def test_it_retruns_host_load
     get '/host_info'
     assert last_response.ok?
-    assert_match /Load Average:/ , last_response.body
+    assert_match /Load Average/ , last_response.body
   end
 
   def test_it_retruns_hardware_cpus
     get '/host_info'
     assert last_response.ok?
-    assert_match /Total Cpus:/ , last_response.body
+    assert_match /Total CPUS/ , last_response.body
   end
 
   def test_it_retruns_network_ipaddresses
     get '/host_info'
     assert last_response.ok?
-    assert_match /IP Addresses:/ , last_response.body
+    assert_match /IP Address/ , last_response.body
   end
-
-
-
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swiss_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Bradley Smith
@@ -131,6 +131,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md