instrumental_tools 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.5.4 [March 19th, 2013]
+* Reduce polling frequency of instrument_server to every minute
+* Remove gitstrumental
+
 ### 0.5.3 [November 5th, 2012]
 * Upgraded instrumental_agent gem to the latest version
 

data/README.md

@@ -67,15 +67,6 @@ namespaces[:instrumental].tasks[:restart_instrument_server].options[:roles] = [:
 
 Mac OS users: Due to a bug in Ruby, instrument_server can occasionally deadlock ([bug report](http://bugs.ruby-lang.org/issues/5811)).
 
-## gitstrumental
-
-Collect commit counts from git repositories:
-
-```sh
-cd project_directory
-gitstrumental <API_KEY>
-```
-
 ## Troubleshooting & Help
 
 We are here to help. Email us at [support@instrumentalapp.com](mailto:support@instrumentalapp.com), or visit the [Instrumental Support](https://fastestforward.campfirenow.com/6b934) Campfire room.

data/bin/instrument_server

@@ -350,7 +350,9 @@ class ServerController < Pidly::Control
     agent = Instrumental::Agent.new(options[:api_key], :collector => [options[:collector], options[:port]].compact.join(':'))
     puts "Collecting stats under the hostname: #{options[:hostname]}"
     loop do
-      sleep 10
+      t = Time.now.to_i
+      next_minute = (t - t % 60) + 60
+      sleep [next_minute - t, 0].max
       inspector = SystemInspector.new
       inspector.load_all
       inspector.gauges.each do |stat, value|

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -83,7 +83,6 @@ description: A collection of scripts useful for monitoring servers and services
 email:
 - support@instrumentalapp.com
 executables:
-- gitstrumental
 - instrument_server
 extensions: []
 extra_rdoc_files: []
@@ -94,7 +93,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/gitstrumental
 - bin/instrument_server
 - instrumental_tools.gemspec
 - lib/instrumental_tools/capistrano.rb
@@ -113,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2651139794055813555
+      hash: -1025724807193847442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,10 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2651139794055813555
+      hash: -1025724807193847442
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Command line tools for Instrumental

data/bin/gitstrumental

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-gem 'instrumental_agent'
-require 'instrumental_agent'
-
-token = ENV["INSTRUMENTAL_TOKEN"] || ARGV[0]
-
-if !token 
-  puts 'Usage: gitstrumental API_KEY'
-  exit 1
-end
-
-lines = `git log --format="REC %at %h '%cn'" --numstat`.chomp.split(/\n+/).reject(&:empty?)
-branch = File.basename(`git symbolic-ref HEAD`.chomp).gsub(/[^a-z0-9]/i, "_")
-if fetch_url = `git remote show origin`.chomp.split(/\n+/).grep(/Fetch URL:/).first
-  repo = File.basename(fetch_url.split("/").last, ".git")
-else
-  repo = File.basename(Dir.pwd, ".git")
-end
-prolog = [repo, branch].join(".")
-I = Instrumental::Agent.new(token)
-curstat = {}
-lines.each do |line|
-  if line =~ /^REC/
-    if !curstat.empty?
-      name, ts, changes = curstat[:name], curstat[:timestamp], curstat[:changes]
-      I.increment("git.#{prolog}.commits.#{name}", 1, ts)
-
-      adds, deletes = changes.reduce do |prev, pair|
-        [prev[0] + pair[0], prev[1] + pair[1]]
-      end
-      I.increment("git.#{prolog}.commits.#{name}.add", adds, ts)
-      I.increment("git.#{prolog}.commits.#{name}.delete", deletes, ts)
-      I.increment("git.#{prolog}.num_commits", 1, ts)
-    end
-    rec, ts, hash, *name_parts = line.split(" ")
-    name = name_parts.join(" ").gsub(/^'([^']+)'$/, "\\1").gsub(/[^a-z0-9]/i, "_")
-    curstat = {
-      :name => name,
-      :timestamp => ts.to_i,
-      :hash => hash,
-      :changes => []
-    }
-  else
-    adds, deletes, file = line.split(/\s+/)
-    curstat[:changes] << [
-      adds.to_i, deletes.to_i
-    ]
-  end
-end