overwatch 0.0.3.pre → 0.2.0

data/lib/overwatch/command.rb

@@ -0,0 +1,95 @@
+require 'rest-client'
+require 'clamp'
+require 'formatador'
+require 'yajl/json_gem'
+require 'overwatch/helpers'
+require 'hirb'
+require 'ohai'
+
+module Overwatch
+  class Command < Clamp::Command
+    include Helpers
+
+    option ["-v", "--verbose"], :flag, "be verbose"
+    option "--version", :flag, "show version" do
+      puts "Overwatch v#{Overwatch::VERSION} (Codename: Snickelfritz)"
+      exit(0)
+    end
+
+    subcommand "run", "Run the client" do
+      option ["-k", "--key"], "KEY", "API key", :default => nil
+      option ["-s", "--server"], "SERVER", "collection server", :default => "localhost"
+      option ["-p", "--port"], "PORT", "collection port", :default => "9001"
+      option ["-f", "--format"], "[FORMAT]", "format (choices: pretty, json, text)", :default => "pretty"
+
+      unless Ohai::Config[:plugin_path].include?(Overwatch.plugin_path)
+        Ohai::Config[:plugin_path] << Overwatch.plugin_path
+      end
+
+      Ohai::Config[:disabled_plugins] = %w{ 
+        chef cloud command darwin dmi dmi_common ec2 languages 
+        eucalyptus kernel keys ohai ohai_time passwd rackspace 
+        virtualization c network network_listeners platform 
+      }
+
+      def execute
+        @ohai = Ohai::System.new
+        @ohai.all_plugins
+        options = { :fields => [ 'id', 'created_at' ], :format => format }
+        post("http://#{server}:#{port}/snapshots?key=#{key}", JSON.generate({:data => @ohai.data}), options)
+      end  
+    end
+
+    subcommand "resource", "Resources" do
+      option ["-s", "--server"], "SERVER", "collection server", :default => "localhost"
+      option ["-p", "--port"], "PORT", "collection port", :default => "9001"
+      option ["-f", "--format"], "[FORMAT]", "format (choices: pretty, json, text)", :default => "pretty"
+
+      subcommand "list", "list all resources" do
+        def execute
+          options = { :fields => ['id','name', 'api_key'], :format => format }
+
+          get("http://#{server}:#{port}/resources", options)
+        end
+      end
+
+      subcommand "show", "show a specific resource" do
+        parameter "NAME", "resource name"
+
+        option ['-a', '--attributes'], :flag, "list all resource attributes"
+
+        def execute
+          options = { :fields => ['id','name', 'api_key'], :format => format }
+          get("http://#{server}:#{port}/resources/#{name}", options)
+        end
+      end
+
+      subcommand "create", "create a new resource" do
+        parameter "NAME", "resource name"
+
+        def execute
+          options = { :fields => ['id','name', 'api_key'], :format => format }
+          post("http://#{server}:#{port}/resources", JSON.generate({:name => name}), options)            
+        end
+
+      end
+      subcommand "update", "update an existing resource"
+      subcommand "delete", "delete an existing resource" do
+        parameter "NAME", "resource name"
+
+        def execute
+          # resource = delete("http://#{server}:#{port}/resources/#{name}")
+          display_line "[yellow]Resource deleted![/]"
+        end
+      end
+      subcommand "regenerate", "regenerate a resource's API key"
+    end
+
+    subcommand "snapshot", "Snapshots" do
+      subcommand "show", "show an existing snapshot"
+      subcommand "create", "create a new snapshot"
+      subcommand "delete", "delete an existing snapshot"
+    end
+  end
+
+end

data/lib/overwatch/helpers.rb

@@ -0,0 +1,102 @@
+require 'yajl'
+require 'rest-client'
+require 'clamp'
+require 'hirb'
+require 'formatador'
+
+module Overwatch
+  module Helpers
+    def f
+      @f ||= Formatador.new
+    end
+
+    def display_line(string)
+      f.display_line(string)
+    end
+
+    def default_headers
+      { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
+    end
+
+    def get(url, options={}, headers={})
+      begin
+        response = JSON.parse(RestClient.get(url, headers.merge!(default_headers)))
+        format_output(response, options)
+      rescue RestClient::Exception => e
+        response = {:code => e.http_code.to_s, :errors => JSON.parse(e.http_body)}
+        options.merge!(:fields => [ :code, :errors ])
+        format_output(response, options)
+        exit 1
+      end
+    end
+
+    def post(url, payload={}, options={}, headers={})
+      begin
+        response = JSON.parse(RestClient.post(url, payload, headers.merge!(default_headers)))
+        format_output(response, options)
+      rescue RestClient::Exception => e
+        response = {:code => e.http_code.to_s, :errors => JSON.parse(e.http_body)}
+        options[:fields] = [ :code, :errors ]
+        format_output(response, options)
+        exit 1
+      end
+    end
+
+    def delete(url, headers={})
+      begin
+        res = RestClient.delete(url, headers.merge!(default_headers))
+        JSON.parse(res)
+      rescue RestClient::Exception => e
+      end
+    end
+
+    def format_output(rows, options)
+      data = rows.is_a?(Array) ? rows : [rows]
+
+      case options[:format]
+      when 'text'
+        puts Hirb::Helpers::TextTable.render(data, options)
+      when 'json'
+        puts JSON.generate(data)
+      when 'none'
+        return
+      else
+        puts Hirb::Helpers::Table.render(data, options)
+      end
+
+    end
+  end
+end
+
+
+class Hirb::Helpers::TextTable < Hirb::Helpers::Table
+  CHARS = {
+    :top => {
+      :left => '', :center => '', :right => '', :horizontal => '', :vertical => {
+        :outside => '', :inside => ''
+      } 
+      },
+      :middle => {
+        :left => '', :center => '', :right => '', :horizontal => ''
+        },
+        :bottom => {
+          :left => '', :center => '', :right => '', :horizontal => '', :vertical => {
+            :outside => '', :inside => ''
+          } 
+        }
+      }
+
+  def self.render(rows, options={})
+    options.merge!(:headers => false, :description => false)
+    new(rows, options).render
+  end
+
+  def render
+    body = []
+    unless @rows.length == 0
+      setup_field_lengths
+      body += render_rows
+    end
+    body.join("\n")
+  end
+end

data/lib/overwatch/version.rb

@@ -0,0 +1,3 @@
+module Overwatch
+  VERSION = "0.2.0"
+end

data/overwatch.gemspec

@@ -1,99 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{overwatch}
-  s.version = "0.0.3.pre"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dan Ryan"]
-  s.date = %q{2011-07-01}
-  s.default_executable = %q{overwatch}
-  s.description = %q{The client to communicate with the Overwatch monitoring service}
-  s.email = %q{hi@iamdanryan.com}
-  s.executables = ["overwatch"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".watchr",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/overwatch",
-    "lib/overwatch.rb",
-    "lib/overwatch/client.rb",
-    "overwatch.gemspec",
-    "plugins/load_average.rb",
-    "plugins/mongodb.rb",
-    "plugins/mysql.rb",
-    "plugins/nginx.rb",
-    "plugins/redis.rb",
-    "spec/monitaur/client_spec.rb",
-    "spec/monitaur_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/bar_plugin.rb",
-    "spec/support/client_requests.rb",
-    "spec/support/foo_plugin.rb",
-    "spec/support/test.rb"
-  ]
-  s.homepage = %q{http://github.com/danryan/overwatch-client}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Client for Overwatch monitoring service}
+require 'overwatch/version'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+Gem::Specification.new do |s|
+  s.name              = 'overwatch'
+  s.version           = Overwatch::VERSION
+  s.platform          = Gem::Platform::RUBY
+  s.authors           = [ "Dan Ryan" ]
+  s.email             = [ "dan@appliedawesome.com" ]
+  s.homepage          = "https://github.com/danryan/overwatch-client"
+  s.summary           = "Overwatch command-line interface for configuration and reporting"
+  s.description       = "overwatch is the command-line interface to the Overwatch monitoring suite"
+  
+  s.rubyforge_project = "overwatch"
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {spec}/*`.split("\n")
+  s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths     = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.3"])
-      s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<ohai>, [">= 0.6.4"])
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_development_dependency(%q<watchr>, [">= 0"])
-      s.add_development_dependency(%q<spork>, [">= 0.9.0.rc"])
-      s.add_development_dependency(%q<fuubar>, [">= 0"])
-      s.add_development_dependency(%q<fakefs>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-    else
-      s.add_dependency(%q<rest-client>, [">= 1.6.3"])
-      s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<ohai>, [">= 0.6.4"])
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
-      s.add_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_dependency(%q<watchr>, [">= 0"])
-      s.add_dependency(%q<spork>, [">= 0.9.0.rc"])
-      s.add_dependency(%q<fuubar>, [">= 0"])
-      s.add_dependency(%q<fakefs>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, [">= 1.6.3"])
-    s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<ohai>, [">= 0.6.4"])
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
-    s.add_dependency(%q<yard>, [">= 0.6.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-    s.add_dependency(%q<watchr>, [">= 0"])
-    s.add_dependency(%q<spork>, [">= 0.9.0.rc"])
-    s.add_dependency(%q<fuubar>, [">= 0"])
-    s.add_dependency(%q<fakefs>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-  end
+  s.add_dependency 'yajl-ruby', '>= 0.8.2'
+  s.add_dependency 'rest-client', '>= 1.6.3'
+  s.add_dependency 'clamp', '>= 0.2.2'
+  s.add_dependency 'formatador', '>= 0.2.0'
+  s.add_dependency 'hirb', '>= 0.4.5'
+  
+  s.add_development_dependency 'rspec', '>= 2.6.0'
+  s.add_development_dependency 'spork', '>= 0.9.0.rc8'
+  s.add_development_dependency 'watchr', '>= 0.7'
+  s.add_development_dependency 'json_spec', '>= 0.5.0'
 end
-

data/spec/spec_helper.rb

@@ -1,37 +1,25 @@
 require 'rubygems'
 require 'spork'
 
-Spork.prefork do
-  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-  $LOAD_PATH.unshift(File.dirname(__FILE__))
-  require 'bundler'
-  
-  Bundler.require
-  
+Spork.prefork do 
+  ENV["RACK_ENV"] ||= 'test'
   require 'rspec'
-  require 'fakefs/safe'
-  require 'webmock/rspec'
-  
-  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-  
+
+  support_files = File.join(File.expand_path(File.dirname(__FILE__)), "spec/support/**/*.rb")
+  Dir[support_files].each {|f| require f}
+
+  ENV['REDIS_URL'] = 'redis://localhost:6379/3'
+
   RSpec.configure do |config|
-    config.before do 
-      FakeFS.activate!
-    end
-    config.after do
-      FakeFS.deactivate!
+    config.color_enabled = true
+    config.formatter = "documentation"
+    config.mock_with :rspec
+    
+    config.before :suite do
+      $redis.flushdb
     end
   end
 end
 
 Spork.each_run do
-  require 'overwatch'
-  
-  RSpec.configure do |config|
-    config.before do
-      ENV['HOME'] = "/home/user"
-      
-      Overwatch.env = "test"
-    end
-  end
 end

metadata

@@ -1,215 +1,165 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: overwatch
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.0.3.pre
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 -04:00
-default_executable: overwatch
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-08-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70099985810320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.6.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985810320
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70099985807460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ohai
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985807460
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: &70099985791040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985791040
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: &70099985790200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985790200
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: &70099985789020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: watchr
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985789020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70099985787780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70099985787780
+- !ruby/object:Gem::Dependency
   name: spork
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70099985786240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.0.rc
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0.rc8
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: fuubar
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: fakefs
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985786240
+- !ruby/object:Gem::Dependency
+  name: watchr
+  requirement: &70099985784720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: webmock
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70099985784720
+- !ruby/object:Gem::Dependency
+  name: json_spec
+  requirement: &70099985782820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *id012
-description: The client to communicate with the Overwatch monitoring service
-email: hi@iamdanryan.com
-executables: 
+  version_requirements: *70099985782820
+description: overwatch is the command-line interface to the Overwatch monitoring suite
+email:
+- dan@appliedawesome.com
+executables:
 - overwatch
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.md
-files: 
-- .document
-- .rspec
+extra_rdoc_files: []
+files:
+- .gitignore
 - .watchr
 - Gemfile
-- Gemfile.lock
-- LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - bin/overwatch
+- config/overwatchrc
 - lib/overwatch.rb
-- lib/overwatch/client.rb
+- lib/overwatch/command.rb
+- lib/overwatch/helpers.rb
+- lib/overwatch/version.rb
 - overwatch.gemspec
-- plugins/load_average.rb
-- plugins/mongodb.rb
-- plugins/mysql.rb
-- plugins/nginx.rb
-- plugins/redis.rb
-- spec/monitaur/client_spec.rb
-- spec/monitaur_spec.rb
+- spec/overwatch_spec.rb
 - spec/spec_helper.rb
-- spec/support/bar_plugin.rb
-- spec/support/client_requests.rb
-- spec/support/foo_plugin.rb
-- spec/support/test.rb
-has_rdoc: true
-homepage: http://github.com/danryan/overwatch-client
-licenses: 
-- MIT
+homepage: https://github.com/danryan/overwatch-client
+licenses: []
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1674726256609455612
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3947530879652547069
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -3947530879652547069
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.6.2
+rubyforge_project: overwatch
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Client for Overwatch monitoring service
+summary: Overwatch command-line interface for configuration and reporting
 test_files: []
-