slurry 0.0.2 → 0.0.3

data/bin/slurry

@@ -1,11 +1,52 @@
 #! /usr/bin/env ruby
 
+require 'yaml'
+require 'optparse'
 require 'slurry'
 
+# Load the command line options
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: vspheremonitor [options]"
 
-def run
-  Slurry.funnel
+  opts.on("-v", "--verbose", "Be less quiet") do |v|
+    options[:verbose] = v
+  end
+
+  opts.on("-c", "--config FILE", "Specify the configuration file") do |conf|
+    options[:configfile] = conf
+  end
+
+  opts.on("-t", "--type [clean|report]", "The type of run to perform") do |t|
+    options[:type] = t
+  end
+
+end.parse!
+
+def run(options)
+
+  # Determine if we should load the default configuration file
+  if options[:configfile].nil?
+    configfile = 'etc/slurry.yaml'
+  else
+    configfile = options[:configfile]
+  end
+
+  # Load the configuration file
+  config = YAML::load(File.read(configfile))
+
+  # Determin what kind of run we are asked to perform
+  case options[:type]
+  when "clean" # Remove everything from the cache
+    Slurry.clean
+  when "report" # Report on the state of the cache
+    Slurry.report
+  when "liaise" # Show the json around the floor
+    Slurry.liaise(config[:server],config[:port])
+  else # Load json data from stdin
+    Slurry.funnel
+  end
 
 end
 
-run()
+run(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slurry
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json2graphite
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool that caches json for graphite.
 email: xaque208@gmail.com
 executables:
@@ -35,9 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- bin/clean
 - bin/liaise
-- bin/report
 - bin/slurry
 - lib/slurry.rb
 - etc/slurry.yaml.sample

data/bin/clean

@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'slurry'
-
-
-def run
-  Slurry.clean
-end
-
-run()

data/bin/report

@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'slurry'
-
-
-def run
-  Slurry.report
-end
-
-run()