exprc 0.0.8 → 0.0.9

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-gem "rest-client", "1.6.7"
-gem "json", "1.6.6"
+gemspec

data/Gemfile.lock

@@ -1,8 +1,16 @@
+PATH
+  remote: .
+  specs:
+    exprc (0.0.9)
+      json (= 1.6.6)
+      rest-client (= 1.6.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
     json (1.6.6)
-    mime-types (1.18)
+    mime-types (1.19)
+    rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
 
@@ -10,5 +18,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json (= 1.6.6)
-  rest-client (= 1.6.7)
+  exprc!
+  rake

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'

data/Readme.md

@@ -1,3 +1,16 @@
 ## exprc
 
 Command line client to [exprd](https://github.com/heroku/exprd).
+
+``` bash
+API_KEY=`heroku sudo config:get API_PASSWORD -a exprd-core-production`
+
+export EXPRD_API_URL=https://:$API_KEY@exprd-core-production.herokuapp.com
+
+bin/exprc create --name api.production.jobs.queue-count.last \
+  --type last \
+  --window 60 \
+  --predicate '["?", "background_job_queue_check"]' \
+  --value count
+* creating metric api.production.jobs.queue-count.last... done
+```

data/bin/exprc

@@ -8,6 +8,22 @@ require "optparse"
 require "uri"
 require "rest-client"
 require "json"
+require "exprc"
+
+def dump(name, info)
+  print("exprc create ")
+  print("--name '#{name}' ")
+  print("--type '#{info["type"]}' ")
+  print("--window '#{info["window"]}' ")
+  print("--predicate '#{info["predicate"]}' ") if info["predicate"]
+  print("--predicate2 '#{info["predicate2"]}' ") if info["predicate2"]
+  print("--value '#{info["value"]}' ") if info["value"]
+  print("--key '#{info["key"]}' ") if info["key"]
+  print("--divisor '#{info["divisor"]}' ") if info["divisor"]
+  print("--percentile '#{info["percentile"]}' ") if info["percentile"]
+  print("--frequency: '#{info["frequency"]}' ")
+  print("\n")
+end
 
 ARGV.options do |o|
   action = nil
@@ -22,7 +38,7 @@ ARGV.options do |o|
   percentile = nil
   frequency = nil
 
-  o.banner = "usage: exprc list|show|explain|test|create|destroy|version [options]"
+  o.banner = "usage: exprc list|show|dump|dumpall|explain|test|create|destroy|version [options]"
   o.on("-n", "--name n", String, "name of metric") { |n| name = n }
   o.on("-t", "--type t", String, "type of metric") { |t| type = t }
   o.on("-w", "--window w", Integer, "window of metric in seconds") { |w| window = w }
@@ -37,6 +53,7 @@ ARGV.options do |o|
   o.parse!
   action = ARGV.shift
   exprd_api_url = ENV["EXPRD_API_URL"]
+  exprc_version = Exprc::VERSION
 
   params = {
     "type" => type,
@@ -50,7 +67,7 @@ ARGV.options do |o|
     "frequency" => frequency}
 
   abort("! error: an action is required (e.g list).\n\n#{o}") if (!action || action.empty?)
-  abort("! error: unrecognized action #{action}.") if !%w{list show explain test create update destroy version}.include?(action)
+  abort("! error: unrecognized action #{action}.") if !%w{list show dump dumpall explain test create update destroy version}.include?(action)
   abort("! error: missing EXPRD_API_URL.\n\n#{o}") if (!exprd_api_url || exprd_api_url.empty?)
   abort("! error: --dealy is no longer required and should be omitted.") if (ARGV.include?("-d") || ARGV.include?("--delay"))
   abort("! error: unrecognized args: #{ARGV.join(" ")}.") if !ARGV.empty?
@@ -58,15 +75,15 @@ ARGV.options do |o|
   begin
     case action
     when "version"
-      puts("0.0.8")
+      puts(exprc_version)
     when "list"
-      names = JSON.parse(RestClient.get("#{exprd_api_url}/metrics"))
+      names = JSON.parse(RestClient.get("#{exprd_api_url}/metrics", :exprc_version => exprc_version))
       names.each do |name|
         puts("- #{name}")
       end
     when "show"
       abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
-      info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}"))
+      info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}", :exprc_version => exprc_version))
       puts("= name: #{name}")
       puts("= type: #{info["type"]}")
       puts("= window: #{info["window"]}")
@@ -77,22 +94,32 @@ ARGV.options do |o|
       puts("= divisor: #{info["divisor"]}") if info["divisor"]
       puts("= percentile: #{info["percentile"]}") if info["percentile"]
       puts("= frequency: #{info["frequency"]}")
+    when "dumpall"
+      names = JSON.parse(RestClient.get("#{exprd_api_url}/metrics", :exprc_version => exprc_version))
+      names.each do |name|
+        info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}", :exprc_version => exprc_version))
+        dump(name, info)
+      end
+    when "dump"
+      abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
+      info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}", :exprc_version => exprc_version))
+      dump(name, info)
     when "explain"
       abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
 
       if type
         # we are sending the params
-        info = JSON.parse(RestClient.put("#{exprd_api_url}/metrics/#{name}/tests", JSON.dump(params)))
+        info = JSON.parse(RestClient.put("#{exprd_api_url}/metrics/#{name}/tests", JSON.dump(params), :exprc_version => exprc_version))
       else
         # we are getting a known metric
-        info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}"))
+        info = JSON.parse(RestClient.get("#{exprd_api_url}/metrics/#{name}", :exprc_version => exprc_version))
       end
       puts("= name: #{name}")
       puts("= compiled:\n#{info["compiled"]}")
     when "test"
       abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
       $stdout.print("* testing metric #{name}...")
-      results = JSON.parse(RestClient.put("#{exprd_api_url}/metrics/#{name}/tests", JSON.dump(params)))
+      results = JSON.parse(RestClient.put("#{exprd_api_url}/metrics/#{name}/tests", JSON.dump(params), :exprc_version => exprc_version))
       puts(" done")
       puts("= name: #{name}")
       puts("= value: #{results["value"]}")
@@ -100,12 +127,12 @@ ARGV.options do |o|
     when "create"
       abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
       $stdout.print("* creating metric #{name}...")
-      RestClient.put("#{exprd_api_url}/metrics/#{name}", JSON.dump(params))
+      RestClient.put("#{exprd_api_url}/metrics/#{name}", JSON.dump(params), :exprc_version => exprc_version)
       puts(" done")
     when "destroy"
       abort("! error: missing --name.\n\n#{o}") if (!name || name.empty?)
       $stdout.print("* destroying metric #{name}...")
-      RestClient.delete("#{exprd_api_url}/metrics/#{name}")
+      RestClient.delete("#{exprd_api_url}/metrics/#{name}", :exprc_version => exprc_version)
       puts(" done")
     end
   rescue => e

data/exprc.gemspec

@@ -1,3 +1,5 @@
+require File.expand_path("../lib/exprc/version", __FILE__)
+
 Gem::Specification.new do |gem|
   gem.authors       = ["Mark McGranaghan"]
   gem.email         = ["mark@heroku.com"]
@@ -9,5 +11,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "exprc"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.8"
+  gem.version       = Exprc::VERSION
+  gem.add_dependency("json", "1.6.6")
+  gem.add_dependency("rest-client", "1.6.7")
+  gem.add_development_dependency("rake")
 end

data/lib/exprc.rb

@@ -0,0 +1 @@
+require "exprc/version"

data/lib/exprc/version.rb

@@ -0,0 +1,3 @@
+module Exprc
+  VERSION='0.0.9'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exprc
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
-dependencies: []
+date: 2012-10-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70259532955900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *70259532955900
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70259532954440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *70259532954440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70259532952280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70259532952280
 description: CLI to exprd.
 email:
 - mark@heroku.com
@@ -22,9 +55,12 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- Rakefile
 - Readme.md
 - bin/exprc
 - exprc.gemspec
+- lib/exprc.rb
+- lib/exprc/version.rb
 homepage: https://github.com/heroku/exprc
 licenses: []
 post_install_message: 
@@ -37,17 +73,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2485921414130932160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2485921414130932160
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CLI to exprd.
 test_files: []
-has_rdoc: